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=0b4e843af5738505278c0daea0cd9b8f497d38f5;hp=c13f73c0eadbfbab058165c1e144af0256e3a1bb;hb=0bf7ab7160f4f2fd0f00cd3d53ac311e9ad50241;hpb=ea0e58d9d85d93bf94c3ffa6b4d7b71b200bbdf1 diff --git a/lib/Catalyst/DispatchType/Path.pm b/lib/Catalyst/DispatchType/Path.pm index c13f73c..0b4e843 100644 --- a/lib/Catalyst/DispatchType/Path.pm +++ b/lib/Catalyst/DispatchType/Path.pm @@ -27,25 +27,27 @@ sub list { my ( $self, $c ) = @_; 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 ( @{ $self->{paths}->{$path} } ) { - $path = "/$path" unless $path eq '/'; - $paths->row( "$path", "/$action" ); + $paths->row( $display_path, "/$action" ); } } - $c->log->debug( "Loaded Path actions:\n" . $paths->draw ) + $c->log->debug( "Loaded Path actions:\n" . $paths->draw . "\n" ) if ( keys %{ $self->{paths} } ); } =head2 $self->match( $c, $path ) -Check for paths that match the given path. +For each action registered to this exact path, offers the action a chance to +match the path (in the order in which they were registered). Succeeds on the +first action that matches, if any; if not, returns 0. =cut sub match { my ( $self, $c, $path ) = @_; - $path ||= '/'; + $path = '/' if !defined $path || !length $path; foreach my $action ( @{ $self->{paths}->{$path} || [] } ) { next unless $action->match($c); @@ -61,7 +63,7 @@ sub match { =head2 $self->register( $c, $action ) -Call register_path for every path attribute in the given $action. +Calls register_path for every Path attribute for the given $action. =cut @@ -78,7 +80,7 @@ sub register { =head2 $self->register_path($c, $path, $action) -register an action at a given path. +Registers an action at a given path. =cut @@ -116,10 +118,9 @@ sub uri_for_action { } } -=head1 AUTHOR +=head1 AUTHORS -Matt S Trout -Sebastian Riedel, C +Catalyst Contributors, see Catalyst.pm =head1 COPYRIGHT