X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FEngine%2FTest.pm;h=429bdad738425632068e4cecab693f5242f0ec23;hb=969647fdbaeeb9231c53350eb980202b379c634a;hp=df1b8c5aa20dd8759e73202236966646b700e49d;hpb=c9afa5fc4ed6c36afe6653d7d8fbb9909994c1a8;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Engine/Test.pm b/lib/Catalyst/Engine/Test.pm
index df1b8c5..429bdad 100644
--- a/lib/Catalyst/Engine/Test.pm
+++ b/lib/Catalyst/Engine/Test.pm
@@ -1,13 +1,24 @@
 package Catalyst::Engine::Test;
 
 use strict;
-use base 'Catalyst::Engine::CGI::NPH';
+use base 'Catalyst::Engine';
 
+use Class::Struct ();
+use HTTP::Headers::Util 'split_header_words';
 use HTTP::Request;
 use HTTP::Response;
 use IO::File;
 use URI;
 
+__PACKAGE__->mk_accessors(qw/http/);
+
+Class::Struct::struct 'Catalyst::Engine::Test::HTTP' => {
+    request  => 'HTTP::Request',
+    response => 'HTTP::Response',
+    hostname => '$',
+    address  => '$'
+};
+
 =head1 NAME
 
 Catalyst::Engine::Test - Catalyst Test Engine
@@ -34,10 +45,160 @@ This is the Catalyst engine specialized for testing.
 
 =head1 OVERLOADED METHODS
 
-This class overloads some methods from C<Catalyst::Engine::CGI::NPH>.
+This class overloads some methods from C<Catalyst::Engine>.
 
 =over 4
 
+=item $c->finalize_headers
+
+=cut
+
+sub finalize_headers {
+    my $c = shift;
+
+    $c->http->response->code( $c->response->status );
+
+    for my $name ( $c->response->headers->header_field_names ) {
+        $c->http->response->push_header( $name => [ $c->response->header($name) ] );
+    }
+}
+
+=item $c->finalize_output
+
+=cut
+
+sub finalize_output {
+    my $c = shift;
+    $c->http->response->content( $c->response->output );
+}
+
+=item $c->prepare_connection
+
+=cut
+
+sub prepare_connection {
+    my $c = shift;
+    $c->req->hostname( $c->http->hostname );
+    $c->req->address( $c->http->address );
+}
+
+=item $c->prepare_headers
+
+=cut
+
+sub prepare_headers {
+    my $c = shift;
+    $c->req->method( $c->http->request->method );
+    $c->req->headers( $c->http->request->headers );
+}
+
+=item $c->prepare_parameters
+
+=cut
+
+sub prepare_parameters {
+    my $c = shift;
+
+    my @params  = ();
+    my $request = $c->http->request;
+
+    push( @params, $request->uri->query_form );
+
+    if ( $request->content_type eq 'application/x-www-form-urlencoded' ) {
+        my $uri = URI->new('http:');
+        $uri->query( $request->content );
+        push( @params, $uri->query_form );
+    }
+
+    if ( $request->content_type eq 'multipart/form-data' ) {
+
+        for my $part ( $request->parts ) {
+
+            my $disposition = $part->header('Content-Disposition');
+            my %parameters  = @{ ( split_header_words($disposition) )[0] };
+
+            if ( $parameters{filename} ) {
+
+                my $fh = IO::File->new_tmpfile;
+                $fh->write( $part->content ) or die $!;
+                $fh->seek( SEEK_SET, 0 ) or die $!;
+
+                $c->req->uploads->{ $parameters{filename} } = {
+                    fh   => $fh,
+                    size => ( stat $fh )[7],
+                    type => $part->content_type
+                };
+
+                push( @params, $parameters{filename}, $fh );
+            }
+            else {
+                push( @params, $parameters{name}, $part->content );
+            }
+        }
+    }
+
+    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;
+        }
+    }
+}
+
+=item $c->prepare_path
+
+=cut
+
+sub prepare_path {
+    my $c = shift;
+
+    my $base;
+    {
+        my $scheme = $c->http->request->uri->scheme;
+        my $host   = $c->http->request->uri->host;
+        my $port   = $c->http->request->uri->port;
+
+        $base = URI->new;
+        $base->scheme($scheme);
+        $base->host($host);
+        $base->port($port);
+
+        $base = $base->canonical->as_string;
+    }
+
+    my $path = $c->http->request->uri->path || '/';
+    $path =~ s/%([0-9A-Fa-f]{2})/chr(hex($1))/eg;
+    $path =~ s/^\///;
+
+    $c->req->base($base);
+    $c->req->path($path);
+}
+
+=item $c->prepare_request($r)
+
+=cut
+
+sub prepare_request {
+    my ( $c, $http ) = @_;
+    $c->http($http);
+}
+
+=item $c->prepare_uploads
+
+=cut
+
+sub prepare_uploads {
+    my $c = shift;
+}
+
 =item $c->run
 
 =cut
@@ -47,49 +208,33 @@ sub run {
     my $request = shift || '/';
 
     unless ( ref $request ) {
-        $request = URI->new( $request, 'http' );
+
+        my $uri = ( $request =~ m/http/i )
+          ? URI->new($request)
+          : URI->new( 'http://localhost' . $request );
+
+        $request = $uri->canonical;
     }
+
     unless ( ref $request eq 'HTTP::Request' ) {
         $request = HTTP::Request->new( 'GET', $request );
     }
 
-    local ( *STDIN, *STDOUT );
-
-    my %clean  = %ENV;
-    my $output = '';
-    $ENV{CONTENT_TYPE}   ||= $request->header('Content-Type')   || '';
-    $ENV{CONTENT_LENGTH} ||= $request->header('Content-Length') || '';
-    $ENV{GATEWAY_INTERFACE} ||= 'CGI/1.1';
-    $ENV{HTTP_USER_AGENT}   ||= 'Catalyst';
-    $ENV{HTTP_HOST}         ||= $request->uri->host || 'localhost';
-    $ENV{QUERY_STRING}      ||= $request->uri->query || '';
-    $ENV{REQUEST_METHOD}    ||= $request->method;
-    $ENV{PATH_INFO}         ||= $request->uri->path || '/';
-    $ENV{SCRIPT_NAME}       ||= '/';
-    $ENV{SERVER_NAME}       ||= $request->uri->host || 'localhost';
-    $ENV{SERVER_PORT}       ||= $request->uri->port;
-    $ENV{SERVER_PROTOCOL}   ||= 'HTTP/1.1';
-
-    for my $field ( $request->header_field_names ) {
-        if ( $field =~ /^Content-(Length|Type)$/ ) {
-            next;
-        }
-        $field =~ s/-/_/g;
-        $ENV{ 'HTTP_' . uc($field) } = $request->header($field);
-    }
+    my $host = sprintf( '%s:%d', $request->uri->host, $request->uri->port );
+    $request->header( 'Host' => $host );
 
-    if ( $request->content_length ) {
-        my $body = IO::File->new_tmpfile;
-        $body->print( $request->content ) or die $!;
-        $body->seek( 0, SEEK_SET ) or die $!;
-        open( STDIN, "<&=", $body->fileno )
-          or die("Failed to dup \$body: $!");
-    }
+    my $http = Catalyst::Engine::Test::HTTP->new(
+        address  => '127.0.0.1',
+        hostname => 'localhost',
+        request  => $request,
+        response => HTTP::Response->new
+    );
+
+    $http->response->date(time);
+
+    $class->handler($http);
 
-    open( STDOUT, '>', \$output );
-    $class->handler;
-    %ENV = %clean;
-    return HTTP::Response->parse($output);
+    return $http->response;
 }
 
 =back