X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FDispatchType%2FPath.pm;h=95367ac9c0faa4f5fd2a6df1b309c17bdbb15509;hb=5e2186c55ff39ff02307a276806f7fd47c13f8d2;hp=f792fc5f0dcd76f9a10f2f739aae195df22948a5;hpb=26dc649ad1a74622697f25fcbf29e806e75fcd2f;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/DispatchType/Path.pm b/lib/Catalyst/DispatchType/Path.pm index f792fc5..95367ac 100644 --- a/lib/Catalyst/DispatchType/Path.pm +++ b/lib/Catalyst/DispatchType/Path.pm @@ -31,7 +31,7 @@ dispatch types, see: =over 4 -=item * L for how they affect website authors +=item * L for how they affect application authors =item * L for implementation information. @@ -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,7 +74,9 @@ sub match { $path = '/' if !defined $path || !length $path; - foreach my $action ( @{ $self->_paths->{$path} || [] } ) { + my @actions = @{ $self->_paths->{$path} || [] }; + + foreach my $action ( @actions ) { next unless $action->match($c); $c->req->action($path); $c->req->match($path); @@ -114,8 +116,11 @@ sub register_path { $path =~ s!^/!!; $path = '/' unless length $path; $path = URI->new($path)->canonical; + $path =~ s{(?<=[^/])/+\z}{}; - unshift( @{ $self->_paths->{$path} ||= [] }, $action); + $self->_paths->{$path} = [ + sort { $a->compare($b) } ($action, @{ $self->_paths->{$path} || [] }) + ]; return 1; } @@ -149,7 +154,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