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=93d300a8e139d6ba94b9772e98544326ff2483ca;hp=925b4ace06e8a51ec5005dfc3eeefeeaf5c57601;hb=2f3812528068bc1d9f7840067f0c03d36cd47e6d;hpb=3c0186f29e8864c86aca75f03f8d8ac1afd5507d diff --git a/lib/Catalyst/DispatchType/Path.pm b/lib/Catalyst/DispatchType/Path.pm index 925b4ac..93d300a 100644 --- a/lib/Catalyst/DispatchType/Path.pm +++ b/lib/Catalyst/DispatchType/Path.pm @@ -1,18 +1,20 @@ package Catalyst::DispatchType::Path; use Moose; +extends 'Catalyst::DispatchType'; + use Text::SimpleTable; use URI; -extends 'Catalyst::DispatchType'; - has _paths => ( is => 'rw', isa => 'HashRef', required => 1, - default => sub {{}} + default => sub { +{} }, ); +no Moose; + =head1 NAME Catalyst::DispatchType::Path - Path DispatchType @@ -33,17 +35,15 @@ Debug output for Path dispatch points sub list { my ( $self, $c ) = @_; - my %paths = %{ $self->_paths }; - my @keys = sort keys %paths; - return unless @keys; - my $paths_table = Text::SimpleTable->new( [ 35, 'Path' ], [ 36, 'Private' ] ); - foreach my $path ( @keys ) { + my $paths = Text::SimpleTable->new( [ 35, 'Path' ], [ 36, 'Private' ] ); + foreach my $path ( sort keys %{ $self->_paths } ) { my $display_path = $path eq '/' ? $path : "/$path"; - foreach my $action ( @{ $paths{$path} } ) { - $paths_table->row( $display_path, "/$action" ); + foreach my $action ( @{ $self->_paths->{$path} } ) { + $paths->row( $display_path, "/$action" ); } } - $c->log->debug( "Loaded Path actions:\n" . $paths_table->draw . "\n" ); + $c->log->debug( "Loaded Path actions:\n" . $paths->draw . "\n" ) + if ( keys %{ $self->_paths } ); } =head2 $self->match( $c, $path ) @@ -57,7 +57,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); @@ -128,10 +128,9 @@ sub uri_for_action { } } -=head1 AUTHOR +=head1 AUTHORS -Matt S Trout -Sebastian Riedel, C +Catalyst Contributors, see Catalyst.pm =head1 COPYRIGHT @@ -140,4 +139,6 @@ the same terms as Perl itself. =cut +__PACKAGE__->meta->make_immutable; + 1;