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=2fc3bc9e9f5c8c127b637f9d61624d289fc9f901;hp=1c0d5bf4daf8e3b201d0c4e6d302badece612adb;hb=ae29b412955743885e80350085167b54b69672da;hpb=22f3a8dd32e5940d87a1d21642fa39c7813bc921

diff --git a/lib/Catalyst/DispatchType/Default.pm b/lib/Catalyst/DispatchType/Default.pm
index 1c0d5bf..2fc3bc9 100644
--- a/lib/Catalyst/DispatchType/Default.pm
+++ b/lib/Catalyst/DispatchType/Default.pm
@@ -1,21 +1,63 @@
 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];
-        # Find default on namespace or super
-    if ($result) {
-        $c->action( $result->[0] );
-        $c->namespace( $c->req->path );
+use Moose;
+extends 'Catalyst::DispatchType';
+
+no Moose;
+
+=head1 NAME
+
+Catalyst::DispatchType::Default - Default DispatchType
+
+=head1 SYNOPSIS
+
+See L<Catalyst>.
+
+=head1 DESCRIPTION
+
+=head1 METHODS
+
+=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.
+
+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_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 AUTHORS
+
+Catalyst Contributors, see Catalyst.pm
+
+=head1 COPYRIGHT
+
+This program is free software, you can redistribute it and/or modify it under
+the same terms as Perl itself.
+
+=cut
+
+__PACKAGE__->meta->make_immutable;
+
 1;