X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FDispatcher.pm;h=cb019340dfe65c23342ab3c859eea8db7945232d;hb=21465c884872c1ec8c30acd72796445f9eaacb31;hp=4bd49cab199f298ed4121ca1c3da3ac246765178;hpb=e5f21aa207cbf0364944a25a5e3d403aa81b77c4;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Dispatcher.pm b/lib/Catalyst/Dispatcher.pm index 4bd49ca..cb01934 100644 --- a/lib/Catalyst/Dispatcher.pm +++ b/lib/Catalyst/Dispatcher.pm @@ -2,6 +2,7 @@ package Catalyst::Dispatcher; use strict; use base 'Class::Data::Inheritable'; +use Catalyst::Exception; use Catalyst::Utils; use Text::ASCIITable; use Tree::Simple; @@ -23,6 +24,19 @@ See L. =over 4 +=item $c->detach( $command [, \@arguments ] ) + +Like C but doesn't return. + +=cut + +sub detach { + my ( $c, $command, @args ) = @_; + $c->forward( $command, @args ) if $command; + # die with DETACH signal, which will be caught in dispatching. + die $Catalyst::Engine::DETACH; +} + =item $c->dispatch Dispatch request to actions. @@ -38,8 +52,8 @@ sub dispatch { unless ($namespace) { if ( my $result = $c->get_action($action) ) { - $namespace = - Catalyst::Utils::class2prefix( $result->[0]->[0]->[0] ); + $namespace = Catalyst::Utils::class2prefix( $result->[0]->[0]->[0], + $c->config->{case_sensitive} ); } } @@ -79,9 +93,7 @@ sub dispatch { $c->execute( @{ $end->[0] } ); return if scalar @{ $c->error }; } - } - - else { + } else { my $path = $c->req->path; my $error = $path ? qq/Unknown resource "$path"/ @@ -91,10 +103,13 @@ sub dispatch { } } -=item $c->forward($command) +=item $c->forward( $command [, \@arguments ] ) Forward processing to a private action or a method from a class. If you define a class without method it will default to process(). +also takes an optional arrayref containing arguments to be passed +to the new function. $c->req->args will be reset upon returning +from the function. $c->forward('/foo'); $c->forward('index'); @@ -112,8 +127,12 @@ sub forward { return 0; } - my $caller = caller(0); + # Relative forwards from detach + my $caller = ( caller(0) )[0]->isa('Catalyst::Dispatcher') + && ( ( caller(1) )[3] =~ /::detach$/ ) ? caller(1) : caller(0); + my $namespace = '/'; + my $arguments = ( ref( $_[-1] ) eq 'ARRAY' ) ? pop(@_) : $c->req->args; if ( $command =~ /^\// ) { $command =~ /^\/(.*)\/(\w+)$/; @@ -122,39 +141,31 @@ sub forward { $command =~ s/^\///; } - else { $namespace = Catalyst::Utils::class2prefix($caller) || '/' } + else { + $namespace = + Catalyst::Utils::class2prefix( $caller, $c->config->{case_sensitive} ) + || '/'; + } my $results = $c->get_action( $command, $namespace ); unless ( @{$results} ) { - my $class = $command || ''; - my $path = $class . '.pm'; - $path =~ s/::/\//g; - - unless ( $INC{$path} ) { - my $error = - qq/Couldn't forward to "$class". Invalid or not loaded./; - $c->error($error); - $c->log->debug($error) if $c->debug; - return 0; - } - unless ( UNIVERSAL::isa( $class, 'Catalyst::Base' ) ) { + unless ( defined( $c->components->{$command} ) ) { my $error = - qq/Can't forward to "$class". Class is not a Catalyst component./; +qq/Couldn't forward to command "$command". Invalid action or component./; $c->error($error); $c->log->debug($error) if $c->debug; return 0; } + my $class = $command; my $method = shift || 'process'; - if ( my $code = $class->can($method) ) { + if ( my $code = $c->components->{$class}->can($method) ) { $c->actions->{reverse}->{"$code"} = "$class->$method"; $results = [ [ [ $class, $code ] ] ]; - } - - else { + } else { my $error = qq/Couldn't forward to "$class". Does not implement "$method"/; $c->error($error); @@ -165,6 +176,8 @@ sub forward { } + local $c->request->{arguments} = [ @{$arguments} ]; + for my $result ( @{$results} ) { $c->execute( @{ $result->[0] } ); return if scalar @{ $c->error }; @@ -196,6 +209,7 @@ sub get_action { push @results, [$result] if $result; my $visitor = Tree::Simple::Visitor::FindByPath->new; + SEARCH: for my $part ( split '/', $namespace ) { $visitor->setSearchPath($part); $parent->accept($visitor); @@ -203,7 +217,12 @@ sub get_action { my $uid = $child->getUID if $child; my $match = $c->actions->{private}->{$uid}->{$action} if $uid; push @results, [$match] if $match; - $parent = $child if $child; + if ($child) { + $parent = $child; + } + else { + last SEARCH; + } } } @@ -258,7 +277,9 @@ Set an action in a given namespace. sub set_action { my ( $c, $method, $code, $namespace, $attrs ) = @_; - my $prefix = Catalyst::Utils::class2prefix($namespace) || ''; + my $prefix = + Catalyst::Utils::class2prefix( $namespace, $c->config->{case_sensitive} ) + || ''; my %flags; for my $attr ( @{$attrs} ) { @@ -305,15 +326,15 @@ sub set_action { if ( $flags{path} ) { $flags{path} =~ s/^\w+//; $flags{path} =~ s/\w+$//; - if ( $flags{path} =~ /^'(.*)'$/ ) { $flags{path} = $1 } - if ( $flags{path} =~ /^"(.*)"$/ ) { $flags{path} = $1 } + if ( $flags{path} =~ /^\s*'(.*)'\s*$/ ) { $flags{path} = $1 } + if ( $flags{path} =~ /^\s*"(.*)"\s*$/ ) { $flags{path} = $1 } } if ( $flags{regex} ) { $flags{regex} =~ s/^\w+//; $flags{regex} =~ s/\w+$//; - if ( $flags{regex} =~ /^'(.*)'$/ ) { $flags{regex} = $1 } - if ( $flags{regex} =~ /^"(.*)"$/ ) { $flags{regex} = $1 } + if ( $flags{regex} =~ /^\s*'(.*)'\s*$/ ) { $flags{regex} = $1 } + if ( $flags{regex} =~ /^\s*"(.*)"\s*$/ ) { $flags{regex} = $1 } } my $reverse = $prefix ? "$prefix/$method" : $method; @@ -347,7 +368,7 @@ Setup actions for a component. =cut sub setup_actions { - my ( $self, $comps ) = @_; + my $self = shift; # These are the core structures $self->actions( @@ -363,8 +384,10 @@ sub setup_actions { # We use a tree $self->tree( Tree::Simple->new( 0, Tree::Simple->ROOT ) ); - for my $comp (@$comps) { - $comp = ref $comp || $comp; + for my $comp ( keys %{ $self->components } ) { + + # We only setup components that inherit from Catalyst::Base + next unless $comp->isa('Catalyst::Base'); for my $action ( @{ Catalyst::Utils::reflect_actions($comp) } ) { my ( $code, $attrs ) = @{$action}; @@ -401,6 +424,8 @@ sub setup_actions { } + return unless $self->debug; + my $actions = $self->actions; my $privates = Text::ASCIITable->new; $privates->setCols( 'Private', 'Class' ); @@ -422,8 +447,8 @@ sub setup_actions { }; $walker->( $walker, $self->tree, '' ); - $self->log->debug( 'Loaded private actions', $privates->draw ) - if ( @{ $privates->{tbl_rows} } && $self->debug ); + $self->log->debug( "Loaded private actions:\n" . $privates->draw ) + if ( @{ $privates->{tbl_rows} } ); my $publics = Text::ASCIITable->new; $publics->setCols( 'Public', 'Private' ); @@ -437,8 +462,8 @@ sub setup_actions { $publics->addRow( "/$plain", $reverse ); } - $self->log->debug( 'Loaded public actions', $publics->draw ) - if ( @{ $publics->{tbl_rows} } && $self->debug ); + $self->log->debug( "Loaded public actions:\n" . $publics->draw ) + if ( @{ $publics->{tbl_rows} } ); my $regexes = Text::ASCIITable->new; $regexes->setCols( 'Regex', 'Private' ); @@ -452,8 +477,8 @@ sub setup_actions { $regexes->addRow( $regex, $reverse ); } - $self->log->debug( 'Loaded regex actions', $regexes->draw ) - if ( @{ $regexes->{tbl_rows} } && $self->debug ); + $self->log->debug( "Loaded regex actions:\n" . $regexes->draw ) + if ( @{ $regexes->{tbl_rows} } ); } =back