X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FEngine%2FTest.pm;h=8173bdef41643381f325b4029dc4d4e5f0af7987;hb=b14151e76ebbd0a776e7955238ce1afbc1985a33;hp=59a6246e70c6b44b56af5374aaa874631fc3ab99;hpb=75fd617a0395f9a49cd215c17bb21f4fadf14db4;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Engine/Test.pm b/lib/Catalyst/Engine/Test.pm index 59a6246..8173bde 100644 --- a/lib/Catalyst/Engine/Test.pm +++ b/lib/Catalyst/Engine/Test.pm @@ -1,24 +1,11 @@ package Catalyst::Engine::Test; use strict; -use base 'Catalyst::Engine'; - -use CGI::Simple::Cookie; -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 IO::File; -use URI; - -__PACKAGE__->mk_accessors(qw/lwp/); - -Class::Struct::struct 'Catalyst::Engine::Test::LWP' => { - request => 'HTTP::Request', - response => 'HTTP::Response', - hostname => '$', - address => '$' -}; +use HTTP::Status; +use NEXT; =head1 NAME @@ -46,215 +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; - - my $status = $c->response->status || 200; - my $headers = $c->response->headers; - my $response = HTTP::Response->new( $status, undef, $headers ); - - while ( my ( $name, $cookie ) = each %{ $c->response->cookies } ) { - my $cookie = CGI::Simple::Cookie->new( - -name => $name, - -value => $cookie->{value}, - -expires => $cookie->{expires}, - -domain => $cookie->{domain}, - -path => $cookie->{path}, - -secure => $cookie->{secure} || 0 - ); - - $response->header( 'Set-Cookie' => $cookie->as_string ); - } - - $c->lwp->response($response); -} - -=item $c->finalize_output - -=cut - -sub finalize_output { - my $c = shift; - $c->lwp->response->content_ref( \$c->response->{output} ); + 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->prepare_connection +=item $self->run($c) =cut -sub prepare_connection { - my $c = shift; - $c->req->hostname( $c->lwp->hostname ); - $c->req->address( $c->lwp->address ); -} - -=item $c->prepare_cookies - -=cut - -sub prepare_cookies { - my $c = shift; - - if ( my $header = $c->request->headers->header('Cookie') ) { - $c->req->cookies( { CGI::Simple::Cookie->parse($header) } ); - } -} - -=item $c->prepare_headers - -=cut - -sub prepare_headers { - my $c = shift; - $c->req->method( $c->lwp->request->method ); - $c->req->headers( $c->lwp->request->headers ); -} - -=item $c->prepare_parameters - -=cut - -sub prepare_parameters { - my $c = shift; - - my @params = (); - my $request = $c->lwp->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 - }; +sub run { + my ( $self, $class, $request ) = @_; - push( @params, $parameters{filename}, $fh ); - } - else { - push( @params, $parameters{name}, $part->content ); - } - } - } + $request = Catalyst::Utils::request($request); - my $parameters = $c->req->parameters; + $request->header( + 'Host' => sprintf( '%s:%d', $request->uri->host, $request->uri->port ) + ); - while ( my ( $name, $value ) = splice( @params, 0, 2 ) ) { + # 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, + ); - if ( exists $parameters->{$name} ) { - for ( $parameters->{$name} ) { - $_ = [$_] unless ref($_) eq "ARRAY"; - push( @$_, $value ); - } + # 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 { - $parameters->{$name} = $value; + $ENV{$name} = $value; } } -} - -=item $c->prepare_path - -=cut - -sub prepare_path { - my $c = shift; - - my $base; - { - my $scheme = $c->lwp->request->uri->scheme; - my $host = $c->lwp->request->uri->host; - my $port = $c->lwp->request->uri->port; - - $base = URI->new; - $base->scheme($scheme); - $base->host($host); - $base->port($port); - - $base = $base->canonical->as_string; - } - - my $path = $c->lwp->request->uri->path || '/'; - $path =~ s/^\///; - - $c->req->base($base); - $c->req->path($path); -} - -=item $c->prepare_request($r) -=cut + # STDIN + local *STDIN; + my $input = $request->content; + open STDIN, '<', \$input; -sub prepare_request { - my ( $c, $lwp ) = @_; - $c->lwp($lwp); -} + # STDOUT + local *STDOUT; + my $output = ''; + open STDOUT, '>', \$output; -=item $c->prepare_uploads + # Process + $class->handle_request; -=cut - -sub prepare_uploads { - my $c = shift; + # Response + return HTTP::Response->parse($output); } -=item $c->run +=item $self->read_chunk($c, $buffer, $length) =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 $lwp = Catalyst::Engine::Test::LWP->new( - request => $request, - address => '127.0.0.1', - hostname => 'localhost' - ); - - $class->handler($lwp); - - return $lwp->response; -} +sub read_chunk { shift; shift; *STDIN->read(@_); } =back @@ -262,10 +122,13 @@ sub run { L. -=head1 AUTHOR +=head1 AUTHORS + +Sebastian Riedel, + +Christian Hansen, -Sebastian Riedel, C -Christian Hansen, C +Andy Grundman, =head1 COPYRIGHT