use Text::SimpleTable;
use Catalyst::Utils;
use URI;
+use Scalar::Util ();
has _paths => (
is => 'rw',
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
$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 ) {
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} ) {
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)');
}
}