X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FDispatchType%2FPath.pm;h=ccff553d4a74ee0423bd9c4bd7a910471c29b8b9;hb=694d15f1f6031de10d1ecb047b9e66dd0982e3a3;hp=81603d5701ab35b255c79594cd70c6955e0bb40c;hpb=11bd4e3eaa29685c44318041381621e79c4a5f44;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/DispatchType/Path.pm b/lib/Catalyst/DispatchType/Path.pm index 81603d5..ccff553 100644 --- a/lib/Catalyst/DispatchType/Path.pm +++ b/lib/Catalyst/DispatchType/Path.pm @@ -2,7 +2,7 @@ package Catalyst::DispatchType::Path; use strict; use base qw/Catalyst::DispatchType/; -use Text::ASCIITable; +use Text::SimpleTable; =head1 NAME @@ -24,16 +24,13 @@ See L. sub list { my ( $self, $c ) = @_; - my $paths = Text::ASCIITable->new; - $paths->setCols( 'Path', 'Private' ); - $paths->setColWidth( 'Path', 36, 1 ); - $paths->setColWidth( 'Private', 37, 1 ); + my $paths = Text::SimpleTable->new( [ 36, 'Path' ], [ 37, 'Private' ] ); for my $path ( sort keys %{ $self->{paths} } ) { my $action = $self->{paths}->{$path}; - $paths->addRow( "/$path", "/$action" ); + $paths->row( "/$path", "/$action" ); } $c->log->debug( "Loaded Path actions:\n" . $paths->draw ) - if ( @{ $paths->{tbl_rows} } ); + if ( keys %{ $self->{paths} } ); } =item $self->match( $c, $path ) @@ -65,7 +62,10 @@ sub register { my @register; foreach my $r ( @{ $attrs->{Path} || [] } ) { - unless ( $r =~ m!^/! ) { # It's a relative path + unless ($r) { + $r = $action->namespace; + } + elsif ( $r !~ m!^/! ) { # It's a relative path $r = $action->namespace . "/$r"; } push( @register, $r ); @@ -81,10 +81,19 @@ 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; +} + +=item $self->register_path($c, $path, $action) + +=cut + +sub register_path { + my ( $self, $c, $path, $action ) = @_; + $path =~ s!^/!!; + $self->{paths}{$path} = $action; } =back