Changeset 9664 for lang/perl/Moxy/branches

Timestamp:

04/18/08 08:33:07 (5 years ago)

Author:

tokuhirom

Message:

絵文字じ までは復活した。そして、プラグインよびだしまわりの規約もいろいろかえた。

Location:

lang/perl/Moxy/branches/CC

Files:

• config.yaml (modified) (1 diff)
• lib/Moxy/Plugin/Filter/Pictogram.pm (modified) (1 diff)
• lib/Moxy/Plugin/Server.pm (modified) (3 diffs)
• lib/Moxy/Util.pm (modified) (2 diffs)

lang/perl/Moxy/branches/CC/config.yaml

@@ -16 +16 @@
   - module: Filter::XMLisHTML
   - module: Filter::UserAgentSwitcher
-# - module: Filter::Pictogram
+  - module: Filter::Pictogram
 # - module: Filter::HTMLWidth
 # - module: Filter::HTTPEnv

lang/perl/Moxy/branches/CC/lib/Moxy/Plugin/Filter/Pictogram.pm

@@ -2 +2 @@
 use strict;
 use warnings;
-use base qw/Class::Component::Plugin/;
+use base qw/Moxy::Plugin/;
 use Moxy::Util;
 use Path::Class;
 use HTML::ReplacePictogramMobileJp;
+use HTTP::MobileAttribute;
 
-sub register {
-    my ($class, $context) = @_;
+sub response_filter :Hook('response_filter') {
+    my ( $self, $context, $args, ) = @_;
+    return unless ( ( $args->{response}->header('Content-Type') || '' ) =~ /html/ );
+    return if $args->{mobile_attribute}->is_non_mobile;
 
-    # registering pictogram replacer.
-    for my $carrier (qw/I E V H/) {
-        $context->register_hook( "response_filter_$carrier" => sub {
-            my ($context, $args, ) = @_;
-            return unless (($args->{response}->header('Content-Type')||'') =~ /html/);
+    my $carrier = $args->{mobile_attribute}->carrier;
 
-            my $charset = Moxy::Util->detect_charset($args->{response}, $args->{content_ref});
-            $charset = ($charset =~ /utf-?8/i) ? 'utf8' : 'sjis';
+    my $charset =
+        Moxy::Util->detect_charset( $args->{response}, $args->{content_ref} );
+    $charset = ( $charset =~ /utf-?8/i ) ? 'utf8' : 'sjis';
 
-            ${ $args->{content_ref} } = HTML::ReplacePictogramMobileJp->replace(
-                html     => ${ $args->{content_ref} },
-                carrier  => $carrier,
-                charset  => $charset,
-                callback => sub {
-                    my ( $unicode, $carrier ) = @_;
+    $args->{response}->content(
+        HTML::ReplacePictogramMobileJp->replace(
+            html     => $args->{response}->content,
+            carrier  => $carrier,
+            charset  => $charset,
+            callback => sub {
+                my ( $unicode, $carrier ) = @_;
 
-                    my $pict_html = $class->render_template( $context, 'pict.tmpl' );
-                    return sprintf( $pict_html, $carrier, $unicode, $unicode );
-                }
-            );
-            ${ $args->{content_ref} };
-        });
+                my $pict_html =
+                    $self->render_template( $context, 'pict.tmpl' );
+                return sprintf( $pict_html, $carrier, $unicode, $unicode );
+            }
+        )
+    );
+}
+
+sub deliver_pictogram :Hook('request_filter') {
+    my ($self, $context, $args) = @_;
+    die "request missing" unless $args->{request};
+
+    if ($args->{request}->uri =~ m{http://pictogram\.moxy/([IEV])/([0-9A-F]{4}).gif}) {
+        my $content = file($self->assets_path($context), 'image', $1, "$2.gif")->slurp;
+
+        my $response = HTTP::Response->new( 200, 'ok' );
+        $response->header( 'Expires' => 'Thu, 15 Apr 2030 20:00:00 GMT' );
+        $response->content_type("image/gif");
+        $response->content($content);
+        $response;
     }
-
-    # deliver pictogram
-    $context->register_hook(request_filter => sub {
-        my ($context, $args) = @_;
-        die "request missing" unless $args->{request};
-
-        if ($args->{request}->uri =~ m{http://pictogram\.moxy/([IEV])/([0-9A-F]{4}).gif}) {
-            my $content = file($class->assets_path($context), 'image', $1, "$2.gif")->slurp;
-
-            my $response = HTTP::Response->new( 200, 'ok' );
-            $response->header( 'Expires' => 'Thu, 15 Apr 2030 20:00:00 GMT' );
-            $response->content_type("image/gif");
-            $response->content($content);
-            $response;
-        }
-    });
 }
 

lang/perl/Moxy/branches/CC/lib/Moxy/Plugin/Server.pm

@@ -15 +15 @@
 use URI::Heuristic qw(uf_uristr);
 use HTTP::MobileAttribute plugins => [
-    qw/CarrierLetter/
+    qw/CarrierLetter IS/
 ];
 our @EXPORT = qw/rewrite handle_request render_control_panel/;
@@ -216 +216 @@
         }
     );
+    my $mobile_attribute = HTTP::MobileAttribute->new($req->header('User-Agent'));
     my $agent = $context->get_ua_info($req->header('User-Agent'));
-    my $carrier = $agent->{agent} ? HTTP::MobileAttribute->new($agent->{agent})->carrier : 'N';
+    my $carrier = $mobile_attribute->carrier;
     for my $hook ('request_filter', "request_filter_$carrier") {
         my $response = $context->run_hook_and_get_response(
             $hook,
             +{
-                request => $req,    # HTTP::Request object
-                agent   => $agent,
-                user    => $args{user_id},
+                request          => $req,              # HTTP::Request object
+                mobile_attribute => $mobile_attribute,
+                user             => $args{user_id},
             }
         );
@@ -239 +240 @@
     );
     my $response = $ua->request($req);
-    for my $hook ('response_filter', "response_filter_$carrier") {
+    for my $hook ( 'response_filter', "response_filter_$carrier" ) {
         $context->run_hook(
             $hook,
-            {   response    => $response, # HTTP::Response object
-                agent       => $agent,
-                user        => $args{user_id},
+            {
+                response         => $response,           # HTTP::Response object
+                mobile_attribute => $mobile_attribute,
+                user             => $args{user_id},
             }
         );

lang/perl/Moxy/branches/CC/lib/Moxy/Util.pm

@@ -23 +23 @@
 
 sub detect_charset {
-    my ($class, $response, $body) = @_;
+    my ($class, $response) = @_;
 
     my $charset;
@@ -29 +29 @@
         $charset = $1;
     }
-    $charset ||= ( $body =~ /<\?xml version="1.0" encoding="([\w\-]+)"\?>/ )[0]; 
-    $charset ||= ( $body =~ m!<meta http-equiv="Content-Type" content=".*charset=([\w\-]+)"!i )[0]; 
-    $charset ||= $Detector->($body); 
+    $charset ||= ( $response->content() =~ /<\?xml version="1.0" encoding="([\w\-]+)"\?>/ )[0]; 
+    $charset ||= ( $response->content() =~ m!<meta http-equiv="Content-Type" content=".*charset=([\w\-]+)"!i )[0]; 
+    $charset ||= $Detector->($response->content()); 
     $charset ||= 'utf-8';