X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FEngine.pm;h=41a5049c96928f55cd1c7aa815386c2dce7c917f;hb=a135d186f7acefbbab74e8e6d9a43ccd3560d326;hp=750f3fe1be205a5518cf798bf30561bafc92a8d7;hpb=c4695f3aa02151dcd257c01cdee3f70cfa2e5888;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm index 750f3fe..41a5049 100644 --- a/lib/Catalyst/Engine.pm +++ b/lib/Catalyst/Engine.pm @@ -9,6 +9,8 @@ use HTML::Entities; use HTTP::Headers; use Memoize; use Time::HiRes qw/gettimeofday tv_interval/; +use Text::ASCIITable; +use Text::ASCIITable::Wrap 'wrap'; use Tree::Simple; use Tree::Simple::Visitor::FindByPath; use Catalyst::Request; @@ -93,6 +95,50 @@ sub component { } } +=item $c->dispatch + +Dispatch request to actions. + +=cut + +sub dispatch { + my $c = shift; + my $action = $c->req->action; + my $namespace = ''; + $namespace = ( join( '/', @{ $c->req->args } ) || '/' ) + if $action eq 'default'; + unless ($namespace) { + if ( my $result = $c->get_action($action) ) { + $namespace = _class2prefix( $result->[0]->[0]->[0] ); + } + } + my $default = $action eq 'default' ? $namespace : undef; + my $results = $c->get_action( $action, $default ); + $namespace ||= '/'; + if ( @{$results} ) { + for my $begin ( @{ $c->get_action( 'begin', $namespace ) } ) { + $c->execute( @{ $begin->[0] } ); + } + if ( my $action = $c->req->action ) { + for my $result ( @{ $c->get_action( $action, $default ) }[-1] ) { + $c->execute( @{ $result->[0] } ); + last unless $default; + } + } + for my $end ( reverse @{ $c->get_action( 'end', $namespace ) } ) { + $c->execute( @{ $end->[0] } ); + } + } + else { + my $path = $c->req->path; + my $error = $path + ? qq/Unknown resource "$path"/ + : "No default action defined"; + $c->log->error($error) if $c->debug; + $c->error($error); + } +} + =item $c->error =item $c->error($error, ...) @@ -127,15 +173,16 @@ 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} }, - _prettify( $action, sprintf( '%fs', $elapsed ), '' ); + push @{ $c->{stats} }, [ $action, sprintf( '%fs', $elapsed ) ]; $c->state(@state); } else { $c->state( &$code( $class, $c, @{ $c->req->args } ) ) } @@ -176,7 +223,7 @@ sub finalize { } if ( $c->response->output && !$c->response->content_length ) { - use bytes; # play safe with a utf8 aware perl + use bytes; # play safe with a utf8 aware perl $c->response->content_length( length $c->response->output ); } @@ -373,7 +420,7 @@ sub forward { } } for my $result ( @{$results} ) { - $c->state( $c->execute( @{ $result->[0] } ) ); + $c->execute( @{ $result->[0] } ); } return $c->state; } @@ -386,6 +433,7 @@ Get an action in a given namespace. sub get_action { my ( $c, $action, $namespace ) = @_; + return [] unless $action; $namespace ||= ''; if ($namespace) { $namespace = '' if $namespace eq '/'; @@ -441,40 +489,7 @@ sub handler { my $handler = sub { my $c = $class->prepare($engine); $c->{stats} = \@stats; - my $action = $c->req->action; - my $namespace = ''; - $namespace = ( join( '/', @{ $c->req->args } ) || '/' ) - if $action eq 'default'; - unless ($namespace) { - if ( my $result = $c->get_action($action) ) { - $namespace = _class2prefix( $result->[0]->[0]->[0] ); - } - } - my $default = $action eq 'default' ? $namespace : undef; - my $results = $c->get_action( $action, $default ); - $namespace ||= '/'; - if ( @{$results} ) { - for my $begin ( @{ $c->get_action( 'begin', $namespace ) } ) { - $c->state( $c->execute( @{ $begin->[0] } ) ); - } - for my $result ( @{ $c->get_action( $action, $default ) }[-1] ) - { - $c->state( $c->execute( @{ $result->[0] } ) ); - last unless $default; - } - for my $end ( reverse @{ $c->get_action( 'end', $namespace ) } ) - { - $c->state( $c->execute( @{ $end->[0] } ) ); - } - } - else { - my $path = $c->req->path; - my $error = $path - ? qq/Unknown resource "$path"/ - : "No default action defined"; - $c->log->error($error) if $c->debug; - $c->error($error); - } + $c->dispatch; return $c->finalize; }; if ( $class->debug ) { @@ -482,7 +497,16 @@ 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)", @stats ); + my $t = Text::ASCIITable->new; + $t->setCols( 'Action', 'Time' ); + $t->setColWidth( 'Action', 64, 1 ); + $t->setColWidth( 'Time', 9, 1 ); + + for my $stat (@stats) { + $t->addRow( wrap( $stat->[0], 64 ), wrap( $stat->[1], 9 ) ); + } + $class->log->info( "Request took $elapsed" . "s ($av/s)", + $t->draw ); } else { $status = &$handler } }; @@ -523,9 +547,9 @@ sub prepare { if ( $c->debug ) { my $secs = time - $START || 1; my $av = sprintf '%.3f', $COUNT / $secs; - $c->log->debug('********************************'); + $c->log->debug('**********************************'); $c->log->debug("* Request $COUNT ($av/s) [$$]"); - $c->log->debug('********************************'); + $c->log->debug('**********************************'); $c->res->headers->header( 'X-Catalyst' => $Catalyst::VERSION ); } $c->prepare_request($r); @@ -543,12 +567,15 @@ sub prepare { $c->prepare_parameters; if ( $c->debug && keys %{ $c->req->params } ) { - my @params; + my $t = Text::ASCIITable->new; + $t->setCols( 'Key', 'Value' ); + $t->setColWidth( 'Key', 37, 1 ); + $t->setColWidth( 'Value', 36, 1 ); for my $key ( keys %{ $c->req->params } ) { my $value = $c->req->params->{$key} || ''; - push @params, " $key=$value"; + $t->addRow( wrap( $key, 37 ), wrap( $value, 36 ) ); } - $c->log->debug( 'Parameters are', @params ); + $c->log->debug( 'Parameters are', $t->draw ); } $c->prepare_uploads; return $c; @@ -573,7 +600,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 ) . '"' ) @@ -583,7 +611,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; @@ -842,40 +870,65 @@ 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( { hide_HeadRow => 1, hide_HeadLine => 1 } ); + $t->setCols('Class'); + $t->setColWidth( 'Class', 75, 1 ); + $t->addRow( wrap( $_, 75 ) ) 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( 'Private', 'Class', 'Code' ); + $privates->setColWidth( 'Private', 28, 1 ); + $privates->setColWidth( 'Class', 28, 1 ); + $privates->setColWidth( 'Code', 14, 1 ); + 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( + wrap( "$prefix$action", 28 ), + wrap( $class, 28 ), + wrap( $code, 14 ) + ); } - $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( 'Public', 'Private' ); + $publics->setColWidth( 'Public', 37, 1 ); + $publics->setColWidth( 'Private', 36, 1 ); + for my $plain ( sort keys %{ $actions->{plain} } ) { my ( $class, $code ) = @{ $actions->{plain}->{$plain} }; - push @messages, _prettify( "/$plain", $class, $code ); - } - $self->log->debug(@messages) if ( $#messages && $self->debug ); - @messages = ('Loaded regex actions'); + $publics->addRow( wrap( "/$plain", 37 ), + wrap( $self->actions->{reverse}->{$code} || $code, 36 ) ); + } + $self->log->debug( 'Loaded public actions', $publics->draw ) + if ( @{ $publics->{tbl_rows} } && $self->debug ); + my $regexes = Text::ASCIITable->new; + $regexes->setCols( 'Regex', 'Private' ); + $regexes->setColWidth( 'Regex', 37, 1 ); + $regexes->setColWidth( 'Private', 36, 1 ); for my $regex ( sort keys %{ $actions->{regex} } ) { my ( $class, $code ) = @{ $actions->{regex}->{$regex} }; - push @messages, _prettify( $regex, $class, $code ); + $regexes->addRow( wrap( $regex, 37 ), + wrap( $self->actions->{reverse}->{$class} || $class, 36 ) ); } - $self->log->debug(@messages) if ( $#messages && $self->debug ); + $self->log->debug( 'Loaded regex actions', $regexes->draw ) + if ( @{ $regexes->{tbl_rows} } && $self->debug ); } +=item $c->state + +Contains the return value of the last executed action. + =item $c->stash Returns a hashref containing all your data. @@ -913,16 +966,6 @@ sub _class2prefix { return $prefix; } -sub _prettify { - my ( $val1, $val2, $val3 ) = @_; - formline -' @<<<<<<<<<<<<<<<<<<<<<<<<<<<<< @<<<<<<<<<<<<<<<<<<<<<<<<<<<< @>>>>>>>>>>>>>> ', - $val1, $val2, $val3; - my $formatted = $^A; - $^A = ''; - return $formatted; -} - =back =head1 AUTHOR