X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FEngine%2FTest.pm;h=fb487a1578d5ee4c8696983a49375f4760d4ff18;hp=102c8c95c402546b17adf1188f6497f50d28a45b;hb=fbcc39ad23f2bbecf5d84c9ba581e6af86fcd460;hpb=146554c575f7f9fda102985196e0b6b364847bc0 diff --git a/lib/Catalyst/Engine/Test.pm b/lib/Catalyst/Engine/Test.pm index 102c8c9..fb487a1 100644 --- a/lib/Catalyst/Engine/Test.pm +++ b/lib/Catalyst/Engine/Test.pm @@ -1,23 +1,11 @@ package Catalyst::Engine::Test; use strict; -use base 'Catalyst::Engine'; - -use Class::Struct (); -use HTTP::Headers::Util 'split_header_words'; -use HTTP::Request; +use base 'Catalyst::Engine::CGI'; +use Catalyst::Utils; use HTTP::Response; -use File::Temp; -use URI; - -__PACKAGE__->mk_accessors(qw/http/); - -Class::Struct::struct 'Catalyst::Engine::Test::HTTP' => { - request => 'HTTP::Request', - response => 'HTTP::Response', - hostname => '$', - address => '$' -}; +use HTTP::Status; +use NEXT; =head1 NAME @@ -45,190 +33,88 @@ This is the Catalyst engine specialized for testing. =head1 OVERLOADED METHODS -This class overloads some methods from C. +This class overloads some methods from C. =over 4 -=item $c->finalize_headers +=item 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) ] ); - } + my ( $self, $c ) = @_; + my $protocol = $c->request->protocol; + my $status = $c->response->status; + my $message = status_message($status); + print "$protocol $status $message\n"; + $c->response->headers->date(time); + $self->NEXT::finalize_headers($c); } -=item $c->finalize_output +=item $self->run($c) =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, @uploads ); - - 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] }; +sub run { + my ( $self, $class, $request ) = @_; - if ( $parameters{filename} ) { + $request = Catalyst::Utils::request($request); - my $fh = File::Temp->new( UNLINK => 0 ); - $fh->write( $part->content ) or die $!; + $request->header( + 'Host' => sprintf( '%s:%d', $request->uri->host, $request->uri->port ) + ); - my $upload = Catalyst::Request::Upload->new( - filename => $parameters{filename}, - size => ( stat $fh )[7], - tempname => $fh->filename, - type => $part->content_type - ); - - $fh->close; + # We emulate CGI + local %ENV = ( + PATH_INFO => $request->uri->path || '', + QUERY_STRING => $request->uri->query || '', + REMOTE_ADDR => '127.0.0.1', + REMOTE_HOST => 'localhost', + REQUEST_METHOD => $request->method, + SERVER_NAME => 'localhost', + SERVER_PORT => $request->uri->port, + SERVER_PROTOCOL => 'HTTP/1.1', + %ENV, + ); - push( @uploads, $parameters{name}, $upload ); - push( @params, $parameters{name}, $fh ); - } - else { - push( @params, $parameters{name}, $part->content ); - } + # Headers + for my $header ( $request->header_field_names ) { + my $name = uc $header; + $name = 'COOKIE' if $name eq 'COOKIES'; + $name =~ tr/-/_/; + $name = 'HTTP_' . $name + unless $name =~ m/\A(?:CONTENT_(?:LENGTH|TYPE)|COOKIE)\z/; + my $value = $request->header($header); + if ( exists $ENV{$name} ) { + $ENV{$name} .= "; $value"; + } + else { + $ENV{$name} = $value; } - } - - $c->req->_assign_values( $c->req->parameters, \@params ); - $c->req->_assign_values( $c->req->uploads, \@uploads ); -} - -=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/^\///; + # STDIN + local *STDIN; + my $input = $request->content; + open STDIN, '<', \$input; - $c->req->base($base); - $c->req->path($path); -} - -=item $c->prepare_request($r) + # STDOUT + local *STDOUT; + my $output = ''; + open STDOUT, '>', \$output; -=cut + # Process + $class->handle_request; -sub prepare_request { - my ( $c, $http ) = @_; - $c->http($http); + # Response + return HTTP::Response->parse($output); } -=item $c->prepare_uploads +=item $self->read_chunk($c, $buffer, $length) =cut -sub prepare_uploads { - my $c = shift; -} - -=item $c->run - -=cut - -sub run { - my $class = shift; - my $request = shift || '/'; - - unless ( ref $request ) { - - 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 ); - } - - my $host = sprintf( '%s:%d', $request->uri->host, $request->uri->port ); - $request->header( 'Host' => $host ); - - 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); - - return $http->response; -} +sub read_chunk { shift; shift->request->handle->read( @_ ); } =back @@ -236,10 +122,13 @@ sub run { L. -=head1 AUTHOR +=head1 AUTHORS + +Sebastian Riedel, + +Christian Hansen, -Sebastian Riedel, C -Christian Hansen, C +Andy Grundman, =head1 COPYRIGHT