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=4932c11cc3d3ae3a6d42fe788b380a4d997b386a;hb=2f3812528068bc1d9f7840067f0c03d36cd47e6d;hpb=e8b9f2a92084b3b9dab6b2b879900481b8548b3b diff --git a/lib/Catalyst/DispatchType/Path.pm b/lib/Catalyst/DispatchType/Path.pm index 4932c11..93d300a 100644 --- a/lib/Catalyst/DispatchType/Path.pm +++ b/lib/Catalyst/DispatchType/Path.pm @@ -3,11 +3,18 @@ package Catalyst::DispatchType::Path; use Moose; extends 'Catalyst::DispatchType'; -#use strict; -#use base qw/Catalyst::DispatchType/; use Text::SimpleTable; use URI; +has _paths => ( + is => 'rw', + isa => 'HashRef', + required => 1, + default => sub { +{} }, + ); + +no Moose; + =head1 NAME Catalyst::DispatchType::Path - Path DispatchType @@ -29,14 +36,14 @@ Debug output for Path dispatch points sub list { my ( $self, $c ) = @_; my $paths = Text::SimpleTable->new( [ 35, 'Path' ], [ 36, 'Private' ] ); - foreach my $path ( sort keys %{ $self->{paths} } ) { + foreach my $path ( sort keys %{ $self->_paths } ) { my $display_path = $path eq '/' ? $path : "/$path"; - foreach my $action ( @{ $self->{paths}->{$path} } ) { + foreach my $action ( @{ $self->_paths->{$path} } ) { $paths->row( $display_path, "/$action" ); } } $c->log->debug( "Loaded Path actions:\n" . $paths->draw . "\n" ) - if ( keys %{ $self->{paths} } ); + if ( keys %{ $self->_paths } ); } =head2 $self->match( $c, $path ) @@ -50,9 +57,9 @@ 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} || [] } ) { + foreach my $action ( @{ $self->_paths->{$path} || [] } ) { next unless $action->match($c); $c->req->action($path); $c->req->match($path); @@ -93,7 +100,7 @@ sub register_path { $path = '/' unless length $path; $path = URI->new($path)->canonical; - unshift( @{ $self->{paths}{$path} ||= [] }, $action); + unshift( @{ $self->_paths->{$path} ||= [] }, $action); return 1; } @@ -121,10 +128,9 @@ sub uri_for_action { } } -=head1 AUTHOR +=head1 AUTHORS -Matt S Trout -Sebastian Riedel, C +Catalyst Contributors, see Catalyst.pm =head1 COPYRIGHT @@ -133,4 +139,6 @@ the same terms as Perl itself. =cut +__PACKAGE__->meta->make_immutable; + 1;