X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FDispatcher.pm;h=855226a111915cf83a632b753d8c5dc96a9a638d;hb=1627551a60fe1e220d390a565f793dea27cd36a6;hp=8f94316cd2624f4711425925e6fd3bfdba72cb6a;hpb=a0eca83861c733269dbafbaafbcc3ca0b0101e2b;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Dispatcher.pm b/lib/Catalyst/Dispatcher.pm index 8f94316..855226a 100644 --- a/lib/Catalyst/Dispatcher.pm +++ b/lib/Catalyst/Dispatcher.pm @@ -17,14 +17,16 @@ use overload '""' => sub { return ref shift }, fallback => 1; __PACKAGE__->mk_accessors( qw/tree dispatch_types registered_dispatch_types - method_action_class action_container_class/ + method_action_class action_container_class + preload_dispatch_types postload_dispatch_types + / ); # Preload these action types -our @PRELOAD = qw/Path Regex/; +our @PRELOAD = qw/Index Path Regex/; # Postload these action types -our @POSTLOAD = qw/Index Default/; +our @POSTLOAD = qw/Default/; =head1 NAME @@ -38,9 +40,41 @@ See L. =head1 METHODS -=over 4 +=cut + +sub new { + my $self = shift; + my $class = ref($self) || $self; + + my $obj = $class->SUPER::new( @_ ); + + # set the default pre- and and postloads + $obj->preload_dispatch_types( \@PRELOAD ); + $obj->postload_dispatch_types( \@POSTLOAD ); + return $obj; +} + +=head2 $self->preload_dispatch_types + +An arrayref of pre-loaded dispatchtype classes + +Entries are considered to be available as C +To use a custom class outside the regular C namespace, prefix +it with a C<+>, like so: + + +My::Dispatch::Type + +=head2 $self->postload_dispatch_types + +An arrayref of post-loaded dispatchtype classes + +Entries are considered to be available as C +To use a custom class outside the regular C namespace, prefix +it with a C<+>, like so: -=item $self->detach( $c, $command [, \@arguments ] ) + +My::Dispatch::Type + +=head2 $self->detach( $c, $command [, \@arguments ] ) =cut @@ -50,13 +84,12 @@ sub detach { die $Catalyst::DETACH; } -=item $self->dispatch($c) +=head2 $self->dispatch($c) =cut sub dispatch { my ( $self, $c ) = @_; - if ( $c->action ) { $c->forward( join( '/', '', $c->action->namespace, '_DISPATCH' ) ); } @@ -71,7 +104,7 @@ sub dispatch { } } -=item $self->forward( $c, $command [, \@arguments ] ) +=head2 $self->forward( $c, $command [, \@arguments ] ) =cut @@ -80,19 +113,17 @@ sub forward { my $c = shift; my $command = shift; - # Get the calling class - my $caller = ( caller(0) )[0]; - if ( $caller->isa('Catalyst') ) { - if ( ( caller(2) )[3] =~ /detach$/ ) { $caller = caller(3) } - elsif ( ( caller(0) )[3] =~ /forward$/ ) { $caller = caller(1) } - } - unless ($command) { $c->log->debug('Nothing to forward to') if $c->debug; return 0; } - my $arguments = ( ref( $_[-1] ) eq 'ARRAY' ) ? pop(@_) : $c->req->args; + my $local_args = 0; + my $arguments = $c->req->args; + if ( ref( $_[-1] ) eq 'ARRAY' ) { + $arguments = pop(@_); + $local_args = 1; + } my $result; @@ -100,11 +131,8 @@ sub forward { my $command_copy = $command; unless ( $command_copy =~ s/^\/// ) { - my $prefix = - Catalyst::Utils::class2prefix( $caller, - $c->config->{case_sensitive} ) - || ''; - $command_copy = "${prefix}/${command}"; + my $namespace = $c->stack->[-1]->namespace; + $command_copy = "${namespace}/${command}"; } unless ( $command_copy =~ /\// ) { @@ -116,8 +144,9 @@ sub forward { my $tail = $2; $result = $c->get_action( $tail, $1 ); if ($result) { - $command = $tail; - push( @{$arguments}, @extra_args ); + $local_args = 1; + $command = $tail; + unshift( @{$arguments}, @extra_args ); last DESCEND; } unshift( @extra_args, $tail ); @@ -127,8 +156,10 @@ sub forward { unless ($result) { - my $class = ref($command) || ref( $c->component($command) ); - my $method = shift || 'process'; + my $class = ref($command) + || ref( $c->component($command) ) + || $c->component($command); + my $method = shift || 'process'; unless ($class) { my $error = @@ -145,7 +176,9 @@ qq/Couldn't forward to command "$command". Invalid action or component./; code => $code, reverse => "$class->$method", class => $class, - namespace => $class, + namespace => Catalyst::Utils::class2prefix( + $class, $c->config->{case_sensitive} + ), } ); $result = $action; @@ -162,14 +195,16 @@ qq/Couldn't forward to command "$command". Invalid action or component./; } - local $c->request->{arguments} = [ @{$arguments} ]; - - $result->execute($c); + if ($local_args) { + local $c->request->{arguments} = [ @{$arguments} ]; + $result->execute($c); + } + else { $result->execute($c) } return $c->state; } -=item $self->prepare_action($c) +=head2 $self->prepare_action($c) =cut @@ -179,12 +214,13 @@ sub prepare_action { my @path = split /\//, $c->req->path; $c->req->args( \my @args ); - push( @path, '/' ) unless @path; # Root action + unshift( @path, '' ); # Root action DESCEND: while (@path) { $path = join '/', @path; + $path =~ s#^/##; - $path = '' if $path eq '/'; # Root action + $path = '' if $path eq '/'; # Root action # Check out dispatch types to see if any will handle the path at # this level @@ -194,15 +230,19 @@ sub prepare_action { } # If not, move the last part path to args - - unshift @args, pop @path; + my $arg = pop(@path); + $arg =~ s/%([0-9A-Fa-f]{2})/chr(hex($1))/eg; + unshift @args, $arg; } + $c->log->debug( 'Path is "' . $c->req->match . '"' ) + if ( $c->debug && $c->req->match ); + $c->log->debug( 'Arguments are "' . join( '/', @args ) . '"' ) if ( $c->debug && @args ); } -=item $self->get_action( $action, $namespace ) +=head2 $self->get_action( $action, $namespace ) =cut @@ -221,7 +261,7 @@ sub get_action { } } -=item $self->get_actions( $c, $action, $namespace ) +=head2 $self->get_actions( $c, $action, $namespace ) =cut @@ -236,7 +276,7 @@ sub get_actions { return map { $_->get_action($action) } @match; } -=item $self->get_containers( $namespace ) +=head2 $self->get_containers( $namespace ) =cut @@ -278,7 +318,7 @@ sub get_containers { return map { $_->getNodeValue } @match; } -=item $self->register( $c, $action ) +=head2 $self->register( $c, $action ) =cut @@ -338,7 +378,7 @@ sub register { $parent->getNodeValue->actions->{ $action->name } = $action; } -=item $self->setup_actions( $class, $component ) +=head2 $self->setup_actions( $class, $component ) =cut @@ -351,8 +391,8 @@ sub setup_actions { $self->action_container_class('Catalyst::ActionContainer'); # Preload action types - for my $type (@PRELOAD) { - my $class = "Catalyst::DispatchType::$type"; + for my $type ( @{$self->preload_dispatch_types} ) { + my $class = ($type =~ /^\+(.*)$/) ? $1 : "Catalyst::DispatchType::${type}"; eval "require $class"; Catalyst::Exception->throw( message => qq/Couldn't load "$class"/ ) if $@; @@ -370,8 +410,8 @@ sub setup_actions { } # Postload action types - for my $type (@POSTLOAD) { - my $class = "Catalyst::DispatchType::$type"; + for my $type ( @{$self->postload_dispatch_types} ) { + my $class = ($type =~ /^\+(.*)$/) ? $1 : "Catalyst::DispatchType::${type}"; eval "require $class"; Catalyst::Exception->throw( message => qq/Couldn't load "$class"/ ) if $@; @@ -381,9 +421,9 @@ sub setup_actions { return unless $c->debug; my $privates = Text::SimpleTable->new( - [ 24, 'Private' ], - [ 23, 'Class' ], - [ 23, 'Method' ] + [ 20, 'Private' ], + [ 38, 'Class' ], + [ 12, 'Method' ] ); my $has_private = 0; @@ -413,8 +453,6 @@ sub setup_actions { $_->list($c) for @{ $self->dispatch_types }; } -=back - =head1 AUTHOR Sebastian Riedel, C