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=46902c4bf5d70f520fb9e624ad0738390197407c;hb=05b47f2e6357bc7f1622e6b2cf730ad5bbeb993f;hpb=6680c772eaa987eafdb32e9437fd2d649dc914d9 diff --git a/lib/Catalyst/DispatchType/Path.pm b/lib/Catalyst/DispatchType/Path.pm index 46902c4..50fbf84 100644 --- a/lib/Catalyst/DispatchType/Path.pm +++ b/lib/Catalyst/DispatchType/Path.pm @@ -3,9 +3,8 @@ package Catalyst::DispatchType::Path; use Moose; extends 'Catalyst::DispatchType'; -#use strict; -#use base qw/Catalyst::DispatchType/; use Text::SimpleTable; +use Catalyst::Utils; use URI; has _paths => ( @@ -15,16 +14,29 @@ has _paths => ( default => sub { +{} }, ); +no Moose; + =head1 NAME Catalyst::DispatchType::Path - Path DispatchType =head1 SYNOPSIS -See L. +See L. =head1 DESCRIPTION +Dispatch type managing full path matching behaviour. For more information on +dispatch types, see: + +=over 4 + +=item * L for how they affect application authors + +=item * L for implementation information. + +=back + =head1 METHODS =head2 $self->list($c) @@ -35,7 +47,10 @@ Debug output for Path dispatch points sub list { my ( $self, $c ) = @_; - my $paths = Text::SimpleTable->new( [ 35, 'Path' ], [ 36, 'Private' ] ); + my $column_width = Catalyst::Utils::term_width() - 35 - 9; + my $paths = Text::SimpleTable->new( + [ 35, 'Path' ], [ $column_width, 'Private' ] + ); foreach my $path ( sort keys %{ $self->_paths } ) { my $display_path = $path eq '/' ? $path : "/$path"; foreach my $action ( @{ $self->_paths->{$path} } ) { @@ -57,7 +72,7 @@ first action that matches, if any; if not, returns 0. sub match { my ( $self, $c, $path ) = @_; - $path ||= '/'; + $path = '/' if !defined $path || !length $path; foreach my $action ( @{ $self->_paths->{$path} || [] } ) { next unless $action->match($c); @@ -102,6 +117,8 @@ sub register_path { unshift( @{ $self->_paths->{$path} ||= [] }, $action); + $self->_paths->{$path} = [ sort @{ $self->_paths->{$path} } ]; + return 1; } @@ -128,19 +145,17 @@ sub uri_for_action { } } -=head1 AUTHOR +=head1 AUTHORS -Matt S Trout -Sebastian Riedel, C +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 -no Moose; __PACKAGE__->meta->make_immutable; 1;