X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FDispatchType%2FDefault.pm;h=50a1630df68519820528bd351a1d7f5f9f169cae;hb=7fa2c9c1b85c98786655ad5169708d8dc84e8353;hp=62308c32b277949926e2a747805704cbea4a9624;hpb=6112c0f9710da749af0c4e1ecfbbfe3030a5b895;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/DispatchType/Default.pm b/lib/Catalyst/DispatchType/Default.pm
index 62308c3..50a1630 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 Moose;
+extends 'Catalyst::DispatchType';
+
+
+#use strict;
+#use base qw/Catalyst::DispatchType/;
 
 =head1 NAME
 
@@ -15,9 +19,14 @@ See L<Catalyst>.
 
 =head1 METHODS
 
-=over 4
+=head2 $self->match( $c, $path )
 
-=item $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.
+
+If path is not empty, never matches since Default will only match if all
+other possibilities have been exhausted.
 
 =cut
 
@@ -27,7 +36,7 @@ sub match {
     my $result = ( $c->get_actions( 'default', $c->req->path ) )[-1];
 
     # Find default on namespace or super
-    if ($result) {
+    if ($result && $result->match($c)) {
         $c->action($result);
         $c->namespace( $result->namespace );
         $c->req->action('default');
@@ -40,8 +49,6 @@ sub match {
     return 0;
 }
 
-=back
-
 =head1 AUTHOR
 
 Matt S Trout