Changeset 10723

Timestamp:

04/29/08 12:10:23 (5 years ago)

Author:

tokuhirom

Message:

HTTP::Engine の context を内部までくいこませて簡素化。でもここまでしか侵入させないよ。

Files:

• lang/perl/Moxy/trunk/lib/Moxy.pm (modified) (6 diffs)

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

@@ -136 +136 @@
 
 sub render_start_page {
-    my ($base, $current_url) = @_;
+    my $base = shift;
 
     return sprintf(<<"...");
@@ -166 +166 @@
     $self->log(debug => "Authorization header: $session_id");
     if ($session_id) {
-        my $uri = URI->new($c->req->uri);
-        $self->log(debug => "Request URI: $uri");
-
-        my $base = $uri->clone;
-        $base->path('');
-        $base->query_form({});
-
-        (my $url = $uri->path_query) =~ s!^/!!;
-        $url = uf_uristr(uri_unescape $url);
-        my $response = $self->_make_response(
-            url      => $url,
-            request  => $c->req->as_http_request,
-            base_url => $base,
+        $self->_make_response(
+            c => $c,
             user_id  => $session_id,
         );
-        $c->res->set_http_response($response);
     } else {
         $c->res->status(401);
@@ -193 +181 @@
     my %args = validate(
         @_ => +{
-            url      => qr{^https?://},
-            request  => { isa  => 'HTTP::Request' },
-            base_url => qr{^https?://},
-            user_id  => { type => SCALAR },
+            c       => { isa  => 'HTTP::Engine::Context', },
+            user_id => { type => SCALAR },
         }
     );
-    my $url = $args{url};
-    my $base_url = $args{base_url};
+    my $c = $args{c};
+
+    my $base = $c->req->uri->clone;
+    $base->path('');
+    $base->query_form({});
+
+    (my $url = $c->req->uri->path_query) =~ s!^/!!;
+    $url = uf_uristr(uri_unescape $url);
 
     if ($url) {
@@ -206 +198 @@
         my $res = $self->_do_request(
             url     => $url,
-            request => $args{request},
+            request => $c->req->as_http_request,
             user_id => $args{user_id},
         );
@@ -219 +211 @@
                 $location->port($uri->port);
             }
-            $res->header( 'Location' => $base_url . '/' . uri_escape( $location ) );
+            $res->header( 'Location' => $base . '/' . uri_escape( $location ) );
             $self->log(debug => "redirect to " . $res->header('Location'));
         } else {
@@ -225 +217 @@
             $self->log("Content-Type: $content_type");
             if ($content_type =~ /html/i) {
-                $res->content( encode($res->charset, rewrite($base_url, decode($res->charset, $res->content), $url)) );
+                $res->content( encode($res->charset, rewrite($base, decode($res->charset, $res->content), $url)) );
             }
             use bytes;
             $res->header('Content-Length' => bytes::length($res->content));
         }
-        return $res;
+        $c->res->set_http_response($res);
     } else {
         # please input url.
-        my $res = HTTP::Response->new(200, 'about:blank');
-        $res->header('Content-Type' => 'text/html; charset=utf8');
-        my $panel = render_start_page($base_url, '');
-        $res->content($panel);
-        return $res;
+        $c->res->status(200);
+        $c->res->content_type('text/html; charset=utf8');
+        $c->res->body( render_start_page($base) );
     }
 }