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=d832dce9adba9aa62bb5410b76845e166abfc5da;hp=7f291db4624356d0efe53e601e2bba083bbf03d1;hb=1cf0345be8d7bf7cd33467da529885068db2b710;hpb=22f3a8dd32e5940d87a1d21642fa39c7813bc921

diff --git a/lib/Catalyst/DispatchType/Path.pm b/lib/Catalyst/DispatchType/Path.pm
index 7f291db..d832dce 100644
--- a/lib/Catalyst/DispatchType/Path.pm
+++ b/lib/Catalyst/DispatchType/Path.pm
@@ -2,47 +2,132 @@ package Catalyst::DispatchType::Path;
 
 use strict;
 use base qw/Catalyst::DispatchType/;
+use Text::SimpleTable;
+use URI;
 
-sub prepare_action {
-    my ($self, $c, $path) = @_;
+=head1 NAME
 
-    if ( my $action = $self->{paths}->{$path} ) {
+Catalyst::DispatchType::Path - Path DispatchType
+
+=head1 SYNOPSIS
+
+See L<Catalyst>.
+
+=head1 DESCRIPTION
+
+=head1 METHODS
+
+=head2 $self->list($c)
+
+Debug output for Path dispatch points
+
+=cut
+
+sub list {
+    my ( $self, $c ) = @_;
+    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 . "\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 ) = @_;
+
+    $path ||= '/';
+
+    foreach my $action ( @{ $self->{paths}->{$path} || [] } ) {
+        next unless $action->match($c);
         $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 )
+
+Calls register_path for every Path attribute for the given $action.
+
+=cut
+
+sub register {
     my ( $self, $c, $action ) = @_;
 
-    my $attrs = $action->attributes;
-    my @register;
+    my @register = @{ $action->attributes->{Path} || [] };
 
-    foreach my $r (@{$attrs->{Path} || []}) {
-        unless ($r =~ m!^/!) {    # It's a relative path
-            $r = $action->prefix."/$r";
-        }
-        push(@register, $r);
-    }
+    $self->register_path( $c, $_, $action ) for @register;
 
-    if ($attrs->{Global} || $attrs->{Absolute}) {
-        push(@register, $action->name); # Register sub name against root
-    }
+    return 1 if @register;
+    return 0;
+}
 
-    if ($attrs->{Local} || $attrs->{Relative}) {
-        push(@register, join('/', $action->prefix, $action->name));
-            # Register sub name as a relative path
-    }
+=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!^/!!;
+    $path = '/' unless length $path;
+    $path = URI->new($path)->canonical;
+
+    unshift( @{ $self->{paths}{$path} ||= [] }, $action);
+
+    return 1;
+}
 
-    foreach my $r (@register) {
-        $r =~ s!^/!!;
-        $self->{paths}{$r} = $action;
+=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
+
+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;