scalar(@{$self->attributes->{Args}}) == 1 &&
looks_like_number($self->attributes->{Args}[0])
) {
- # 'Old school' numberd args (is allowed to be undef as well)
+ # 'Old school' numbered args (is allowed to be undef as well)
return $self->attributes->{Args}[0];
} else {
# New hotness named arg constraints
return defined($_[0]->number_of_args) ? $_[0]->number_of_args : ~0;
}
+has number_of_args_constraints => (
+ is=>'ro',
+ isa=>'Int|Undef',
+ init_arg=>undef,
+ required=>1,
+ lazy=>1,
+ builder=>'_build_number_of_args_constraints');
+
+ sub _build_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.
+ return undef;
+ }
+ } else {
+ $total++;
+ }
+ }
+
+ return $total;
+ }
+
has args_constraints => (
is=>'ro',
init_arg=>undef,
builder=>'_build_args_constraints',
handles => {
has_args_constraints => 'count',
- number_of_args_constraints => 'count',
+ args_constraint_count => 'count',
});
sub _build_args_constraints {
my @arg_protos = @{$self->attributes->{Args}||[]};
return [] unless scalar(@arg_protos);
+ return [] unless defined($arg_protos[0]);
+
# If there is only one arg and it looks like a number
# we assume its 'classic' and the number is the number of
# constraints.
return \@args;
} else {
@args =
- map { $self->resolve_type_constraint($_) || die "$_ is not a constraint!" }
+ map { my @tc = $self->resolve_type_constraint($_); scalar(@tc) ? @tc : die "$_ is not a constraint!" }
+ @arg_protos;
+ }
+ return \@args;
+ }
+
+has number_of_captures_constraints => (
+ is=>'ro',
+ isa=>'Int|Undef',
+ init_arg=>undef,
+ required=>1,
+ lazy=>1,
+ builder=>'_build_number_of_capture_constraints');
+
+ sub _build_number_of_capture_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;
+ } 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";
+ }
+ } else {
+ $total++;
+ }
+ }
+
+ return $total;
+ }
+
+has captures_constraints => (
+ is=>'ro',
+ init_arg=>undef,
+ traits=>['Array'],
+ isa=>'ArrayRef',
+ required=>1,
+ lazy=>1,
+ builder=>'_build_captures_constraints',
+ handles => {
+ has_captures_constraints => 'count',
+ captures_constraints_count => 'count',
+ });
+
+ sub _build_captures_constraints {
+ my $self = shift;
+ my @arg_protos = @{$self->attributes->{CaptureArgs}||[]};
+
+ return [] unless scalar(@arg_protos);
+ return [] unless defined($arg_protos[0]);
+ # 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 { my @tc = $self->resolve_type_constraint($_); scalar(@tc) ? @tc : die "$_ is not a constraint!" }
@arg_protos;
}
sub resolve_type_constraint {
my ($self, $name) = @_;
- my $tc = eval "package ${\$self->class}; $name" || undef;
- return $tc || Moose::Util::TypeConstraints::find_or_parse_type_constraint($name);
+ my @tc = eval "package ${\$self->class}; $name";
+ return @tc if $tc[0];
+ return Moose::Util::TypeConstraints::find_or_parse_type_constraint($name);
}
+has number_of_captures => (
+ is=>'ro',
+ init_arg=>undef,
+ isa=>'Int',
+ required=>1,
+ lazy=>1,
+ builder=>'_build_number_of_captures');
+
+ sub _build_number_of_captures {
+ my $self = shift;
+ if( ! exists $self->attributes->{CaptureArgs} ) {
+ # If there are no defined capture args, thats considered 0.
+ return 0;
+ } elsif(!defined($self->attributes->{CaptureArgs}[0])) {
+ # If you fail to give a defined value, that's also 0
+ return 0;
+ } elsif(
+ scalar(@{$self->attributes->{CaptureArgs}}) == 1 &&
+ looks_like_number($self->attributes->{CaptureArgs}[0])
+ ) {
+ # 'Old school' numbered captures
+ return $self->attributes->{CaptureArgs}[0];
+ } else {
+ # New hotness named arg constraints
+ return $self->number_of_captures_constraints;
+ }
+ }
+
+
use overload (
# Stringify to reverse for debug output etc.
sub match {
my ( $self, $c ) = @_;
- $c->log->debug($self->reverse);
+ return $self->match_args($c, $c->req->args);
+}
+
+sub match_args {
+ my ($self, $c, $args) = @_;
+ my @args = @{$args||[]};
# 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(0 && $self->has_args_constraints) {
+ 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') || $self->args_constraints->[0]->is_a_type_of('ClassName'))
+ $self->args_constraint_count == 1 &&
+ (
+ $self->args_constraints->[0]->is_a_type_of('Ref') ||
+ $self->args_constraints->[0]->is_a_type_of('ClassName')
+ )
) {
- return 1 if $self->args_constraints->[0]->check($c->req->args);
- if($self->args_constraints->[0]->coercion && $self->attributes->{Coerce}) {
- my $coerced = $self->args_constraints->[0]->coerce($c) || return 0;
- $c->req->args([$coerced]);
- return 1;
- }
+ return $self->args_constraints->[0]->check($args);
+ # 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;
+ # $c->req->args([$coerced]);
+ # return 1;
+ #}
} else {
- for my $i(0..$#{ $c->req->args }) {
- $self->args_constraints->[$i]->check($c->req->args->[$i]) || return 0;
+ # 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( @args ) == $self->normalized_arg_number;
+
+ for my $i(0..$#args) {
+ $self->args_constraints->[$i]->check($args[$i]) || return 0;
}
return 1;
}
} else {
# 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;
}
}
-sub match_captures { 1 }
+sub match_captures {
+ my ($self, $c, $captures) = @_;
+ my @captures = @{$captures||[]};
+
+ return 1 unless scalar(@captures); # If none, just say its ok
+
+ 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;
+ }
+ } else {
+ return 1;
+ }
+ return 1;
+}
sub compare {
my ($a1, $a2) = @_;
return $a1->normalized_arg_number <=> $a2->normalized_arg_number;
}
-sub number_of_captures {
- my ( $self ) = @_;
-
- return 0 unless exists $self->attributes->{CaptureArgs};
- 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],
+ Args => $self->normalized_arg_number,
CaptureArgs => $self->number_of_captures,
}
}
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_args($c, $args)
+
+Underlying feature that does the 'match' work, but doesn't require a context to
+work (like 'match' does.).
+
=head2 resolve_type_constraint
Trys to find a type constraint if you have on on a type constrained method.
projects / catagits/Catalyst-Runtime.git / blobdiff