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=257feb5870eb524bbed298fcf6f45bc537584dd1;hp=8c86df05df0c2586dea499936b990927cddc443c;hb=a521afccf18e9a7ad0f19cbcdcf199ac033280d6;hpb=2a1c08c07e5a7fe716d5bfe897e5b27fc179300a diff --git a/lib/Catalyst/Action.pm b/lib/Catalyst/Action.pm index 8c86df0..257feb5 100644 --- a/lib/Catalyst/Action.pm +++ b/lib/Catalyst/Action.pm @@ -20,7 +20,7 @@ L subclasses. =cut use Moose; -use Scalar::Util 'looks_like_number'; +use Scalar::Util 'looks_like_number', 'blessed'; use Moose::Util::TypeConstraints (); with 'MooseX::Emulate::Class::Accessor::Fast'; use namespace::clean -except => 'meta'; @@ -83,23 +83,40 @@ has number_of_args_constraints => ( my $self = shift; return unless $self->has_args_constraints; - my $total = 0; - foreach my $tc( @{$self->args_constraints}) { - if($tc->is_a_type_of('Ref')) { - if($tc->can('parameters') && $tc->has_parameters) { - my $total_params = scalar(@{ $tc->parameters||[] }); - $total = $total + $total_params; - } else { - # Its a Reftype but we don't know the number of params it - # actually validates. + # If there is one constraint and its a ref, we need to decide + # if this number 'unknown' number or if the ref allows us to + # determine a length. + + if(scalar @{$self->args_constraints} == 1) { + my $tc = $self->args_constraints->[0]; + if( + $tc->can('is_strictly_a_type_of') && + $tc->is_strictly_a_type_of('Tuple')) + { + my @parameters = @{ $tc->parameters||[]}; + if( defined($parameters[-1]) and exists($parameters[-1]->{slurpy})) { return undef; + } else { + return my $total_params = scalar(@parameters); } + } elsif($tc->is_a_type_of('Ref')) { + return undef; } else { - $total++; + return 1; # Its a normal 1 arg type constraint. + } + } else { + # We need to loop thru and error on ref types. We don't allow a ref type + # in the middle. + my $total = 0; + foreach my $tc( @{$self->args_constraints}) { + if($tc->is_a_type_of('Ref')) { + die "$tc is a Ref type constraint. You cannot mix Ref and non Ref type constraints in Args for action ${\$self->reverse}"; + } else { + ++$total; + } } + return $total; } - - return $total; } has args_constraints => ( @@ -151,24 +168,40 @@ has number_of_captures_constraints => ( my $self = shift; return unless $self->has_captures_constraints; - my $total = 0; - foreach my $tc( @{$self->captures_constraints}) { - if($tc->is_a_type_of('Ref')) { - if($tc->can('parameters') && $tc->has_parameters) { - my $total_params = scalar(@{ $tc->parameters||[] }); - $total = $total + $total_params; + # If there is one constraint and its a ref, we need to decide + # if this number 'unknown' number or if the ref allows us to + # determine a length. + + if(scalar @{$self->captures_constraints} == 1) { + my $tc = $self->captures_constraints->[0]; + if( + $tc->can('is_strictly_a_type_of') && + $tc->is_strictly_a_type_of('Tuple')) + { + my @parameters = @{ $tc->parameters||[]}; + if( defined($parameters[-1]) and exists($parameters[-1]->{slurpy})) { + return undef; } else { - # Its a Reftype but we don't know the number of params it - # actually validates. This is not currently permitted in - # a capture... - die "You cannot use CaptureArgs($tc) in ${\$self->reverse} because we cannot determined the number of its parameters"; + return my $total_params = scalar(@parameters); } + } elsif($tc->is_a_type_of('Ref')) { + die "You cannot use CaptureArgs($tc) in ${\$self->reverse} because we cannot determined the number of its parameters"; } else { - $total++; + return 1; # Its a normal 1 arg type constraint. } + } else { + # We need to loop thru and error on ref types. We don't allow a ref type + # in the middle. + my $total = 0; + foreach my $tc( @{$self->captures_constraints}) { + if($tc->is_a_type_of('Ref')) { + die "$tc is a Ref type constraint. You cannot mix Ref and non Ref type constraints in CaptureArgs for action ${\$self->reverse}"; + } else { + ++$total; + } + } + return $total; } - - return $total; } has captures_constraints => ( @@ -210,9 +243,60 @@ has captures_constraints => ( sub resolve_type_constraint { my ($self, $name) = @_; - my @tc = eval "package ${\$self->class}; $name"; - return @tc if $tc[0]; - return Moose::Util::TypeConstraints::find_or_parse_type_constraint($name); + + if(defined($name) && blessed($name) && $name->can('check')) { + # Its already a TC, good to go. + return $name; + } + + if($name=~m/::/) { + eval "use Type::Registry; 1" || die "Can't resolve type constraint $name without installing Type::Tiny"; + my $tc = Type::Registry->new->foreign_lookup($name); + return defined $tc ? $tc : die "'$name' not a type constraint in ${\$self->private_path}"; + } + + my @tc = eval "package ${\$self->class}; $name" or do { + # ok... so its not defined in the package. we need to look at all the roles + # and superclasses, look for attributes and figure it out. + # Superclasses take precedence; + # + my @supers = $self->class->can('meta') ? map { $_->meta } $self->class->meta->superclasses : (); + my @roles = $self->class->can('meta') ? $self->class->meta->calculate_all_roles : (); + + # So look thru all the super and roles in order and return the + # first type constraint found. We should probably find all matching + # type constraints and try to do some sort of resolution. + + warn "--> Hunting for TC $name in controller hierarchy\n" if $ENV{CATALYST_CONSTRAINTS_DEBUG}; + + foreach my $parent (@roles, @supers) { + warn " Looking for TC $name in ${\$parent->name}\n" if $ENV{CATALYST_CONSTRAINTS_DEBUG}; + if(my $m = $parent->get_method($self->name)) { + if($m->can('attributes')) { + warn " method $m has attributes\n" if $ENV{CATALYST_CONSTRAINTS_DEBUG}; + my ($key, $value) = map { $_ =~ /^(.*?)(?:\(\s*(.+?)\s*\))?$/ } + grep { $_=~/^Args\(/ or $_=~/^CaptureArgs\(/ } + @{$m->attributes}; + warn " about to evaluate any found attrs\n" if $ENV{CATALYST_CONSTRAINTS_DEBUG}; + next unless $value eq $name; + warn " found attr info $key and $value\n" if $ENV{CATALYST_CONSTRAINTS_DEBUG}; + my @tc = eval "package ${\$parent->name}; $name"; + return @tc if scalar(@tc); + } else { + warn " method $m does not have method attributes\n" if $ENV{CATALYST_CONSTRAINTS_DEBUG}; + } + } + } + + my $classes = join(',', $self->class, @roles, @supers); + die "'$name' not a type constraint in '${\$self->private_path}', Looked in: $classes"; + }; + + if($tc[0]) { + return map { ref($_) ? $_ : Moose::Util::TypeConstraints::find_or_parse_type_constraint($_) } @tc; + } else { + return; + } } has number_of_captures => ( @@ -271,9 +355,12 @@ sub execute { sub match { my ( $self, $c ) = @_; + return $self->match_args($c, $c->req->args); +} - # If infinite args, we always match - return 1 if $self->normalized_arg_number == ~0; +sub match_args { + my ($self, $c, $args) = @_; + my @args = @{$args||[]}; # There there are arg constraints, we must see to it that the constraints # check positive for each arg in the list. @@ -287,7 +374,21 @@ sub match { $self->args_constraints->[0]->is_a_type_of('ClassName') ) ) { - return $self->args_constraints->[0]->check($c->req->args); + # Ok, the the type constraint is a ref type, which is allowed to have + # any number of args. We need to check the arg length, if one is defined. + # If we had a ref type constraint that allowed us to determine the allowed + # number of args, we need to match that number. Otherwise if there was an + # undetermined number (~0) then we allow all the args. This is more of an + # Optimization since Tuple[Int, Int] would fail on 3,4,5 anyway, but this + # way we can avoid calling the constraint when the arg length is incorrect. + if( + $self->normalized_arg_number == ~0 || + scalar( @args ) == $self->normalized_arg_number + ) { + return $self->args_constraints->[0]->check($args); + } else { + return 0; + } # Removing coercion stuff for the first go #if($self->args_constraints->[0]->coercion && $self->attributes->{Coerce}) { # my $coerced = $self->args_constraints->[0]->coerce($c) || return 0; @@ -297,16 +398,19 @@ sub match { } else { # Because of the way chaining works, we can expect args that are totally not # what you'd expect length wise. When they don't match length, thats a fail - return 0 unless scalar( @{ $c->req->args } ) == $self->normalized_arg_number; + return 0 unless scalar( @args ) == $self->normalized_arg_number; - for my $i(0..$#{ $c->req->args }) { - $self->args_constraints->[$i]->check($c->req->args->[$i]) || return 0; + for my $i(0..$#args) { + $self->args_constraints->[$i]->check($args[$i]) || return 0; } return 1; } } else { + # If infinite args with no constraints, we always match + return 1 if $self->normalized_arg_number == ~0; + # Otherwise, we just need to match the number of args. - return scalar( @{ $c->req->args } ) == $self->normalized_arg_number; + return scalar( @args ) == $self->normalized_arg_number; } } @@ -315,28 +419,37 @@ sub match_captures { my @captures = @{$captures||[]}; return 1 unless scalar(@captures); # If none, just say its ok + return $self->has_captures_constraints ? + $self->match_captures_constraints($c, $captures) : 1; - if($self->has_captures_constraints) { - if( - $self->captures_constraints_count == 1 && - ( - $self->captures_constraints->[0]->is_a_type_of('Ref') || - $self->captures_constraints->[0]->is_a_type_of('ClassName') - ) - ) { - return $self->captures_constraints->[0]->check($captures); - } else { - for my $i(0..$#captures) { - $self->captures_constraints->[$i]->check($captures[$i]) || return 0; - } - return 1; - } + return 1; +} + +sub match_captures_constraints { + my ($self, $c, $captures) = @_; + my @captures = @{$captures||[]}; + + # Match is positive if you don't have any. + return 1 unless $self->has_captures_constraints; + + if( + $self->captures_constraints_count == 1 && + ( + $self->captures_constraints->[0]->is_a_type_of('Ref') || + $self->captures_constraints->[0]->is_a_type_of('ClassName') + ) + ) { + return $self->captures_constraints->[0]->check($captures); } else { + for my $i(0..$#captures) { + $self->captures_constraints->[$i]->check($captures[$i]) || return 0; + } return 1; - } - return 1; + } + } + sub compare { my ($a1, $a2) = @_; return $a1->normalized_arg_number <=> $a2->normalized_arg_number; @@ -400,6 +513,15 @@ of the captures for this action. Returning true from this method causes the chain match to continue, returning makes the chain not match (and alternate, less preferred chains will be attempted). +=head2 match_captures_constraints ($c, \@captures); + +Does the \@captures given match any constraints (if any constraints exist). Returns +true if you ask but there are no constraints. + +=head2 match_args($c, $args) + +Does the Args match or not? + =head2 resolve_type_constraint Trys to find a type constraint if you have on on a type constrained method.