Changeset 13408

Timestamp:

06/07/08 20:59:54 (5 years ago)

Author:

nothingmuch

Message:

everything is now lazy, almost passes test suite

Location:

lang/perl/HTTP-Engine/branches/lazy_request

Files:

• lib/HTTP/Engine/Request.pm (modified) (2 diffs)
• lib/HTTP/Engine/RequestBuilder.pm (modified) (3 diffs)
• t/10_request_builder.t (modified) (2 diffs)

lang/perl/HTTP-Engine/branches/lazy_request/lib/HTTP/Engine/Request.pm

@@ -147 +147 @@
 }
 
+has "_http_body" => (
+    is => "rw",
+    lazy_build => 1,
+);
+
+sub _build__http_body {
+    my $self = shift;
+    $self->request_builder->_build_initial_http_body($self);
+}
+
 has http_body => (
     is         => 'rw',
@@ -159 +169 @@
 sub _build_http_body {
     my $self = shift;
-    $self->_build_
+    $self->request_builder->_build_full_http_body($self);
 }
 

lang/perl/HTTP-Engine/branches/lazy_request/lib/HTTP/Engine/RequestBuilder.pm

@@ -27 +27 @@
 
 no Moose;
-
-sub prepare {
-    my ($self, $context) = @_;
-
-    # init.
-    delete $self->{_prepared_read};
-
-    # do build.
-    for my $method (qw( body uploads )) {
-        my $method = "_prepare_$method";
-        $self->$method($context);
-    }
-}
 
 sub _build_connection_info {
@@ -108 +95 @@
 }
 
-sub _prepare_body  {
-    my($self, $c) = @_;
-
-    my $req = $c->req;
+sub _build_initial_http_body  {
+    my($self, $req) = @_;
 
     # TODO: catalyst のように prepare フェーズで処理せず、遅延評価できるようにする 
-    $self->read_length($req->header('Content-Length') || 0);
+    my $length = $req->header('Content-Length') || 0;
     my $type = $req->header('Content-Type');
 
-    $req->http_body( HTTP::Body->new($type, $self->read_length) );
-    $req->http_body->{tmpdir} = $self->upload_tmp if $self->upload_tmp;
-
-    $self->_read_to_end($c);
+    my $body = HTTP::Body->new($type, $length);
+    $body->{tmpdir} = $self->upload_tmp if $self->upload_tmp;
+
+    return {
+        read_length => $length,
+        body        => $body,
+    };
+}
+
+sub _build_full_http_body {
+    my ( $self, $req ) = @_;
+    $self->_read_to_end($req);
+    return $req->_http_body->{body};
+}
+
+sub _build_raw_body {
+    my ( $self, $req ) = @_;
+    $self->_read_to_end($req);
+    return $req->_raw_body;
 }
 
 sub _read_to_end {
-    my ( $self, $c ) = @_;
-
-    if ($self->read_length > 0) {
-        $self->_read_all($c);
+    my ( $self, $req ) = @_;
+
+    if ($req->_http_body->{read_length} > 0) {
+        $self->_read_all($req);
 
         # paranoia against wrong Content-Length header
@@ -139 +139 @@
 
 sub _read_all {
-    my ( $self, $c ) = @_;
+    my ( $self, $req ) = @_;
 
     while (my $buffer = $self->_read) {
-        $self->_prepare_body_chunk($c, $buffer);
+        $self->_prepare_body_chunk($req, $buffer);
     }
 }
 
 sub _prepare_body_chunk {
-    my($self, $c, $chunk) = @_;
-
-    my $req = $c->req;
-
-    $req->_raw_body($req->raw_body . $chunk);
-
-    $req->http_body->add($chunk);
+    my($self, $req, $chunk) = @_;
+
+    $req->_raw_body($req->_raw_body . $chunk);
+    $req->_http_body->{body}->add($chunk);
 }
 

lang/perl/HTTP-Engine/branches/lazy_request/t/10_request_builder.t

@@ -2 +2 @@
 use YAML ();
 use HTTP::Engine::Context;
+use HTTP::Engine::Request;
 use HTTP::Engine::RequestBuilder;
 use IO::Scalar;
 
 plan tests => 8;
-
-can_ok(
-    'HTTP::Engine::RequestBuilder' => 'prepare'
-);
 
 filters {
@@ -21 +18 @@
 
     local %ENV = %{ $block->env };
-    my $c = HTTP::Engine::Context->new();
 
     tie *STDIN, 'IO::Scalar', \( $block->body );
-    $builder->prepare($c);
+
+    my $c = HTTP::Engine::Context->new(
+        req => HTTP::Engine::Request->new( request_builder => $builder ),
+    );
+
+    eval $block->test;
+
     untie *STDIN;
 
-    eval $block->test;
     die $@ if $@;
 };