extended uri_for, added uri_for_action to dispatcher

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

diff --git a/lib/Catalyst/DispatchType/Index.pm b/lib/Catalyst/DispatchType/Index.pm
index 95ed8b5..fbe9faa 100644 (file)
--- a/lib/Catalyst/DispatchType/Index.pm
+++ b/lib/Catalyst/DispatchType/Index.pm
@@ -15,21 +15,21 @@ See L<Catalyst>.
 
 =head1 METHODS
 
-=over 4
+=head2 $self->match( $c, $path )
 
-=item $self->match( $c, $path )
+Check if there's an index action for a given path, and set it up to use it
+if there is.
 
 =cut
 
 sub match {
     my ( $self, $c, $path ) = @_;
     return if @{ $c->req->args };
-    my $result = @{ $c->get_action( 'index', $path ) || [] }[-1];
+    my $result = $c->get_action( 'index', $path );
 
-    # Find default on namespace or super
-    if ($result) {
-        $c->action( $result->[0] );
-        $c->namespace( $result->[0]->namespace );
+    if ($result && $result->match($c)) {
+        $c->action($result);
+        $c->namespace( $result->namespace );
         $c->req->action('index');
         $c->req->match( $c->req->path );
         return 1;
@@ -37,7 +37,22 @@ sub match {
     return 0;
 }
 
-=back
+=head2 $self->uri_for_action( $action, $captures )
+
+get a URI part for an action; always returns undef is $captures is set
+since index actions don't have captures
+
+=cut
+
+sub uri_for_action {
+    my ( $self, $action, $captures ) = @_;
+
+    return undef if @$captures;
+
+    return undef unless $action->name eq 'index';
+
+    return "/".$action->namespace;
+}
 
 =head1 AUTHOR