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=58779fa87f2f1ecb9f05ddf2378f582fc35aa2f6;hp=4825647bd40b615207110e17b244fdbd6cfbcdf6;hb=4ab87e274ac0a05f98c10a4cdba467ba4398b0d3;hpb=b96f127f47d826a5bb8ebebc80f1b46ab3497e39

diff --git a/lib/Catalyst/DispatchType/Default.pm b/lib/Catalyst/DispatchType/Default.pm
index 4825647..58779fa 100644
--- a/lib/Catalyst/DispatchType/Default.pm
+++ b/lib/Catalyst/DispatchType/Default.pm
@@ -3,16 +3,54 @@ package Catalyst::DispatchType::Default;
 use strict;
 use base qw/Catalyst::DispatchType/;
 
-sub prepare_action {
-    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];
-    if ($result) {
-        $c->action( $result->[0] );
-        $c->namespace( $c->req->path );
+=head1 NAME
+
+Catalyst::DispatchType::Default - Default DispatchType
+
+=head1 SYNOPSIS
+
+See L<Catalyst>.
+
+=head1 DESCRIPTION
+
+=head1 METHODS
+
+=head2 $self->match( $c, $path )
+
+Check if default action matches, and set action if it does. 
+Will be called last for each controller.
+
+=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];
+
+    # Find default on namespace or super
+    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 if $path;
         $c->req->match('');
+        return 1;
     }
+    return 0;
 }
 
+=head1 AUTHOR
+
+Matt S Trout
+Sebastian Riedel, C<sri@cpan.org>
+
+=head1 COPYRIGHT
+
+This program is free software, you can redistribute it and/or modify it under
+the same terms as Perl itself.
+
+=cut
+
 1;