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=69e91da6533243ab3d14008ee303169202bea679;hp=52fdb7341933c3f26121d77ebe459de9394bd87e;hb=0fc2d522eec43202c21e9f0062e43f10db4d9008;hpb=c5b74a51e7fa915f628392c1c55cb2d4a3e89d07 diff --git a/lib/Catalyst/DispatchType/Path.pm b/lib/Catalyst/DispatchType/Path.pm index 52fdb73..69e91da 100644 --- a/lib/Catalyst/DispatchType/Path.pm +++ b/lib/Catalyst/DispatchType/Path.pm @@ -1,10 +1,21 @@ package Catalyst::DispatchType::Path; -use strict; -use base qw/Catalyst::DispatchType/; +use Class::C3; +use Moose; +extends '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 @@ -26,14 +37,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 ) - if ( keys %{ $self->{paths} } ); + $c->log->debug( "Loaded Path actions:\n" . $paths->draw . "\n" ) + if ( keys %{ $self->_paths } ); } =head2 $self->match( $c, $path ) @@ -49,7 +60,7 @@ sub match { $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); @@ -90,7 +101,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; } @@ -130,4 +141,6 @@ the same terms as Perl itself. =cut +__PACKAGE__->meta->make_immutable; + 1;