X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FDispatchType%2FIndex.pm;h=63b864df226c3207bd8ad0d10de550d5975f1d39;hp=3caeb5cac87ab6fbbe5e51fe7f24a6dafb5ea452;hb=e5ecd5bc38bac3e2fcfaf643ea2a4c6ab46d7e57;hpb=bcccee4e7d7b98c151448074e83c6201ef434476

diff --git a/lib/Catalyst/DispatchType/Index.pm b/lib/Catalyst/DispatchType/Index.pm
index 3caeb5c..63b864d 100644
--- a/lib/Catalyst/DispatchType/Index.pm
+++ b/lib/Catalyst/DispatchType/Index.pm
@@ -1,7 +1,10 @@
 package Catalyst::DispatchType::Index;
 
-use strict;
-use base qw/Catalyst::DispatchType/;
+use Moose;
+extends 'Catalyst::DispatchType';
+
+#use strict;
+#use base qw/Catalyst::DispatchType/;
 
 =head1 NAME
 
@@ -15,22 +18,22 @@ 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
 
 sub match {
     my ( $self, $c, $path ) = @_;
-    return if $path =~ m!/!;
     return if @{ $c->req->args };
-    my $result = @{ $c->get_action( 'index', $c->req->path ) || [] }[-1];
+    my $result = $c->get_action( 'index', $path );
 
-    # Find default on namespace or super
-    if ($result) {
-        $c->action( $result->[0] );
-        $c->namespace( $c->req->path );
+    if ($result && $result->match($c)) {
+        $c->action($result);
+        $c->namespace( $result->namespace );
         $c->req->action('index');
         $c->req->match( $c->req->path );
         return 1;
@@ -38,7 +41,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
 
@@ -51,4 +69,6 @@ the same terms as Perl itself.
 
 =cut
 
+__PACKAGE__->meta->make_immutable;
+
 1;