X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FDispatchType%2FIndex.pm;h=f99e41cd5523294a197f6832728bf5dc3f0cf147;hb=4dca6c081be62b6542fda0a8098e8787dd5bcae2;hp=59026cf002038f629ebc6ce21badccf79c7e9b32;hpb=a9dc674c99f36ff40d94b80753a1504074ba5e22;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/DispatchType/Index.pm b/lib/Catalyst/DispatchType/Index.pm
index 59026cf..f99e41c 100644
--- a/lib/Catalyst/DispatchType/Index.pm
+++ b/lib/Catalyst/DispatchType/Index.pm
@@ -15,9 +15,11 @@ 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; only matches a full URI - if $c->req->args is already set
+this DispatchType is guaranteed not to match.
 
 =cut
 
@@ -26,8 +28,8 @@ sub match {
     return if @{ $c->req->args };
     my $result = $c->get_action( 'index', $path );
 
-    if ($result) {
-        $c->action( $result );
+    if ($result && $result->match($c)) {
+        $c->action($result);
         $c->namespace( $result->namespace );
         $c->req->action('index');
         $c->req->match( $c->req->path );
@@ -36,7 +38,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