X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FDispatchType%2FPath.pm;h=b51f06ce5095e82c3d6a6cd5c4a3beb161e1fac6;hb=3c9b6867515767b70b7771dd0c32a532f23e876b;hp=29c418ffdbad42f7e4afc42a838abb5ed826c75b;hpb=b9b89145c40b01ae04dc483f4f29c02cf08725be;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/DispatchType/Path.pm b/lib/Catalyst/DispatchType/Path.pm
index 29c418f..b51f06c 100644
--- a/lib/Catalyst/DispatchType/Path.pm
+++ b/lib/Catalyst/DispatchType/Path.pm
@@ -6,6 +6,7 @@ extends 'Catalyst::DispatchType';
 use Text::SimpleTable;
 use Catalyst::Utils;
 use URI;
+use Scalar::Util ();
 
 has _paths => (
                is => 'rw',
@@ -61,6 +62,16 @@ sub list {
       if ( keys %{ $self->_paths } );
 }
 
+sub _action_args_sort_order {
+    my ( $self, $action ) = @_;
+
+    my ($args) = @{ $action->attributes->{Args} || [] };
+
+    return $args if Scalar::Util::looks_like_number($args);
+
+    return ~0;
+}
+
 =head2 $self->match( $c, $path )
 
 For each action registered to this exact path, offers the action a chance to
@@ -74,7 +85,12 @@ sub match {
 
     $path = '/' if !defined $path || !length $path;
 
-    foreach my $action ( @{ $self->_paths->{$path} || [] } ) {
+    # sort from least args to most
+    my @actions = sort { $self->_action_args_sort_order($a) <=>
+                         $self->_action_args_sort_order($b) }
+            @{ $self->_paths->{$path} || [] };
+
+    foreach my $action ( @actions ) {
         next unless $action->match($c);
         $c->req->action($path);
         $c->req->match($path);