- Fixes for rt.cpan #17322 and #17331

[catagits/Catalyst-Runtime.git] / lib / Catalyst / DispatchType / Path.pm

diff --git a/lib/Catalyst/DispatchType/Path.pm b/lib/Catalyst/DispatchType/Path.pm
index f51387c..227815f 100644 (file)
--- a/lib/Catalyst/DispatchType/Path.pm
+++ b/lib/Catalyst/DispatchType/Path.pm
@@ -2,44 +2,112 @@ package Catalyst::DispatchType::Path;
 
 use strict;
 use base qw/Catalyst::DispatchType/;
+use Text::SimpleTable;
 
-sub prepare_action {
-    my ($self, $c, $path) = @_;
+=head1 NAME
 
+Catalyst::DispatchType::Path - Path DispatchType
+
+=head1 SYNOPSIS
+
+See L<Catalyst>.
+
+=head1 DESCRIPTION
+
+=head1 METHODS
+
+=head2 $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};
+        $path = "/$path" unless $path eq '/';
+        $paths->row( "$path", "/$action" );
+    }
+    $c->log->debug( "Loaded Path actions:\n" . $paths->draw )
+      if ( keys %{ $self->{paths} } );
+}
+
+=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);
         $c->action($action);
-        $c->namespace($action->prefix);
+        $c->namespace( $action->namespace );
         return 1;
     }
 
     return 0;
 }
 
-sub register_action {
+=head2 $self->register( $c, $action )
+
+=cut
+
+sub register {
     my ( $self, $c, $action ) = @_;
+
     my $attrs = $action->attributes;
     my @register;
-    foreach my $r (@{$attrs->{Path} || []}) {
-        unless ($r =~ m!^/!) {
-            $r = $action->prefix."/$r";
+
+    foreach my $r ( @{ $attrs->{Path} || [] } ) {
+        unless ($r) {
+            $r = $action->namespace;
+            $r = '/' unless length $r;
         }
-        push(@register, $r);
+        elsif ( $r !~ m!^/! ) {    # It's a relative path
+            $r = $action->namespace . "/$r";
+        }
+        push( @register, $r );
     }
 
-    if ($attrs->{Global} || $attrs->{Absolute}) {
-        push(@register, $action->name);
+    if ( $attrs->{Global} || $attrs->{Absolute} ) {
+        push( @register, $action->name );    # Register sub name against root
     }
 
-    if ($attrs->{Local} || $attrs->{Relative}) {
-        push(@register, join('/', $action->prefix, $action->name));
-    }
+    if ( $attrs->{Local} || $attrs->{Relative} ) {
+        push( @register, join( '/', $action->namespace, $action->name ) );
 
-    foreach my $r (@register) {
-        $r =~ s!^/!!;
-        $self->{paths}{$r} = $action;
+        # Register sub name as a relative path
     }
+
+    $self->register_path( $c, $_, $action ) for @register;
+    return 1 if @register;
+    return 0;
 }
 
+=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
+
+Matt S Trout
+Sebastian Riedel, C<sri@cpan.org>
+
+=head1 COPYRIGHT
+
+This program is free software, you can redistribute it and/or modify it under
+the same terms as Perl itself.
+
+=cut
+
 1;