X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FDispatchType%2FPath.pm;h=cffe66b4f591d85db281335aabce6ebdb268404a;hb=081def36ee509794aa7b30768c699b16636cee33;hp=454f87c92fdd56e910bd25af6116ff1a5664f07b;hpb=2633d7dc3bb9c0cf7bf3e7cf936d6411fe3ba5aa;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/DispatchType/Path.pm b/lib/Catalyst/DispatchType/Path.pm
index 454f87c..cffe66b 100644
--- a/lib/Catalyst/DispatchType/Path.pm
+++ b/lib/Catalyst/DispatchType/Path.pm
@@ -2,6 +2,7 @@ package Catalyst::DispatchType::Path;
 
 use strict;
 use base qw/Catalyst::DispatchType/;
+use Text::SimpleTable;
 
 =head1 NAME
 
@@ -17,6 +18,21 @@ See L<Catalyst>.
 
 =over 4
 
+=item $self->list($c)
+
+=cut
+
+sub list {
+    my ( $self, $c ) = @_;
+    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" );
+    }
+    $c->log->debug( "Loaded Path actions:\n" . $paths->draw )
+      if ( keys %{ $self->{paths} } );
+}
+
 =item $self->match( $c, $path )
 
 =cut
@@ -28,7 +44,7 @@ sub match {
         $c->req->action($path);
         $c->req->match($path);
         $c->action($action);
-        $c->namespace( $action->prefix );
+        $c->namespace( $action->namespace );
         return 1;
     }
 
@@ -46,8 +62,11 @@ sub register {
     my @register;
 
     foreach my $r ( @{ $attrs->{Path} || [] } ) {
-        unless ( $r =~ m!^/! ) {    # It's a relative path
-            $r = $action->prefix . "/$r";
+        unless ( $r ) {
+            $r = $action->namespace;
+        }
+        elsif ( $r !~ m!^/! ) {    # It's a relative path
+            $r = $action->namespace . "/$r";
         }
         push( @register, $r );
     }
@@ -57,15 +76,22 @@ sub register {
     }
 
     if ( $attrs->{Local} || $attrs->{Relative} ) {
-        push( @register, join( '/', $action->prefix, $action->name ) );
+        push( @register, join( '/', $action->namespace, $action->name ) );
 
         # Register sub name as a relative path
     }
 
-    foreach my $r (@register) {
-        $r =~ s!^/!!;
-        $self->{paths}{$r} = $action;
-    }
+    $self->register_path($c, $_, $action) for @register;
+}
+
+=item $self->register_path($c, $path, $action)
+
+=cut
+
+sub register_path {
+    my ($self, $c, $path, $action) = @_;
+    $path =~ s!^/!!;
+    $self->{paths}{$path} = $action;
 }
 
 =back