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=c1f1255426c66f288b8676c0c4769122769a4d0f;hp=81603d5701ab35b255c79594cd70c6955e0bb40c;hb=621a5d5e7c8c9aabcca1601857102d1fd1d7d4f2;hpb=11bd4e3eaa29685c44318041381621e79c4a5f44 diff --git a/lib/Catalyst/DispatchType/Path.pm b/lib/Catalyst/DispatchType/Path.pm index 81603d5..c1f1255 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 );