Changeset 10020

Timestamp:

04/20/08 23:21:48 (5 years ago)

Author:

tokuhirom

Message:

- HTML::TreeBuidler? は unicode string じゃないと文字化けるので対応。
- Moxy::Util->detect_charset を HTTP::Response::charset に改名。

Location:

lang/perl/Moxy/trunk/lib

Files:

• Moxy.pm (modified) (2 diffs)
• Moxy/Plugin/ControlPanel.pm (modified) (1 diff)
• Moxy/Plugin/LocationBar.pm (modified) (1 diff)
• Moxy/Plugin/Pictogram.pm (modified) (1 diff)
• Moxy/Util.pm (modified) (1 diff)

lang/perl/Moxy/trunk/lib/Moxy.pm

@@ -27 +27 @@
 use YAML;
 use HTML::TreeBuilder;
+use Moxy::Util;
 use HTML::TreeBuilder::XPath;
 use HTTP::MobileAttribute plugins => [
@@ -235 +236 @@
             $self->log("Content-Type: $content_type");
             if ($content_type =~ /html/i) {
-                $res->content( rewrite($base_url, $res->content, $url) );
+                $res->content( encode($res->charset, rewrite($base_url, decode($res->charset, $res->content), $url)) );
             }
             use bytes;

lang/perl/Moxy/trunk/lib/Moxy/Plugin/ControlPanel.pm

@@ -20 +20 @@
 
     # convert html charset to response charset.
-    my $charset = Moxy::Util->detect_charset($args->{response});
+    my $charset = $args->{response}->charset;
     my $enc = Encode::find_encoding($charset);
     Encode::from_to($output, 'utf-8', $enc ? $enc->name : 'utf-8');

lang/perl/Moxy/trunk/lib/Moxy/Plugin/LocationBar.pm

@@ -18 +18 @@
     return sprintf(<<"...", encode_entities($current_url));
     <script>
-        var moxy_base = location.protocol + '://' + location.host;
+        var moxy_base = location.protocol.replace(':', '') + '://' + location.host;
     </script>
     <form method="get" onsubmit="location.href=moxy_base +'/'+encodeURIComponent(document.getElementById('moxy_url').value);return false;">

lang/perl/Moxy/trunk/lib/Moxy/Plugin/Pictogram.pm

@@ -15 +15 @@
     my $carrier = $args->{mobile_attribute}->carrier;
 
-    my $charset =
-        Moxy::Util->detect_charset( $args->{response} );
+    my $charset = $args->{response}->charset;
     $charset = ( $charset =~ /utf-?8/i ) ? 'utf8' : 'sjis';
 

lang/perl/Moxy/trunk/lib/Moxy/Util.pm

@@ -22 +22 @@
 }
 
-sub detect_charset {
-    my ($class, $response) = @_;
+sub HTTP::Response::charset {
+    my ($self, ) = @_;
 
-    my $charset;
-    if ($response->header('Content-Type') =~ /charset=([\w\-]+)/io) {
-        $charset = $1;
-    }
-    $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'; 
-
-    return $charset;
+    return $self->{__charset} ||= do {
+        my $charset;
+        if ( $self->header('Content-Type') =~ /charset=([\w\-]+)/io ) {
+            $charset = $1;
+        }
+        $charset ||= ( $self->content() =~ /<\?xml version="1.0" encoding="([\w\-]+)"\?>/ )[0];
+        $charset ||= ( $self->content() =~ m!<meta http-equiv="Content-Type" content=".*charset=([\w\-]+)"!i)[0];
+        $charset ||= $Detector->( $self->content() );
+        $charset ||= 'cp932';
+        $charset;
+    };
 }