X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FDispatchType%2FDefault.pm;h=89847492b29f031b6a054f5d863b3a142f3329b9;hp=9cd82bf164bf1971e52dc1edb65ecefcd9ca3793;hb=6f1f968a6bc42bf4a4b50a1ee22d3aaecd801876;hpb=7cfcfd27da587caea68fc6240f1cc4c797e9df6f

diff --git a/lib/Catalyst/DispatchType/Default.pm b/lib/Catalyst/DispatchType/Default.pm
index 9cd82bf..8984749 100644
--- a/lib/Catalyst/DispatchType/Default.pm
+++ b/lib/Catalyst/DispatchType/Default.pm
@@ -1,7 +1,11 @@
 package Catalyst::DispatchType::Default;
 
-use strict;
-use base qw/Catalyst::DispatchType/;
+use MRO::Compat;
+use mro 'c3';
+use Moose;
+extends 'Catalyst::DispatchType';
+
+no Moose;
 
 =head1 NAME
 
@@ -15,32 +19,36 @@ See L<Catalyst>.
 
 =head1 METHODS
 
-=over 4
+=head2 $self->match( $c, $path )
+
+If path is empty (i.e. all path parts have been converted into args),
+attempts to find a default for the namespace constructed from the args,
+or the last inherited default otherwise and will match that.
 
-=item $self->match( $c, $path )
+If path is not empty, never matches since Default will only match if all
+other possibilities have been exhausted.
 
 =cut
 
 sub match {
     my ( $self, $c, $path ) = @_;
     return if $path =~ m!/!;    # Not at root yet, wait for it ...
-    my $result = @{ $c->get_action( 'default', $c->req->path, 1 ) || [] }[-1];
+    my $result = ( $c->get_actions( 'default', $c->req->path ) )[-1];
 
     # 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('default');
+
         # default methods receive the controller name as the first argument
-        unshift @{ $c->req->args }, ( split /\//, $result->[0] )[0];
+        unshift @{ $c->req->args }, $path if $path;
         $c->req->match('');
         return 1;
     }
     return 0;
 }
 
-=back
-
 =head1 AUTHOR
 
 Matt S Trout
@@ -53,4 +61,6 @@ the same terms as Perl itself.
 
 =cut
 
+__PACKAGE__->meta->make_immutable;
+
 1;