Initial support for :Args attribute

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

diff --git a/lib/Catalyst/DispatchType/Default.pm b/lib/Catalyst/DispatchType/Default.pm
index dba3951..abe887e 100644 (file)
--- a/lib/Catalyst/DispatchType/Default.pm
+++ b/lib/Catalyst/DispatchType/Default.pm
@@ -15,32 +15,29 @@ See L<Catalyst>.
 
 =head1 METHODS
 
-=over 4
-
-=item $self->match( $c, $path )
+=head2 $self->match( $c, $path )
 
 =cut
 
 sub match {
     my ( $self, $c, $path ) = @_;
     return if $path =~ m!/!;    # Not at root yet, wait for it ...
-    my $result = ($c->get_actions('default', $c->req->path))[-1];
+    my $result = ( $c->get_actions( 'default', $c->req->path ) )[-1];
 
     # Find default on namespace or super
-    if ($result) {
-        $c->action( $result );
+    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 }, $path;
+        unshift @{ $c->req->args }, $path if $path;
         $c->req->match('');
         return 1;
     }
     return 0;
 }
 
-=back
-
 =head1 AUTHOR
 
 Matt S Trout