X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FTypeConstraint%2FRole.pm;h=1657929f4e01d82c46faf080703c5e2785bc6cba;hb=refs%2Ftags%2F0.88;hp=d90a6ac55a81d2ffc86ef70b4ee9fbdf1b91a63e;hpb=2870fb091b5b844678277347a8c710dd58e005e6;p=gitmo%2FMoose.git diff --git a/lib/Moose/Meta/TypeConstraint/Role.pm b/lib/Moose/Meta/TypeConstraint/Role.pm index d90a6ac..1657929 100644 --- a/lib/Moose/Meta/TypeConstraint/Role.pm +++ b/lib/Moose/Meta/TypeConstraint/Role.pm @@ -7,7 +7,7 @@ use metaclass; use Scalar::Util 'blessed'; use Moose::Util::TypeConstraints (); -our $VERSION = '0.72'; +our $VERSION = '0.88'; $VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; @@ -20,7 +20,7 @@ __PACKAGE__->meta->add_attribute('role' => ( sub new { my ( $class, %args ) = @_; - $args{parent} = Moose::Util::TypeConstraints::find_type_constraint('Role'); + $args{parent} = Moose::Util::TypeConstraints::find_type_constraint('Object'); my $self = $class->_new(\%args); $self->_create_hand_optimized_type_constraint; @@ -47,10 +47,10 @@ sub parents { # if anybody thinks this problematic please discuss on IRC. # a possible fix is to add by attr indexing to the type registry to find types of a certain property # regardless of their name - Moose::Util::TypeConstraints::find_type_constraint($_) - || + Moose::Util::TypeConstraints::find_type_constraint($_) + || __PACKAGE__->new( role => $_, name => "__ANON__" ) - } @{ $self->role->meta->get_roles }, + } @{ Class::MOP::class_of($self->role)->get_roles }, ); } @@ -68,7 +68,7 @@ sub equals { sub is_a_type_of { my ($self, $type_or_name) = @_; - $type = Moose::Util::TypeConstraints::find_type_constraint($type_or_name); + my $type = Moose::Util::TypeConstraints::find_type_constraint($type_or_name); ($self->equals($type) || $self->is_subtype_of($type_or_name)); } @@ -78,17 +78,17 @@ sub is_subtype_of { if ( not ref $type_or_name_or_role ) { # it might be a role - return 1 if $self->role->meta->does_role( $type_or_name_or_role ); + return 1 if Class::MOP::class_of($self->role)->does_role( $type_or_name_or_role ); } my $type = Moose::Util::TypeConstraints::find_type_constraint($type_or_name_or_role); return unless defined $type; - + 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 $self->role->meta->does_role( $type->role ); + return Class::MOP::class_of($self->role)->does_role( $type->role ); } else { # the only other thing we are a subtype of is Object $self->SUPER::is_subtype_of($type); @@ -165,7 +165,7 @@ object! =head1 BUGS -All complex software has bugs lurking in it, and this module is no +All complex software has bugs lurking in it, and this module is no exception. If you find a bug please either email me, or add the bug to cpan-RT.