X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FDispatcher.pm;h=af4f7ce789b07f74580205087eb9b6aaf2d58f76;hp=cb916a07b0e9e608b9ceb4cf130d8601e6caaee3;hb=a1dad9c1cde458c1b9429ceca83691607b1ee9c2;hpb=12e2816523c154b30f6bca1096502dd8a3544e8e diff --git a/lib/Catalyst/Dispatcher.pm b/lib/Catalyst/Dispatcher.pm index cb916a0..af4f7ce 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,18 @@ See L. =over 4 +=item $c->detach($command) + +Like C but doesn't return. + +=cut + +sub detach { + my ( $c, $command ) = @_; + $c->forward($command) if $command; + die $Catalyst::Engine::DETACH; +} + =item $c->dispatch Dispatch request to actions. @@ -38,8 +51,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} ); } } @@ -57,15 +70,16 @@ sub dispatch { } # Execute the auto chain - my $auto; - for $auto ( @{ $c->get_action( 'auto', $namespace, 1 ) } ) { + my $autorun = 0; + for my $auto ( @{ $c->get_action( 'auto', $namespace, 1 ) } ) { + $autorun++; $c->execute( @{ $auto->[0] } ); return if scalar @{ $c->error }; last unless $c->state; } # Execute the action or last default - my $mkay = defined $auto ? $c->state ? 1 : 0 : 1; + my $mkay = $autorun ? $c->state ? 1 : 0 : 1; if ( ( my $action = $c->req->action ) && $mkay ) { if ( my $result = @{ $c->get_action( $action, $default, 1 ) }[-1] ) { @@ -90,10 +104,13 @@ sub dispatch { } } -=item $c->forward($command) +=item $c->forward($command [args])) 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'); @@ -113,6 +130,15 @@ sub forward { my $caller = caller(0); my $namespace = '/'; + my $args; + + if ( ref( $_[0] ) eq 'ARRAY' ) { + $args=$c->req->args(); + $c->req->args( shift ); + } elsif ( ref( $_[1] ) eq 'ARRAY' ) { + $args=$c->req->args(); + $c->req->args( $_[1] ); + } if ( $command =~ /^\// ) { $command =~ /^\/(.*)\/(\w+)$/; @@ -121,7 +147,11 @@ 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 ); @@ -166,10 +196,12 @@ sub forward { for my $result ( @{$results} ) { $c->execute( @{ $result->[0] } ); - return if scalar @{ $c->error }; + last if scalar @{ $c->error }; last unless $c->state; } + $c->req->args( $args ) if $args; + return if scalar @{ $c->error }; return $c->state; } @@ -257,7 +289,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} ) { @@ -346,7 +380,7 @@ Setup actions for a component. =cut sub setup_actions { - my ( $self, $comps ) = @_; + my $self = shift; # These are the core structures $self->actions( @@ -362,8 +396,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}; @@ -400,6 +436,8 @@ sub setup_actions { } + return unless $self->debug; + my $actions = $self->actions; my $privates = Text::ASCIITable->new; $privates->setCols( 'Private', 'Class' ); @@ -421,8 +459,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' ); @@ -436,8 +474,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' ); @@ -451,8 +489,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