Changeset 17846 for lang/perl/Moxy

Timestamp:

08/18/08 19:08:54 (5 months ago)

Author:

tokuhirom

Message:

HTTP::Engine::Compat の利用を停止。HTTP::Engine を直接使うことにする。

Location:

lang/perl/Moxy/trunk

Files:

• Makefile.PL (modified) (2 diffs)
• lib/Moxy.pm (modified) (5 diffs)
• lib/Moxy/Cmd.pm (modified) (2 diffs)

lang/perl/Moxy/trunk/Makefile.PL

@@ -15 +15 @@
 requires 'Class::Component' => 0.17;
 requires 'HTTP::Engine' => '0.0.13';
-requires 'HTTP::Engine::Compat' => '0.0.1';
 requires 'HTTP::MobileAttribute';
 requires 'CGI';
@@ -27 +26 @@
 requires 'Encode::JP::Mobile' => 0.22;
 requires 'HTML::ReplacePictogramMobileJp' => 0.05;
-requires 'Params::Validate';
+requires 'Params::Validate' => 0.91;
 requires 'HTML::Tree' => 3.23;
 requires 'App::Cmd' => 0.013;

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

@@ -161 +161 @@
 
 sub handle_request {
-    my ($self, $c) = @_;
-
-    my $session_id = join ',', $c->req->headers->authorization_basic;
+    my ($self, $req) = @_;
+
+    my $session_id = join ',', $req->headers->authorization_basic;
     $self->log(debug => "Authorization header: $session_id");
     if ($session_id) {
-        $self->_make_response(
-            c => $c,
+        return $self->_make_response(
+            req => $req,
             user_id  => $session_id,
         );
     } else {
-        $c->res->status(401);
-        $c->res->headers->www_authenticate(qq{Basic realm="Moxy needs basic auth.Only for identification.Password is dummy."});
-        $c->res->body('authentication required');
+        return HTTP::Engine::Response->new(
+            status => 401,
+            headers => {
+                WWW_Authenticate => qq{Basic realm="Moxy needs basic auth.Only for identification.Password is dummy."},
+            },
+            body => 'authentication required',
+        );
     }
 }
@@ -181 +185 @@
     my %args = validate(
         @_ => +{
-            c       => { isa  => 'HTTP::Engine::Compat::Context', },
+            req     => { isa  => 'HTTP::Engine::Request', },
             user_id => { type => SCALAR },
         }
     );
-    my $c = $args{c};
-
-    my $base = $c->req->uri->clone;
+    my $req = $args{req};
+
+    my $base = $req->uri->clone;
     $base->path('');
     $base->query_form({});
 
-    (my $url = $c->req->uri->path_query) =~ s!^/!!;
+    (my $url = $req->uri->path_query) =~ s!^/!!;
     $url = uf_uristr(uri_unescape $url);
 
@@ -198 +202 @@
         my $res = $self->_do_request(
             url     => $url,
-            request => $c->req->as_http_request,
+            request => $req->as_http_request,
             user_id => $args{user_id},
         );
@@ -211 +215 @@
                 $location->port($uri->port);
             }
-            $res->header( 'Location' => $base . '/' . uri_escape( $location ) );
-            $self->log(debug => "redirect to " . $res->header('Location'));
+            my $redirect = $base . '/' . uri_escape($location);
+            $self->log(debug => "redirect to $redirect");
+            return HTTP::Engine::Response->new(
+                status  => 302,
+                headers => {
+                    Location => $redirect,
+                },
+            );
         } else {
             my $content_type = $res->header('Content-Type');
@@ -219 +229 @@
                 $res->content( encode($res->charset, rewrite($base, decode($res->charset, $res->content), $url)) );
             }
-            use bytes;
-            $res->header('Content-Length' => bytes::length($res->content));
-        }
-        $c->res->set_http_response($res);
+
+            my $response = HTTP::Engine::Response->new();
+            $response->set_http_response($res);
+            return $response;
+        }
     } else {
         # please input url.
-        $c->res->status(200);
-        $c->res->content_type('text/html; charset=utf8');
-        $c->res->body( render_start_page($base) );
+        return HTTP::Engine::Response->new(
+            status       => 200,
+            content_type => 'text/html; charset=utf8',
+            body         => render_start_page($base),
+        );
     }
 }

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

@@ -6 +6 @@
 use File::Spec::Functions;
 use FindBin;
-use HTTP::Engine::Compat;
+use HTTP::Engine;
 use Moxy;
 use YAML;
@@ -55 +55 @@
             args =>   $config->{global}->{server}->{args},
             request_handler => sub {
-                my $c = shift;
-                $moxy->handle_request( $c );
+                my $req = shift;
+                $moxy->handle_request( $req );
             },
         }