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=227815f04360ab47f04448ed2c5cd040656dae91;hp=31f37b3e9790d5367aeb087c847c529d4edc8397;hb=0ba80bce27a56d366c8d44c254332dd83f9ba0f9;hpb=8c11318848e17f92027484614d393b6ebd365f7d diff --git a/lib/Catalyst/DispatchType/Path.pm b/lib/Catalyst/DispatchType/Path.pm index 31f37b3..227815f 100644 --- a/lib/Catalyst/DispatchType/Path.pm +++ b/lib/Catalyst/DispatchType/Path.pm @@ -16,9 +16,7 @@ See L. =head1 METHODS -=over 4 - -=item $self->list($c) +=head2 $self->list($c) =cut @@ -27,19 +25,21 @@ sub list { my $paths = Text::SimpleTable->new( [ 36, 'Path' ], [ 37, 'Private' ] ); for my $path ( sort keys %{ $self->{paths} } ) { my $action = $self->{paths}->{$path}; - $paths->row( "/$path", "/$action" ); + $path = "/$path" unless $path eq '/'; + $paths->row( "$path", "/$action" ); } $c->log->debug( "Loaded Path actions:\n" . $paths->draw ) if ( keys %{ $self->{paths} } ); } -=item $self->match( $c, $path ) +=head2 $self->match( $c, $path ) =cut sub match { my ( $self, $c, $path ) = @_; + $path ||= '/'; if ( my $action = $self->{paths}->{$path} ) { $c->req->action($path); $c->req->match($path); @@ -51,7 +51,7 @@ sub match { return 0; } -=item $self->register( $c, $action ) +=head2 $self->register( $c, $action ) =cut @@ -62,7 +62,11 @@ sub register { my @register; foreach my $r ( @{ $attrs->{Path} || [] } ) { - unless ( $r =~ m!^/! ) { # It's a relative path + unless ($r) { + $r = $action->namespace; + $r = '/' unless length $r; + } + elsif ( $r !~ m!^/! ) { # It's a relative path $r = $action->namespace . "/$r"; } push( @register, $r ); @@ -78,13 +82,21 @@ sub register { # Register sub name as a relative path } - foreach my $r (@register) { - $r =~ s!^/!!; - $self->{paths}{$r} = $action; - } + $self->register_path( $c, $_, $action ) for @register; + return 1 if @register; + return 0; } -=back +=head2 $self->register_path($c, $path, $action) + +=cut + +sub register_path { + my ( $self, $c, $path, $action ) = @_; + $path =~ s!^/!!; + $path = '/' unless length $path; + $self->{paths}{$path} = $action; +} =head1 AUTHOR