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=3497e21ec59bb1678efa1816cf4965a86a7f5c9c;hp=d5f15021ca893bbf269debbe2cbb4ba19e90c437;hb=356e750347c4dd4bfe56a3b142252fbbf4c345b7;hpb=59051400675390bde280ae6dc6cf500c7bd340cf

diff --git a/lib/Catalyst/Action.pm b/lib/Catalyst/Action.pm
index d5f1502..3497e21 100644
--- a/lib/Catalyst/Action.pm
+++ b/lib/Catalyst/Action.pm
@@ -105,7 +105,7 @@ has number_of_args_constraints => (
         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
+      # We need to loop through and error on ref types.  We don't allow a ref type
       # in the middle.
       my $total = 0;
       foreach my $tc( @{$self->args_constraints}) {
@@ -190,7 +190,7 @@ has number_of_captures_constraints => (
         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
+      # We need to loop through and error on ref types.  We don't allow a ref type
       # in the middle.
       my $total = 0;
       foreach my $tc( @{$self->captures_constraints}) {
@@ -249,21 +249,24 @@ 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 = map { $_->meta } $self->class->meta->superclasses;
-    my @roles = $self->class->meta->calculate_all_roles;
 
-    # So look thru all the super and roles in order and return the
+    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 through 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.
 
@@ -275,15 +278,20 @@ sub resolve_type_constraint {
               @{$m->attributes};
           next unless $value eq $name;
           my @tc = eval "package ${\$parent->name}; $name";
-          return @tc if @tc;
-        }
+          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";
+  }
 
-    die "'$name' not a type constraint in ${\$self->private_path}";
-  };
-
-  if($tc[0]) {
+  if(scalar(@tc)) {
     return map { ref($_) ? $_ : Moose::Util::TypeConstraints::find_or_parse_type_constraint($_) } @tc;
   } else {
     return;
@@ -515,7 +523,7 @@ 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.
+Tries to find a type constraint if you have on on a type constrained method.
 
 =head2 compare