X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FDispatchType%2FPath.pm;h=50fbf84a9e0dcaa31b8e1979ae6ea1c6772ab0d9;hp=6be3893f09f89fe66a7f6ff1f4d73bf39883807e;hb=05b47f2e6357bc7f1622e6b2cf730ad5bbeb993f;hpb=7b442de55a57592a0a9f09db2e85b135bb0c123f diff --git a/lib/Catalyst/DispatchType/Path.pm b/lib/Catalyst/DispatchType/Path.pm index 6be3893..50fbf84 100644 --- a/lib/Catalyst/DispatchType/Path.pm +++ b/lib/Catalyst/DispatchType/Path.pm @@ -6,7 +6,6 @@ extends 'Catalyst::DispatchType'; use Text::SimpleTable; use Catalyst::Utils; use URI; -use Scalar::Util (); has _paths => ( is => 'rw', @@ -62,16 +61,6 @@ sub list { if ( keys %{ $self->_paths } ); } -sub _action_args_sort_order { - my ( $self, $action ) = @_; - - my ($args) = @{ $action->attributes->{Args} || [] }; - - return $args if Scalar::Util::looks_like_number($args); - - return ~0; -} - =head2 $self->match( $c, $path ) For each action registered to this exact path, offers the action a chance to @@ -85,12 +74,7 @@ sub match { $path = '/' if !defined $path || !length $path; - # sort from least args to most - my @actions = sort { $self->_action_args_sort_order($a) <=> - $self->_action_args_sort_order($b) } - @{ $self->_paths->{$path} || [] }; - - foreach my $action ( @actions ) { + foreach my $action ( @{ $self->_paths->{$path} || [] } ) { next unless $action->match($c); $c->req->action($path); $c->req->match($path); @@ -133,6 +117,8 @@ sub register_path { unshift( @{ $self->_paths->{$path} ||= [] }, $action); + $self->_paths->{$path} = [ sort @{ $self->_paths->{$path} } ]; + return 1; }