tweak debug output slightly

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

diff --git a/lib/Catalyst/DispatchType/Path.pm b/lib/Catalyst/DispatchType/Path.pm
index 1672712..d832dce 100644 (file)
--- a/lib/Catalyst/DispatchType/Path.pm
+++ b/lib/Catalyst/DispatchType/Path.pm
@@ -3,6 +3,7 @@ package Catalyst::DispatchType::Path;
 use strict;
 use base qw/Catalyst::DispatchType/;
 use Text::SimpleTable;
+use URI;
 
 =head1 NAME
 
@@ -18,27 +19,38 @@ See L<Catalyst>.
 
 =head2 $self->list($c)
 
+Debug output for Path dispatch points
+
 =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" );
+    my $paths = Text::SimpleTable->new( [ 35, 'Path' ], [ 36, 'Private' ] );
+    foreach my $path ( sort keys %{ $self->{paths} } ) {
+        my $display_path = $path eq '/' ? $path : "/$path";
+        foreach my $action ( @{ $self->{paths}->{$path} } ) {
+            $paths->row( $display_path, "/$action" );
+        }
     }
-    $c->log->debug( "Loaded Path actions:\n" . $paths->draw )
+    $c->log->debug( "Loaded Path actions:\n" . $paths->draw . "\n" )
       if ( keys %{ $self->{paths} } );
 }
 
 =head2 $self->match( $c, $path )
 
+For each action registered to this exact path, offers the action a chance to
+match the path (in the order in which they were registered). Succeeds on the
+first action that matches, if any; if not, returns 0.
+
 =cut
 
 sub match {
     my ( $self, $c, $path ) = @_;
 
-    if ( my $action = $self->{paths}->{$path} ) {
+    $path ||= '/';
+
+    foreach my $action ( @{ $self->{paths}->{$path} || [] } ) {
+        next unless $action->match($c);
         $c->req->action($path);
         $c->req->match($path);
         $c->action($action);
@@ -51,48 +63,59 @@ sub match {
 
 =head2 $self->register( $c, $action )
 
+Calls register_path for every Path attribute for the given $action.
+
 =cut
 
 sub register {
     my ( $self, $c, $action ) = @_;
 
-    my $attrs = $action->attributes;
-    my @register;
-
-    foreach my $r ( @{ $attrs->{Path} || [] } ) {
-        unless ($r) {
-            $r = $action->namespace;
-            $r = '' if $r eq '/';
-        }
-        elsif ( $r !~ m!^/! ) {    # It's a relative path
-            $r = $action->namespace . "/$r";
-        }
-        push( @register, $r );
-    }
-
-    if ( $attrs->{Global} || $attrs->{Absolute} ) {
-        push( @register, $action->name );    # Register sub name against root
-    }
-
-    if ( $attrs->{Local} || $attrs->{Relative} ) {
-        push( @register, join( '/', $action->namespace, $action->name ) );
-
-        # Register sub name as a relative path
-    }
+    my @register = @{ $action->attributes->{Path} || [] };
 
     $self->register_path( $c, $_, $action ) for @register;
+
     return 1 if @register;
     return 0;
 }
 
 =head2 $self->register_path($c, $path, $action)
 
+Registers an action at a given path.
+
 =cut
 
 sub register_path {
     my ( $self, $c, $path, $action ) = @_;
     $path =~ s!^/!!;
-    $self->{paths}{$path} = $action;
+    $path = '/' unless length $path;
+    $path = URI->new($path)->canonical;
+
+    unshift( @{ $self->{paths}{$path} ||= [] }, $action);
+
+    return 1;
+}
+
+=head2 $self->uri_for_action($action, $captures)
+
+get a URI part for an action; always returns undef is $captures is set
+since Path actions don't have captures
+
+=cut
+
+sub uri_for_action {
+    my ( $self, $action, $captures ) = @_;
+
+    return undef if @$captures;
+
+    if (my $paths = $action->attributes->{Path}) {
+        my $path = $paths->[0];
+        $path = '/' unless length($path);
+        $path = "/${path}" unless ($path =~ m/^\//);
+        $path = URI->new($path)->canonical;
+        return $path;
+    } else {
+        return undef;
+    }
 }
 
 =head1 AUTHOR