Fix is_subtype_of to handle not-yet-defined role

[gitmo/Moose.git] / lib / Moose / Meta / TypeConstraint / Role.pm

diff --git a/lib/Moose/Meta/TypeConstraint/Role.pm b/lib/Moose/Meta/TypeConstraint/Role.pm
index 5544b6d..1f5fe77 100644 (file)
--- a/lib/Moose/Meta/TypeConstraint/Role.pm
+++ b/lib/Moose/Meta/TypeConstraint/Role.pm
@@ -12,14 +12,17 @@ use base 'Moose::Meta::TypeConstraint';
 
 __PACKAGE__->meta->add_attribute('role' => (
     reader => 'role',
+    Class::MOP::_definition_context(),
 ));
 
 my $inliner = sub {
     my $self = shift;
     my $val  = shift;
 
-    return
-        "Moose::Util::does_role( $val, " . B::perlstring( $self->role ) . ')';
+    return 'Moose::Util::does_role('
+             . $val . ', '
+             . B::perlstring($self->role)
+         . ')';
 };
 
 sub new {
@@ -32,7 +35,7 @@ sub new {
 
     $args{inlined} = $inliner;
 
-    my $self = $class->_new( \%args );
+    my $self = $class->SUPER::new( \%args );
 
     $self->_create_hand_optimized_type_constraint;
     $self->compile_type_constraint();
@@ -89,7 +92,8 @@ sub is_subtype_of {
 
     if ( not ref $type_or_name_or_role ) {
         # it might be a role
-        return 1 if Class::MOP::class_of($self->role)->does_role( $type_or_name_or_role );
+        my $class = Class::MOP::class_of($self->role);
+        return 1 if defined($class) && $class->does_role( $type_or_name_or_role );
     }
 
     my $type = Moose::Util::TypeConstraints::find_type_constraint($type_or_name_or_role);
@@ -99,7 +103,8 @@ sub is_subtype_of {
     if ( $type->isa(__PACKAGE__) ) {
         # if $type_or_name_or_role isn't a role, it might be the TC name of another ::Role type
         # or it could also just be a type object in this branch
-        return Class::MOP::class_of($self->role)->does_role( $type->role );
+        my $class = Class::MOP::class_of($self->role);
+        return defined($class) && $class->does_role( $type->role );
     } else {
         # the only other thing we are a subtype of is Object
         $self->SUPER::is_subtype_of($type);