X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FEngine.pm;h=8dee01f527d7cc86ff656157b00829678b36829a;hb=81f6fc50d241d81f6c84cc8d2155f15c67868a5e;hp=9887e743f847b7b79b9d259b7533451608a4bb3b;hpb=3dafb2798c07340bd60156de9331357cf1c0e7fa;p=catagits%2FCatalyst-Runtime.git
diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index 9887e74..8dee01f 100644
--- a/lib/Catalyst/Engine.pm
+++ b/lib/Catalyst/Engine.pm
@@ -3,11 +3,13 @@ package Catalyst::Engine;
use strict;
use base qw/Class::Data::Inheritable Class::Accessor::Fast/;
use UNIVERSAL::require;
+use CGI::Cookie;
use Data::Dumper;
use HTML::Entities;
use HTTP::Headers;
use Memoize;
use Time::HiRes qw/gettimeofday tv_interval/;
+use Text::ASCIITable;
use Tree::Simple;
use Tree::Simple::Visitor::FindByPath;
use Catalyst::Request;
@@ -115,6 +117,41 @@ sub error {
return $c->{error};
}
+=item $c->execute($class, $coderef)
+
+Execute a coderef in given class and catch exceptions.
+Errors are available via $c->error.
+
+=cut
+
+sub execute {
+ my ( $c, $class, $code ) = @_;
+ $class = $c->comp($class) || $class;
+ $c->state(0);
+ my $callsub = ( caller(1) )[3];
+ eval {
+ if ( $c->debug )
+ {
+ my $action = $c->actions->{reverse}->{"$code"};
+ $action = "/$action" unless $action =~ /\-\>/;
+ $action = " $action" if $callsub =~ /forward$/;
+ my ( $elapsed, @state ) =
+ $c->benchmark( $code, $class, $c, @{ $c->req->args } );
+ push @{ $c->{stats} }, [ $action, sprintf( '%fs', $elapsed ) ];
+ $c->state(@state);
+ }
+ else { $c->state( &$code( $class, $c, @{ $c->req->args } ) ) }
+ };
+ if ( my $error = $@ ) {
+ chomp $error;
+ $error = qq/Caught exception "$error"/;
+ $c->log->error($error);
+ $c->error($error) if $c->debug;
+ $c->state(0);
+ }
+ return $c->state;
+}
+
=item $c->finalize
Finalize request.
@@ -124,26 +161,76 @@ Finalize request.
sub finalize {
my $c = shift;
- if ( my $location = $c->res->redirect ) {
+ $c->finalize_cookies;
+
+ if ( my $location = $c->response->redirect ) {
$c->log->debug(qq/Redirecting to "$location"/) if $c->debug;
- $c->res->headers->header( Location => $location );
- $c->res->headers->remove_content_headers;
- $c->res->status(302);
- return $c->finalize_headers;
- }
-
- if ( !$c->res->output || $#{ $c->error } >= 0 ) {
- $c->res->headers->content_type('text/html');
- my $name = $c->config->{name} || 'Catalyst Application';
- my ( $title, $error, $infos );
- if ( $c->debug ) {
- $error = join '
', @{ $c->error };
- $error ||= 'No output';
- $title = $name = "$name on Catalyst $Catalyst::VERSION";
- my $req = encode_entities Dumper $c->req;
- my $res = encode_entities Dumper $c->res;
- my $stash = encode_entities Dumper $c->stash;
- $infos = <<"";
+ $c->response->header( Location => $location );
+ $c->response->status(302) if $c->response->status !~ /3\d\d$/;
+ }
+
+ if ( $#{ $c->error } >= 0 ) {
+ $c->finalize_error;
+ }
+
+ if ( !$c->response->output && $c->response->status !~ /^(1|3)\d\d$/ ) {
+ $c->finalize_error;
+ }
+
+ if ( $c->response->output && !$c->response->content_length ) {
+ use bytes; # play safe with a utf8 aware perl
+ $c->response->content_length( length $c->response->output );
+ }
+
+ my $status = $c->finalize_headers;
+ $c->finalize_output;
+ return $status;
+}
+
+=item $c->finalize_cookies
+
+Finalize cookies.
+
+=cut
+
+sub finalize_cookies {
+ my $c = shift;
+
+ while ( my ( $name, $cookie ) = each %{ $c->response->cookies } ) {
+ my $cookie = CGI::Cookie->new(
+ -name => $name,
+ -value => $cookie->{value},
+ -expires => $cookie->{expires},
+ -domain => $cookie->{domain},
+ -path => $cookie->{path},
+ -secure => $cookie->{secure} || 0
+ );
+
+ $c->res->headers->push_header( 'Set-Cookie' => $cookie->as_string );
+ }
+}
+
+=item $c->finalize_error
+
+Finalize error.
+
+=cut
+
+sub finalize_error {
+ my $c = shift;
+
+ $c->res->headers->content_type('text/html');
+ my $name = $c->config->{name} || 'Catalyst Application';
+
+ my ( $title, $error, $infos );
+ if ( $c->debug ) {
+ $error = join '
', @{ $c->error };
+ $error ||= 'No output';
+ $title = $name = "$name on Catalyst $Catalyst::VERSION";
+ my $req = encode_entities Dumper $c->req;
+ my $res = encode_entities Dumper $c->res;
+ my $stash = encode_entities Dumper $c->stash;
+ $infos = <<"";
Request
$req
@@ -152,11 +239,11 @@ sub finalize {
Stash
$stash
- }
- else {
- $title = $name;
- $error = '';
- $infos = <<"";
+ }
+ else {
+ $title = $name;
+ $error = '';
+ $infos = <<"";
(en) Please come back later
(de) Bitte versuchen sie es spaeter nocheinmal
@@ -168,67 +255,62 @@ sub finalize {
(it) Ritornato prego piĆ¹ successivamente
- $name = '';
- }
- $c->res->{output} = <<"";
+ $name = '';
+ }
+ $c->res->output( <<"" );
-
- $title
-
-
-
-
-
$error
-
$infos
-
$name
-
-
+
+ $title
+
+
+
+
+
$error
+
$infos
+
$name
+
+
- }
- $c->res->headers->content_length( length $c->res->output );
- my $status = $c->finalize_headers;
- $c->finalize_output;
- return $status;
}
=item $c->finalize_headers
@@ -351,15 +433,16 @@ Handles the request.
=cut
-sub handler ($$) {
- my ( $class, $r ) = @_;
+sub handler {
+ my ( $class, $engine ) = @_;
# Always expect worst case!
my $status = -1;
eval {
+ my @stats = ();
my $handler = sub {
- my $c = $class->prepare($r);
- $c->{stats} = [];
+ my $c = $class->prepare($engine);
+ $c->{stats} = \@stats;
my $action = $c->req->action;
my $namespace = '';
$namespace = ( join( '/', @{ $c->req->args } ) || '/' )
@@ -385,9 +468,6 @@ sub handler ($$) {
{
$c->state( $c->execute( @{ $end->[0] } ) );
}
- my @stats = @{ $c->{stats} };
- $c->log->info( 'Processing took', @stats )
- if ( @stats && $c->debug );
}
else {
my $path = $c->req->path;
@@ -404,7 +484,13 @@ sub handler ($$) {
( $elapsed, $status ) = $class->benchmark($handler);
$elapsed = sprintf '%f', $elapsed;
my $av = sprintf '%.3f', 1 / $elapsed;
- $class->log->info( "Request took $elapsed" . "s ($av/s)" );
+ my $t = Text::ASCIITable->new;
+ $t->setCols( 'Action', 'Time' );
+ for my $stat (@stats) {
+ $t->addRow(@$stat);
+ }
+ $class->log->info( "Request took $elapsed" . "s ($av/s)",
+ $t->draw );
}
else { $status = &$handler }
};
@@ -465,12 +551,13 @@ sub prepare {
$c->prepare_parameters;
if ( $c->debug && keys %{ $c->req->params } ) {
- my @params;
+ my $t = Text::ASCIITable->new;
+ $t->setCols( 'Key', 'Value' );
for my $key ( keys %{ $c->req->params } ) {
my $value = $c->req->params->{$key} || '';
- push @params, " $key=$value";
+ $t->addRow( $key, $value );
}
- $c->log->debug( 'Parameters are', @params );
+ $c->log->debug( 'Parameters are', $t->draw );
}
$c->prepare_uploads;
return $c;
@@ -495,7 +582,8 @@ sub prepare_action {
if ($#$result) {
my $match = $result->[1];
my @snippets = @{ $result->[2] };
- $c->log->debug(qq/Requested action "$path" matched "$match"/)
+ $c->log->debug(
+ qq/Requested action is "$path" and matched "$match"/)
if $c->debug;
$c->log->debug(
'Snippets are "' . join( ' ', @snippets ) . '"' )
@@ -505,7 +593,7 @@ sub prepare_action {
}
else {
$c->req->action($path);
- $c->log->debug(qq/Requested action "$path"/) if $c->debug;
+ $c->log->debug(qq/Requested action is "$path"/) if $c->debug;
}
$c->req->match($path);
last;
@@ -534,7 +622,13 @@ Prepare cookies.
=cut
-sub prepare_cookies { }
+sub prepare_cookies {
+ my $c = shift;
+
+ if ( my $header = $c->request->header('Cookie') ) {
+ $c->req->cookies( { CGI::Cookie->parse($header) } );
+ }
+}
=item $c->prepare_headers
@@ -576,40 +670,6 @@ Prepare uploads.
sub prepare_uploads { }
-=item $c->execute($class, $coderef)
-
-Execute a coderef in given class and catch exceptions.
-Errors are available via $c->error.
-
-=cut
-
-sub execute {
- my ( $c, $class, $code ) = @_;
- $class = $c->comp($class) || $class;
- $c->state(0);
- eval {
- if ( $c->debug )
- {
- my $action = $c->actions->{reverse}->{"$code"};
- $action = "/$action" unless $action =~ /\-\>/;
- my ( $elapsed, @state ) =
- $c->benchmark( $code, $class, $c, @{ $c->req->args } );
- push @{ $c->{stats} },
- _prettify( $action, sprintf( '%fs', $elapsed ), '' );
- $c->state(@state);
- }
- else { $c->state( &$code( $class, $c, @{ $c->req->args } ) ) }
- };
- if ( my $error = $@ ) {
- chomp $error;
- $error = qq/Caught exception "$error"/;
- $c->log->error($error);
- $c->error($error) if $c->debug;
- $c->state(0);
- }
- return $c->state;
-}
-
=item $c->run
Starts the engine.
@@ -792,38 +852,44 @@ sub setup_components {
$self->components->{ ref $comp } = $comp;
$self->setup_actions($comp);
}
- my @comps;
- push @comps, " $_" for keys %{ $self->components };
- $self->log->debug( 'Loaded components', @comps )
- if ( @comps && $self->debug );
+ my $t = Text::ASCIITable->new;
+ $t->setCols('Class');
+ $t->addRow($_) for keys %{ $self->components };
+ $self->log->debug( 'Loaded components', $t->draw )
+ if ( @{ $t->{tbl_rows} } && $self->debug );
my $actions = $self->actions;
- my @messages = ('Loaded private actions');
- my $walker = sub {
- my ( $walker, $parent, $messages, $prefix ) = @_;
+ my $privates = Text::ASCIITable->new;
+ $privates->setCols( 'Action', 'Class', 'Code' );
+ my $walker = sub {
+ my ( $walker, $parent, $prefix ) = @_;
$prefix .= $parent->getNodeValue || '';
$prefix .= '/' unless $prefix =~ /\/$/;
my $uid = $parent->getUID;
for my $action ( keys %{ $actions->{private}->{$uid} } ) {
my ( $class, $code ) = @{ $actions->{private}->{$uid}->{$action} };
- push @$messages, _prettify( "$prefix$action", $class, $code );
+ $privates->addRow( "$prefix$action", $class, $code );
}
- $walker->( $walker, $_, $messages, $prefix )
- for $parent->getAllChildren;
+ $walker->( $walker, $_, $prefix ) for $parent->getAllChildren;
};
- $walker->( $walker, $self->tree, \@messages, '' );
- $self->log->debug(@messages) if ( $#messages && $self->debug );
- @messages = ('Loaded plain actions');
+ $walker->( $walker, $self->tree, '' );
+ $self->log->debug( 'Loaded private actions', $privates->draw )
+ if ( @{ $privates->{tbl_rows} } && $self->debug );
+ my $publics = Text::ASCIITable->new;
+ $publics->setCols( 'Action', 'Class', 'Code' );
for my $plain ( sort keys %{ $actions->{plain} } ) {
my ( $class, $code ) = @{ $actions->{plain}->{$plain} };
- push @messages, _prettify( "/$plain", $class, $code );
+ $publics->addRow( "/$plain", $class, $code );
}
- $self->log->debug(@messages) if ( $#messages && $self->debug );
- @messages = ('Loaded regex actions');
+ $self->log->debug( 'Loaded public actions', $publics->draw )
+ if ( @{ $publics->{tbl_rows} } && $self->debug );
+ my $regexes = Text::ASCIITable->new;
+ $regexes->setCols( 'Action', 'Class', 'Code' );
for my $regex ( sort keys %{ $actions->{regex} } ) {
my ( $class, $code ) = @{ $actions->{regex}->{$regex} };
- push @messages, _prettify( $regex, $class, $code );
+ $regexes->addRow( $regex, $class, $code );
}
- $self->log->debug(@messages) if ( $#messages && $self->debug );
+ $self->log->debug( 'Loaded regex actions', $regexes->draw )
+ if ( @{ $regexes->{tbl_rows} } && $self->debug );
}
=item $c->stash
@@ -863,16 +929,6 @@ sub _class2prefix {
return $prefix;
}
-sub _prettify {
- my ( $val1, $val2, $val3 ) = @_;
- formline
-' @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< @>>>>>>>>>>>>>> ',
- $val1, $val2, $val3;
- my $formatted = $^A;
- $^A = '';
- return $formatted;
-}
-
=back
=head1 AUTHOR