X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FEngine%2FHTTP.pm;h=b0f10d929911e14e9f18afaf46849f6760b6be87;hb=b26df351ecca539ec3b1e3a6bd54db2736583195;hp=6eb297045ba82b7c09047ccf45aed735f5e903a1;hpb=45374ac6977e9464410a8c7518fb26ab812258cb;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Engine/HTTP.pm b/lib/Catalyst/Engine/HTTP.pm
index 6eb2970..b0f10d9 100644
--- a/lib/Catalyst/Engine/HTTP.pm
+++ b/lib/Catalyst/Engine/HTTP.pm
@@ -1,25 +1,9 @@
 package Catalyst::Engine::HTTP;
 
 use strict;
-use base 'Catalyst::Engine';
-
-use CGI::Simple::Cookie;
-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::HTTP::LWP' => {
-    request  => 'HTTP::Request',
-    response => 'HTTP::Response',
-    hostname => '$',
-    address  => '$'
-};
+use base 'Catalyst::Engine::Test';
 
+use IO::Socket qw(AF_INET INADDR_ANY SOCK_STREAM SOMAXCONN);
 
 =head1 NAME
 
@@ -27,197 +11,89 @@ Catalyst::Engine::HTTP - Catalyst HTTP Engine
 
 =head1 SYNOPSIS
 
-L<Catalyst>.
+A script using the Catalyst::Engine::HTTP module might look like:
 
-=head1 DESCRIPTION
+    #!/usr/bin/perl -w
 
-This Catalyst engine is meant to be subclassed.
+    BEGIN {  $ENV{CATALYST_ENGINE} = 'HTTP' }
 
-=head1 OVERLOADED METHODS
+    use strict;
+    use lib '/path/to/MyApp/lib';
+    use MyApp;
 
-This class overloads some methods from C<Catalyst::Engine>.
+    MyApp->run;
 
-=over 4
-
-=item $c->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 );
-    }
+=head1 DESCRIPTION
 
-    $c->http->response($response);
-}
+This is the Catalyst engine specialized for development and testing.
 
-=item $c->finalize_output
+=head1 OVERLOADED METHODS
 
-=cut
+This class overloads some methods from C<Catalyst::Engine::Test>.
 
-sub finalize_output {
-    my $c = shift;
-    $c->http->response->content_ref( \$c->response->{output} );
-}
+=over 4
 
-=item $c->prepare_connection
+=item $c->run
 
 =cut
 
-sub prepare_connection {
-    my $c = shift;
-    $c->req->hostname( $c->http->hostname );
-    $c->req->address( $c->http->address );
-}
+$SIG{'PIPE'} = 'IGNORE';
 
-=item $c->prepare_cookies
+sub run {
+    my $class = shift;
+    my $port  = shift || 3000;
 
-=cut
+    my $daemon = Catalyst::Engine::HTTP::Catalyst->new(
+        Listen    => SOMAXCONN,
+        LocalPort => $port,
+        ReuseAddr => 1,
+        Type      => SOCK_STREAM,
+    );
 
-sub prepare_cookies {
-    my $c = shift;
-
-    if ( my $header = $c->http->request->header('Cookie') ) {
-        $c->req->cookies( { CGI::Simple::Cookie->parse($header) } );
+    unless ($daemon) {
+        die("Failed to create daemon: $!\n");
     }
-}
 
-=item $c->prepare_headers
+    my $base = URI->new( $daemon->url )->canonical;
 
-=cut
+    printf( "You can connect to your server at %s\n", $base );
 
-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 );
-    }
+    while ( my $connection = $daemon->accept ) {
 
-    if ( $request->content_type eq 'multipart/form-data' ) {
+        $connection->timeout(5);
 
-        for my $part ( $request->parts ) {
+        while ( my $request = $connection->get_request ) {
 
-            my $disposition = $part->header('Content-Disposition');
-            my %parameters  = @{ ( split_header_words($disposition) )[0] };
+            $request->uri->scheme('http');    # Force URI::http
+            $request->uri->host( $request->header('Host') || $base->host );
+            $request->uri->port( $base->port );
 
-            if ( $parameters{filename} ) {
+            my $lwp = Catalyst::Engine::Test::LWP->new(
+                address  => $connection->peerhost,
+                hostname => gethostbyaddr( $connection->peeraddr, AF_INET ),
+                request  => $request,
+                response => HTTP::Response->new
+            );
 
-                my $fh = IO::File->new_tmpfile;
-                $fh->write( $part->content ) or die $!;
-                $fh->seek( SEEK_SET, 0 ) or die $!;
+            $class->handler($lwp);
+            $connection->send_response( $lwp->response );
 
-                $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 );
+            if ( $class->debug ) {
+                $class->log->info( sprintf( "Peer %s:%d",$connection->peerhost, $connection->peerport ) );
             }
-        }
-    }
-
-    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;
+        $connection->close;
+        undef($connection);
     }
-
-    my $path = $c->http->request->uri->path || '/';
-    $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;
 }
 
 =back
 
 =head1 SEE ALSO
 
-L<Catalyst>.
+L<Catalyst>, L<HTTP::Daemon>.
 
 =head1 AUTHOR
 
@@ -231,4 +107,13 @@ the same terms as Perl itself.
 
 =cut
 
+package Catalyst::Engine::HTTP::Catalyst;
+
+use strict;
+use base 'HTTP::Daemon';
+
+sub product_tokens {
+    "Catalyst/$Catalyst::VERSION";
+}
+
 1;