[Catalyst-commits] r10455 - in Catalyst-Runtime/5.80/trunk: lib/Catalyst/DispatchType t/aggregate t/lib/TestAppMatchSingleArg/Controller

[caelum at dev.catalyst.perl.org]

Author: caelum
Date: 2009-06-06 10:52:27 +0000 (Sat, 06 Jun 2009)
New Revision: 10455

Modified:
   Catalyst-Runtime/5.80/trunk/lib/Catalyst/DispatchType/Path.pm
   Catalyst-Runtime/5.80/trunk/t/aggregate/live_component_controller_action_path_matchsingle.t
   Catalyst-Runtime/5.80/trunk/t/lib/TestAppMatchSingleArg/Controller/Root.pm
Log:
stackoverflow path bug take two

Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst/DispatchType/Path.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst/DispatchType/Path.pm	2009-06-06 10:20:10 UTC (rev 10454)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst/DispatchType/Path.pm	2009-06-06 10:52:27 UTC (rev 10455)
@@ -6,6 +6,7 @@
 use Text::SimpleTable;
 use Catalyst::Utils;
 use URI;
+use Scalar::Util ();
 
 has _paths => (
                is => 'rw',
@@ -61,6 +62,16 @@
       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
@@ -75,8 +86,8 @@
     $path = '/' if !defined $path || !length $path;
 
     # sort from least args to most
-    my @actions = sort { ($b->attributes->{Args}||0) <=>
-                      ($a->attributes->{Args}||0) }
+    my @actions = sort { $self->_action_args_sort_order($a) <=>
+                         $self->_action_args_sort_order($b) }
             @{ $self->_paths->{$path} || [] };
 
     foreach my $action ( @actions ) {

Modified: Catalyst-Runtime/5.80/trunk/t/aggregate/live_component_controller_action_path_matchsingle.t
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/aggregate/live_component_controller_action_path_matchsingle.t	2009-06-06 10:20:10 UTC (rev 10454)
+++ Catalyst-Runtime/5.80/trunk/t/aggregate/live_component_controller_action_path_matchsingle.t	2009-06-06 10:52:27 UTC (rev 10455)
@@ -10,7 +10,7 @@
 
 BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 1; }
 
-use Test::More tests => 2*$iters;
+use Test::More tests => 3*$iters;
 use Catalyst::Test 'TestAppMatchSingleArg';
 
 if ( $ENV{CAT_BENCHMARK} ) {
@@ -25,7 +25,8 @@
 
 sub run_tests {
     {
-        is(get('/foo/bar'), 'Path', 'multiple args matched :Path');
+        is(get('/foo/bar/baz'), 'Path', 'multiple args matched :Path');
         is(get('/foo'), 'Path Args(1)', 'single arg matched :Path Args(1)');
+        is(get('/foo/bar'), 'Path Args(2)', 'two args matched :Path Args(2)');
     }
 }

Modified: Catalyst-Runtime/5.80/trunk/t/lib/TestAppMatchSingleArg/Controller/Root.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/lib/TestAppMatchSingleArg/Controller/Root.pm	2009-06-06 10:20:10 UTC (rev 10454)
+++ Catalyst-Runtime/5.80/trunk/t/lib/TestAppMatchSingleArg/Controller/Root.pm	2009-06-06 10:52:27 UTC (rev 10455)
@@ -16,4 +16,9 @@
     $c->res->body('Path');
 }
 
+sub match_two : Path Args(2) {
+    my ($self, $c) = @_;
+    $c->res->body('Path Args(2)');
+}
+
 1;