remove some potentially confusing syntax

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Action.pm

diff --git a/lib/Catalyst/Action.pm b/lib/Catalyst/Action.pm
index 473d595..ca4996a 100644 (file)
--- a/lib/Catalyst/Action.pm
+++ b/lib/Catalyst/Action.pm
@@ -39,8 +39,41 @@ has private_path => (
   default => sub { '/'.shift->reverse },
 );
 
+has number_of_args => (
+  is=>'ro',
+  init_arg=>undef,
+  isa=>'Int|Undef',
+  required=>1,
+  lazy=>1,
+  builder=>'_build_number_of_args');
+
+  sub _build_number_of_args {
+    my $self = shift;
+    if( ! exists $self->attributes->{Args} ) {
+      # When 'Args' does not exist, that means we want 'any number of args'.
+      return undef;
+    } elsif(!defined($self->attributes->{Args}[0])) {
+      # When its 'Args' that internal cue for 'unlimited'
+      return undef;
+    } 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 {
+      # New hotness named arg constraints
+      return $self->number_of_args_constraints;
+    }
+  }
+
+sub normalized_arg_number {
+  return defined($_[0]->number_of_args) ? $_[0]->number_of_args : ~0;
+}
+
 has args_constraints => (
   is=>'ro',
+  init_arg=>undef,
   traits=>['Array'],
   isa=>'ArrayRef',
   required=>1,
@@ -48,8 +81,7 @@ has args_constraints => (
   builder=>'_build_args_constraints',
   handles => {
     has_args_constraints => 'count',
-    number_of_args => 'count',
-    all_args_constraints => 'elements',
+    number_of_args_constraints => 'count',
   });
 
   sub _build_args_constraints {
@@ -65,9 +97,11 @@ has args_constraints => (
       scalar(@arg_protos) == 1 &&
       looks_like_number($arg_protos[0])
     ) {
-      return [];
+      return \@args;
     } else {
-      @args = map { Moose::Util::TypeConstraints::find_or_parse_type_constraint($_) || die "$_ is not a constraint!" } @arg_protos;
+      @args =
+        map { Moose::Util::TypeConstraints::find_or_parse_type_constraint($_) || die "$_ is not a constraint!" } 
+        @arg_protos;
     }
 
     return \@args;
@@ -86,8 +120,6 @@ use overload (
 
 );
 
-
-
 no warnings 'recursion';
 
 sub dispatch {    # Execute ourselves against a context
@@ -102,18 +134,29 @@ sub execute {
 
 sub match {
     my ( $self, $c ) = @_;
-    warn "number args = ${\$self->number_of_args} for ${\$self->name}";
-    return 1 unless $self->number_of_args;
-    #my $args = $self->attributes->{Args}[0];
-    #return 1 unless defined($args) && length($args); The "Args" slurpy case, remove for now.
-    if( scalar( @{ $c->req->args } ) == $self->number_of_args ) {
-      return 1 unless $self->has_args_constraints;
-      for my $i($#{ $c->req->args }) {
-        $self->args_constraints->[$i]->check($c->req->args->[$i]) || return 0;
+
+    # If infinite args, we always match
+    return 1 if $self->normalized_arg_number == ~0;
+
+    # 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) {
+      # 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 {
-      return 0;
+      # Otherwise, we just need to match the number of args.
+      return scalar( @{ $c->req->args } ) == $self->normalized_arg_number;
     }
 }
 
@@ -121,10 +164,7 @@ sub match_captures { 1 }
 
 sub compare {
     my ($a1, $a2) = @_;
-    my ($a1_args) = $a1->number_of_args;
-    my ($a2_args) = $a2->number_of_args;
-
-    return $a1_args <=> $a2_args;
+    return $a1->normalized_arg_number <=> $a2->normalized_arg_number;
 }
 
 sub number_of_captures {
@@ -217,7 +257,13 @@ Returns the sub name of this action.
 
 =head2 number_of_args
 
-Returns the number of args this action expects. This is 0 if the action doesn't take any arguments and undef if it will take any number of arguments.
+Returns the number of args this action expects. This is 0 if the action doesn't
+take any arguments and undef if it will take any number of arguments.
+
+=head2 normalized_arg_number
+
+For the purposes of comparison we normalize 'number_of_args' so that if it is
+undef we mean ~0 (as many args are we can think of).
 
 =head2 number_of_captures
 
@@ -245,3 +291,5 @@ This library is free software. You can redistribute it and/or modify it under
 the same terms as Perl itself.
 
 =cut
+
+