package Catalyst::DispatchType::Path;
-use MRO::Compat;
-use mro 'c3';
use Moose;
extends 'Catalyst::DispatchType';
use Text::SimpleTable;
+use Catalyst::Utils;
use URI;
+use Encode 2.21 'decode_utf8';
has _paths => (
is => 'rw',
=head1 SYNOPSIS
-See L<Catalyst>.
+See L<Catalyst::DispatchType>.
=head1 DESCRIPTION
+Dispatch type managing full path matching behaviour. For more information on
+dispatch types, see:
+
+=over 4
+
+=item * L<Catalyst::Manual::Intro> for how they affect application authors
+
+=item * L<Catalyst::DispatchType> for implementation information.
+
+=back
+
=head1 METHODS
=head2 $self->list($c)
sub list {
my ( $self, $c ) = @_;
- my $paths = Text::SimpleTable->new( [ 35, 'Path' ], [ 36, 'Private' ] );
+ my $avail_width = Catalyst::Utils::term_width() - 9;
+ my $col1_width = ($avail_width * .50) < 35 ? 35 : int($avail_width * .50);
+ my $col2_width = $avail_width - $col1_width;
+ my $paths = Text::SimpleTable->new(
+ [ $col1_width, 'Path' ], [ $col2_width, 'Private' ]
+ );
foreach my $path ( sort keys %{ $self->_paths } ) {
- my $display_path = $path eq '/' ? $path : "/$path";
foreach my $action ( @{ $self->_paths->{$path} } ) {
+ my $args = $action->number_of_args;
+ my $parts = defined($args) ? '/*' x $args : '/...';
+
+ my $display_path = "/$path/$parts";
+ $display_path =~ s{/{1,}}{/}g;
+ $display_path =~ s/%([0-9A-Fa-f]{2})/chr(hex($1))/eg; # deconvert urlencoded for pretty view
+ $display_path = decode_utf8 $display_path; # URI does encoding
$paths->row( $display_path, "/$action" );
}
}
sub match {
my ( $self, $c, $path ) = @_;
- $path ||= '/';
+ $path = '/' if !defined $path || !length $path;
+
+ my @actions = @{ $self->_paths->{$path} || [] };
- foreach my $action ( @{ $self->_paths->{$path} || [] } ) {
+ foreach my $action ( @actions ) {
next unless $action->match($c);
$c->req->action($path);
$c->req->match($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;
}
}
}
-=head1 AUTHOR
+=head1 AUTHORS
-Matt S Trout
-Sebastian Riedel, C<sri@cpan.org>
+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