X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FAction.pm;fp=lib%2FCatalyst%2FAction.pm;h=fef451dc9eaf3952c3e88f82f317105cc0a3428a;hp=257feb5870eb524bbed298fcf6f45bc537584dd1;hb=d2995a765f120b78a134a6e8dfb14b0f7fde8644;hpb=a521afccf18e9a7ad0f19cbcdcf199ac033280d6

diff --git a/lib/Catalyst/Action.pm b/lib/Catalyst/Action.pm
index 257feb5..fef451d 100644
--- a/lib/Catalyst/Action.pm
+++ b/lib/Catalyst/Action.pm
@@ -249,50 +249,49 @@ sub resolve_type_constraint {
     return $name;
   }
 
+  # This is broken for when there is more than one constraint
   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}";
+    return defined $tc ? $tc : die "'$name' not a full namespace type constraint in ${\$self->private_path}";
   }
+  
+  my @tc = grep { defined $_ } (eval("package ${\$self->class}; $name"));
 
-  my @tc = eval "package ${\$self->class}; $name" or do {
+  unless(scalar @tc) {
     # 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};
-        }
+          if(scalar(@tc)) {
+            return map { ref($_) ? $_ : Moose::Util::TypeConstraints::find_or_parse_type_constraint($_) } @tc;
+          } else {
+            return;
+          }
+        } 
       }
     }
     
     my $classes = join(',', $self->class, @roles, @supers);
     die "'$name' not a type constraint in '${\$self->private_path}', Looked in: $classes";
-  };
+  }
 
-  if($tc[0]) {
+  if(scalar(@tc)) {
     return map { ref($_) ? $_ : Moose::Util::TypeConstraints::find_or_parse_type_constraint($_) } @tc;
   } else {
     return;