X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FAction.pm;h=102572ba4eeb2758f5690c3e7776eedbe880a066;hp=ebedf591ca9f5aff2ed2e9624b38969dc6f55a1f;hb=81436df99bdb4a0afd7367fb946c5481b483919d;hpb=60034b8cdbd27d8e77dab3d46cfe3e11455c2fd7

diff --git a/lib/Catalyst/Action.pm b/lib/Catalyst/Action.pm
index ebedf59..102572b 100644
--- a/lib/Catalyst/Action.pm
+++ b/lib/Catalyst/Action.pm
@@ -21,6 +21,7 @@ L<Catalyst::Controller> subclasses.
 
 use Moose;
 use Scalar::Util 'looks_like_number';
+use Moose::Util::TypeConstraints ();
 with 'MooseX::Emulate::Class::Accessor::Fast';
 use namespace::clean -except => 'meta';
 
@@ -38,6 +39,63 @@ 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;
+    return 0 unless exists $self->attributes->{Args};
+    if(!defined($self->attributes->{Args}[0])) {
+      # When its 'Args' that internal cue for 'unlimited'
+      return undef;
+    } elsif(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;
+    }
+  }
+
+has args_constraints => (
+  is=>'ro',
+  init_arg=>undef,
+  traits=>['Array'],
+  isa=>'ArrayRef',
+  required=>1,
+  lazy=>1,
+  builder=>'_build_args_constraints',
+  handles => {
+    has_args_constraints => 'count',
+    number_of_args_constraints => 'count',
+  });
+
+  sub _build_args_constraints {
+    my $self = shift;
+    my @arg_protos = @{$self->attributes->{Args}||[]};
+
+    return [] unless scalar(@arg_protos);
+    # If there is only one arg and it looks like a number
+    # we assume its 'classic' and the number is the number of
+    # constraints.
+    my @args = ();
+    if(
+      scalar(@arg_protos) == 1 &&
+      looks_like_number($arg_protos[0])
+    ) {
+      return \@args;
+    } else {
+      @args = map { Moose::Util::TypeConstraints::find_or_parse_type_constraint($_) || die "$_ is not a constraint!" } @arg_protos;
+    }
+
+    return \@args;
+  }
+
 use overload (
 
     # Stringify to reverse for debug output etc.
@@ -51,8 +109,6 @@ use overload (
 
 );
 
-
-
 no warnings 'recursion';
 
 sub dispatch {    # Execute ourselves against a context
@@ -73,7 +129,15 @@ sub match {
     return 1 unless exists $self->attributes->{Args};
     my $args = $self->attributes->{Args}[0];
     return 1 unless defined($args) && length($args);
-    return scalar( @{ $c->req->args } ) == $args;
+
+    if($self->has_args_constraints) {
+      for my $i($#{ $c->req->args }) {
+        $self->args_constraints->[$i]->check($c->req->args->[$i]) || return 0;
+      }
+      return 1;
+    } else {
+      return scalar( @{ $c->req->args } ) == $args;
+    }
 }
 
 sub match_captures { 1 }
@@ -81,21 +145,22 @@ sub match_captures { 1 }
 sub compare {
     my ($a1, $a2) = @_;
 
-    my ($a1_args) = @{ $a1->attributes->{Args} || [] };
-    my ($a2_args) = @{ $a2->attributes->{Args} || [] };
+    # Wen there is no declared Args for Local and Path (and Default??) we
+    # say that means any number of args...  If Args exists however we use
+    # the number of args as determined by inspecting the value of it.
 
-    $_ = looks_like_number($_) ? $_ : ~0
+    my $a1_args = exists($a1->attributes->{Args}) ? $a1->number_of_args : ~0;
+    my $a2_args = exists($a2->attributes->{Args}) ? $a2->number_of_args : ~0;
+
+    # If we did have an Args but it was undefined value (:Args() or :Args), that
+    # is the cue for 'as many args as you like also...
+    # 
+    $_ = defined($_) ? $_ : ~0
         for $a1_args, $a2_args;
 
     return $a1_args <=> $a2_args;
 }
 
-sub number_of_args {
-    my ( $self ) = @_;
-    return 0 unless exists $self->attributes->{Args};
-    return $self->attributes->{Args}[0];
-}
-
 sub number_of_captures {
     my ( $self ) = @_;
 
@@ -103,6 +168,18 @@ sub number_of_captures {
     return $self->attributes->{CaptureArgs}[0] || 0;
 }
 
+sub scheme {
+  return exists $_[0]->attributes->{Scheme} ? $_[0]->attributes->{Scheme}[0] : undef;
+}
+
+sub list_extra_info {
+  my $self = shift;
+  return {
+    Args => $self->attributes->{Args}[0],
+    CaptureArgs => $self->number_of_captures,
+  }
+} 
+
 __PACKAGE__->meta->make_immutable;
 
 1;
@@ -119,7 +196,7 @@ and so on. This determines how the action is dispatched to.
 =head2 class
 
 Returns the name of the component where this action is defined.
-Derived by calling the L<Catalyst::Component/catalyst_component_name|catalyst_component_name>
+Derived by calling the L<catalyst_component_name|Catalyst::Component/catalyst_component_name>
 method on each component.
 
 =head2 code
@@ -180,6 +257,14 @@ Returns the number of args this action expects. This is 0 if the action doesn't
 
 Returns the number of captures this action expects for L<Chained|Catalyst::DispatchType::Chained> actions.
 
+=head2 list_extra_info
+
+A HashRef of key-values that an action can provide to a debugging screen
+
+=head2 scheme
+
+Any defined scheme for the action
+
 =head2 meta
 
 Provided by Moose.
@@ -194,3 +279,5 @@ This library is free software. You can redistribute it and/or modify it under
 the same terms as Perl itself.
 
 =cut
+
+