allow refs

diff --git a/lib/Catalyst/Action.pm b/lib/Catalyst/Action.pm
index 9622541..d74e4e0 100644 (file)
--- a/lib/Catalyst/Action.pm
+++ b/lib/Catalyst/Action.pm
@@ -55,7 +55,10 @@ has number_of_args => (
     } elsif(!defined($self->attributes->{Args}[0])) {
       # When its 'Args' that internal cue for 'unlimited'
       return undef;
-    } elsif(looks_like_number($self->attributes->{Args}[0])) {
+    } elsif(
+      scalar(@{$self->attributes->{Args}}) == 1 &&
+      looks_like_number($self->attributes->{Args}[0])
+    ) {
       # 'Old school' numberd args (is allowed to be undef as well)
       return $self->attributes->{Args}[0];
     } else {
@@ -96,7 +99,10 @@ has args_constraints => (
     ) {
       return \@args;
     } else {
-      @args = map { Moose::Util::TypeConstraints::find_or_parse_type_constraint($_) || die "$_ is not a constraint!" } @arg_protos;
+      # Allows Args(Int,Str) and Args(Str,2,Int) == Args(Str,Any,Any,Int)
+      @args =
+        map { Moose::Util::TypeConstraints::find_or_parse_type_constraint($_) || die "$_ is not a constraint!" } 
+        map { looks_like_number($_) ? ('Any' x $_) : $_ } @arg_protos;
     }
 
     return \@args;
@@ -136,10 +142,19 @@ sub match {
     # There there are arg constraints, we must see to it that the constraints
     # check positive for each arg in the list.
     if($self->has_args_constraints) {
-      for my $i($#{ $c->req->args }) {
-        $self->args_constraints->[$i]->check($c->req->args->[$i]) || return 0;
+      # If there is only one type constraint, and its a Ref or subtype of Ref,
+      # That means we expect a reference, so use the full args arrayref.
+      if(
+        $self->number_of_args_constraints == 1 &&
+        $self->args_constraints->[0]->is_a_type_of('Ref')
+      ) {
+        return $self->args_constraints->[0]->check($c->req->args);
+      } else {
+        for my $i($#{ $c->req->args }) {
+          $self->args_constraints->[$i]->check($c->req->args->[$i]) || return 0;
+        }
+        return 1;
       }
-      return 1;
     } else {
       # Otherwise, we just need to match the number of args.
       return scalar( @{ $c->req->args } ) == $self->normalized_arg_number;

diff --git a/t/arg_constraints.t b/t/arg_constraints.t
index 86b5259..1a56834 100644 (file)
--- a/t/arg_constraints.t
+++ b/t/arg_constraints.t
@@ -14,10 +14,14 @@ use HTTP::Request::Common;
 
   sub an_int :Local Args(Int) {
     my ($self, $c, $int) = @_;
-    #use Devel::Dwarn; Dwarn $self;
     $c->res->body('an_int');
   }
 
+  sub many_ints :Local Args(ArrayRef[Int]) {
+    my ($self, $c, $int) = @_;
+    $c->res->body('many_ints');
+  }
+
   sub default :Default {
     my ($self, $c, $int) = @_;
     $c->res->body('default');
@@ -39,6 +43,26 @@ use Catalyst::Test 'MyApp';
 }
 
 {
+  my $res = request '/many_ints/1';
+  is $res->content, 'many_ints';
+}
+
+{
+  my $res = request '/many_ints/1/2';
+  is $res->content, 'many_ints';
+}
+
+{
+  my $res = request '/many_ints/1/2/3';
+  is $res->content, 'many_ints';
+}
+
+{
+  my $res = request '/many_ints/1/2/a';
+  is $res->content, 'default';
+}
+
+{
   my $res = request '/an_int/aa';
   is $res->content, 'default';
 }