X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FEngine.pm;h=79ecbb80cd1544ad991e4514f78a518ae5c9d736;hp=641cc6d63ac6e0a0e684da3ec897635896a5ad8d;hb=e060fe05e8770527de1f433b4ae4bc2cd1e8c303;hpb=cd677e12b127597abb93b76560c8cb23a47d5da6 diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm index 641cc6d..79ecbb8 100644 --- a/lib/Catalyst/Engine.pm +++ b/lib/Catalyst/Engine.pm @@ -2,6 +2,7 @@ package Catalyst::Engine; use strict; use base qw/Class::Data::Inheritable Class::Accessor::Fast/; +use attributes (); use UNIVERSAL::require; use CGI::Cookie; use Data::Dumper; @@ -15,6 +16,7 @@ use Catalyst::Response; require Module::Pluggable::Fast; +# For pretty dumps $Data::Dumper::Terse = 1; __PACKAGE__->mk_classdata('components'); @@ -24,6 +26,10 @@ __PACKAGE__->mk_accessors(qw/request response state/); *req = \&request; *res = \&response; +# For backwards compatibility +*finalize_output = \&finalize_body; + +# For statistics our $COUNT = 1; our $START = time; @@ -75,14 +81,17 @@ Regex search for a component. sub component { my ( $c, $name ) = @_; + if ( my $component = $c->components->{$name} ) { return $component; } + else { for my $component ( keys %{ $c->components } ) { return $c->components->{$component} if $component =~ /$name/i; } } + } =item $c->error @@ -120,6 +129,7 @@ sub execute { $class = $c->comp($class) || $class; $c->state(0); my $callsub = ( caller(1) )[3]; + eval { if ( $c->debug ) { @@ -133,6 +143,7 @@ sub execute { } else { $c->state( &$code( $class, $c, @{ $c->req->args } ) ) } }; + if ( my $error = $@ ) { unless ( ref $error ) { @@ -168,20 +179,28 @@ sub finalize { $c->finalize_error; } - if ( !$c->response->output && $c->response->status !~ /^(1|3)\d\d$/ ) { + if ( !$c->response->body && $c->response->status !~ /^(1|3)\d\d$/ ) { $c->finalize_error; } - if ( $c->response->output && !$c->response->content_length ) { + if ( $c->response->body && !$c->response->content_length ) { use bytes; # play safe with a utf8 aware perl - $c->response->content_length( length $c->response->output ); + $c->response->content_length( length $c->response->body ); } my $status = $c->finalize_headers; - $c->finalize_output; + $c->finalize_body; return $status; } +=item $c->finalize_body + +Finalize body. + +=cut + +sub finalize_body { } + =item $c->finalize_cookies Finalize cookies. @@ -252,7 +271,7 @@ sub finalize_error { $name = ''; } - $c->res->output( <<"" ); + $c->res->body( <<"" ); $title @@ -316,14 +335,6 @@ Finalize headers. sub finalize_headers { } -=item $c->finalize_output - -Finalize output. - -=cut - -sub finalize_output { } - =item $c->handler( $class, $r ) Handles the request. @@ -337,12 +348,14 @@ sub handler { my $status = -1; eval { my @stats = (); + my $handler = sub { my $c = $class->prepare($engine); $c->{stats} = \@stats; $c->dispatch; return $c->finalize; }; + if ( $class->debug ) { my $elapsed; ( $elapsed, $status ) = $class->benchmark($handler); @@ -358,11 +371,14 @@ sub handler { $t->draw ); } else { $status = &$handler } + }; + if ( my $error = $@ ) { chomp $error; $class->log->error(qq/Caught exception in engine "$error"/); } + $COUNT++; return $status; } @@ -376,6 +392,7 @@ into a Catalyst context . sub prepare { my ( $class, $r ) = @_; + my $c = bless { request => Catalyst::Request->new( { @@ -393,6 +410,7 @@ sub prepare { stash => {}, state => 0 }, $class; + if ( $c->debug ) { my $secs = time - $START || 1; my $av = sprintf '%.3f', $COUNT / $secs; @@ -401,19 +419,39 @@ sub prepare { $c->log->debug('**********************************'); $c->res->headers->header( 'X-Catalyst' => $Catalyst::VERSION ); } + $c->prepare_request($r); $c->prepare_path; $c->prepare_headers; $c->prepare_cookies; $c->prepare_connection; + $c->prepare_action; + my $method = $c->req->method || ''; my $path = $c->req->path || ''; my $hostname = $c->req->hostname || ''; my $address = $c->req->address || ''; + $c->log->debug(qq/"$method" request for "$path" from $hostname($address)/) if $c->debug; - $c->prepare_action; - $c->prepare_parameters; + + if ( $c->request->method eq 'POST' and $c->request->content_length ) { + + if ( $c->req->content_type eq 'application/x-www-form-urlencoded' ) { + $c->prepare_parameters; + } + elsif ( $c->req->content_type eq 'multipart/form-data' ) { + $c->prepare_parameters; + $c->prepare_uploads; + } + else { + $c->prepare_body; + } + } + + if ( $c->request->method eq 'GET' ) { + $c->prepare_parameters; + } if ( $c->debug && keys %{ $c->req->params } ) { my $t = Text::ASCIITable->new; @@ -426,7 +464,7 @@ sub prepare { } $c->log->debug( 'Parameters are', $t->draw ); } - $c->prepare_uploads; + return $c; } @@ -441,6 +479,7 @@ sub prepare_action { my $path = $c->req->path; my @path = split /\//, $c->req->path; $c->req->args( \my @args ); + while (@path) { $path = join '/', @path; if ( my $result = ${ $c->get_action($path) }[0] ) { @@ -458,23 +497,35 @@ sub prepare_action { $c->req->action($match); $c->req->snippets( \@snippets ); } + else { $c->req->action($path); $c->log->debug(qq/Requested action is "$path"/) if $c->debug; } + $c->req->match($path); last; } unshift @args, pop @path; } + unless ( $c->req->action ) { $c->req->action('default'); $c->req->match(''); } + $c->log->debug( 'Arguments are "' . join( '/', @args ) . '"' ) if ( $c->debug && @args ); } +=item $c->prepare_body + +Prepare message body. + +=cut + +sub prepare_body { } + =item $c->prepare_connection Prepare connection. @@ -601,21 +652,23 @@ sub setup_components { if ( my $error = $@ ) { chomp $error; - $self->log->error( - qq/Couldn't initialize "Module::Pluggable::Fast", "$error"/); + die qq/Couldn't load components "$error"/; } + $self->components( {} ); my @comps; for my $comp ( $self->_components($self) ) { $self->components->{ ref $comp } = $comp; push @comps, $comp; } + my $t = Text::ASCIITable->new( { hide_HeadRow => 1, hide_HeadLine => 1 } ); $t->setCols('Class'); $t->setColWidth( 'Class', 75, 1 ); $t->addRow($_) for keys %{ $self->components }; $self->log->debug( 'Loaded components', $t->draw ) if ( @{ $t->{tbl_rows} } && $self->debug ); + $self->setup_actions( [ $self, @comps ] ); }