Added $c-req->protocol and $c->req->secure

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Engine / Test.pm

diff --git a/lib/Catalyst/Engine/Test.pm b/lib/Catalyst/Engine/Test.pm
index fb6f26e..290df14 100644 (file)
--- a/lib/Catalyst/Engine/Test.pm
+++ b/lib/Catalyst/Engine/Test.pm
@@ -7,7 +7,7 @@ use Class::Struct ();
 use HTTP::Headers::Util 'split_header_words';
 use HTTP::Request;
 use HTTP::Response;
-use IO::File;
+use File::Temp;
 use URI;
 
 __PACKAGE__->mk_accessors(qw/http/);
@@ -49,6 +49,15 @@ This class overloads some methods from C<Catalyst::Engine>.
 
 =over 4
 
+=item $c->finalize_body
+
+=cut
+
+sub finalize_body {
+    my $c = shift;
+    $c->http->response->content( $c->response->body );
+}
+
 =item $c->finalize_headers
 
 =cut
@@ -63,13 +72,13 @@ sub finalize_headers {
     }
 }
 
-=item $c->finalize_output
+=item $c->prepare_body
 
 =cut
 
-sub finalize_output {
+sub prepare_body {
     my $c = shift;
-    $c->http->response->content_ref( \$c->response->{output} );
+    $c->request->body( $c->http->request->content );
 }
 
 =item $c->prepare_connection
@@ -78,8 +87,9 @@ sub finalize_output {
 
 sub prepare_connection {
     my $c = shift;
-    $c->req->hostname( $c->http->hostname );
-    $c->req->address( $c->http->address );
+    $c->request->address( $c->http->address );
+    $c->request->hostname( $c->http->hostname );
+    $c->request->protocol( $c->http->request->protocol );
 }
 
 =item $c->prepare_headers
@@ -88,8 +98,8 @@ sub prepare_connection {
 
 sub prepare_headers {
     my $c = shift;
-    $c->req->method( $c->http->request->method );
-    $c->req->headers( $c->http->request->headers );
+    $c->request->method( $c->http->request->method );
+    $c->request->headers( $c->http->request->headers );
 }
 
 =item $c->prepare_parameters
@@ -99,7 +109,8 @@ sub prepare_headers {
 sub prepare_parameters {
     my $c = shift;
 
-    my @params  = ();
+    my ( @params, @uploads );
+
     my $request = $c->http->request;
 
     push( @params, $request->uri->query_form );
@@ -119,17 +130,21 @@ sub prepare_parameters {
 
             if ( $parameters{filename} ) {
 
-                my $fh = IO::File->new_tmpfile;
+                my $fh = File::Temp->new( UNLINK => 0 );
                 $fh->write( $part->content ) or die $!;
-                $fh->seek( SEEK_SET, 0 ) or die $!;
+                $fh->flush or die $!;
 
-                $c->req->uploads->{ $parameters{filename} } = {
-                    fh   => $fh,
-                    size => ( stat $fh )[7],
-                    type => $part->content_type
-                };
+                my $upload = Catalyst::Request::Upload->new(
+                    filename => $parameters{filename},
+                    size     => ( $fh->stat )[7],
+                    tempname => $fh->filename,
+                    type     => $part->content_type
+                );
 
-                push( @params, $parameters{filename}, $fh );
+                $fh->close;
+
+                push( @uploads, $parameters{name}, $upload );
+                push( @params,  $parameters{name}, $parameters{filename} );
             }
             else {
                 push( @params, $parameters{name}, $part->content );
@@ -137,20 +152,8 @@ sub prepare_parameters {
         }
     }
 
-    my $parameters = $c->req->parameters;
-
-    while ( my ( $name, $value ) = splice( @params, 0, 2 ) ) {
-
-        if ( exists $parameters->{$name} ) {
-            for ( $parameters->{$name} ) {
-                $_ = [$_] unless ref($_) eq "ARRAY";
-                push( @$_, $value );
-            }
-        }
-        else {
-            $parameters->{$name} = $value;
-        }
-    }
+    $c->request->param(@params);
+    $c->request->upload(@uploads);
 }
 
 =item $c->prepare_path
@@ -209,7 +212,8 @@ sub run {
 
     unless ( ref $request ) {
 
-        my $uri = ( $request =~ m/http/i )
+        my $uri =
+          ( $request =~ m/http/i )
           ? URI->new($request)
           : URI->new( 'http://localhost' . $request );