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=66873269994cbff0e14872ad425da37cf1744ead;hb=05b47f2e6357bc7f1622e6b2cf730ad5bbeb993f;hpb=391c455f09b823578778b40dce5282890de302d0 diff --git a/lib/Catalyst/DispatchType/Path.pm b/lib/Catalyst/DispatchType/Path.pm index 6687326..50fbf84 100644 --- a/lib/Catalyst/DispatchType/Path.pm +++ b/lib/Catalyst/DispatchType/Path.pm @@ -48,7 +48,7 @@ Debug output for Path dispatch points sub list { my ( $self, $c ) = @_; my $column_width = Catalyst::Utils::term_width() - 35 - 9; - my $paths = Text::SimpleTable->new( + my $paths = Text::SimpleTable->new( [ 35, 'Path' ], [ $column_width, 'Private' ] ); foreach my $path ( sort keys %{ $self->_paths } ) { @@ -74,12 +74,7 @@ sub match { $path = '/' if !defined $path || !length $path; - # sort from least args to most - my @actions = sort { ($b->attributes->{Args}||0) <=> - ($a->attributes->{Args}||0) } - @{ $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); @@ -122,6 +117,8 @@ sub register_path { unshift( @{ $self->_paths->{$path} ||= [] }, $action); + $self->_paths->{$path} = [ sort @{ $self->_paths->{$path} } ]; + return 1; } @@ -154,7 +151,7 @@ Catalyst Contributors, see Catalyst.pm =head1 COPYRIGHT -This program is free software, you can redistribute it and/or modify it under +This library is free software. You can redistribute it and/or modify it under the same terms as Perl itself. =cut