X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FDispatcher.pm;h=855226a111915cf83a632b753d8c5dc96a9a638d;hb=e7bb8d339abdd9c9da0b8ac62f619f2e0e33cc89;hp=35f129fef8f167028df02383cbff5b2caf0ab780;hpb=7101bd1f9d86faa21526f6601dbdb401c679501c;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Dispatcher.pm b/lib/Catalyst/Dispatcher.pm index 35f129f..855226a 100644 --- a/lib/Catalyst/Dispatcher.pm +++ b/lib/Catalyst/Dispatcher.pm @@ -17,17 +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 reserved_actions/ + 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/; - -# Reserved action names -our @RESERVED = qw/begin auto default index end/; +our @POSTLOAD = qw/Default/; =head1 NAME @@ -41,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 -=item $self->detach( $c, $command [, \@arguments ] ) +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: + + +My::Dispatch::Type + +=head2 $self->detach( $c, $command [, \@arguments ] ) =cut @@ -53,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' ) ); } @@ -74,7 +104,7 @@ sub dispatch { } } -=item $self->forward( $c, $command [, \@arguments ] ) +=head2 $self->forward( $c, $command [, \@arguments ] ) =cut @@ -126,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 = @@ -172,7 +204,7 @@ qq/Couldn't forward to command "$command". Invalid action or component./; return $c->state; } -=item $self->prepare_action($c) +=head2 $self->prepare_action($c) =cut @@ -182,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 @@ -197,7 +230,9 @@ 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 . '"' ) @@ -207,7 +242,7 @@ sub prepare_action { if ( $c->debug && @args ); } -=item $self->get_action( $action, $namespace ) +=head2 $self->get_action( $action, $namespace ) =cut @@ -226,7 +261,7 @@ sub get_action { } } -=item $self->get_actions( $c, $action, $namespace ) +=head2 $self->get_actions( $c, $action, $namespace ) =cut @@ -241,7 +276,7 @@ sub get_actions { return map { $_->get_action($action) } @match; } -=item $self->get_containers( $namespace ) +=head2 $self->get_containers( $namespace ) =cut @@ -283,7 +318,7 @@ sub get_containers { return map { $_->getNodeValue } @match; } -=item $self->register( $c, $action ) +=head2 $self->register( $c, $action ) =cut @@ -303,18 +338,10 @@ sub register { } } - # Check if action name is reserved - my $reserved = 0; - for my $name ( @{ $self->reserved_actions } ) { - $reserved++ if $action->name eq $name; - } - # Pass the action to our dispatch types so they can register it if reqd. - my $reg = $reserved; - unless ($reserved) { - foreach my $type ( @{ $self->dispatch_types } ) { - $reg++ if $type->register( $c, $action ); - } + my $reg = 0; + foreach my $type ( @{ $self->dispatch_types } ) { + $reg++ if $type->register( $c, $action ); } return unless $reg + $priv; @@ -351,7 +378,7 @@ sub register { $parent->getNodeValue->actions->{ $action->name } = $action; } -=item $self->setup_actions( $class, $component ) +=head2 $self->setup_actions( $class, $component ) =cut @@ -360,13 +387,12 @@ sub setup_actions { $self->dispatch_types( [] ); $self->registered_dispatch_types( {} ); - $self->reserved_actions( \@RESERVED ); $self->method_action_class('Catalyst::Action'); $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 $@; @@ -384,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 $@; @@ -427,8 +453,6 @@ sub setup_actions { $_->list($c) for @{ $self->dispatch_types }; } -=back - =head1 AUTHOR Sebastian Riedel, C