X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FTypeConstraint%2FRole.pm;h=a69e6cd168e8668b755c06dc3a394d21f1fd7934;hb=3975b592007cd8f44368f71cedc60fba86b5a1f2;hp=f9537feef8aafb4349ccb263db1c3c0505dd01c1;hpb=6f84b0383d28b94e613c217710602fcf686d6d9c;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Meta/TypeConstraint/Role.pm b/lib/Moose/Meta/TypeConstraint/Role.pm
index f9537fe..a69e6cd 100644
--- a/lib/Moose/Meta/TypeConstraint/Role.pm
+++ b/lib/Moose/Meta/TypeConstraint/Role.pm
@@ -4,24 +4,37 @@ use strict;
 use warnings;
 use metaclass;
 
+use B;
 use Scalar::Util 'blessed';
 use Moose::Util::TypeConstraints ();
 
-our $VERSION   = '0.73';
-$VERSION = eval $VERSION;
-our $AUTHORITY = 'cpan:STEVAN';
-
 use base 'Moose::Meta::TypeConstraint';
 
 __PACKAGE__->meta->add_attribute('role' => (
     reader => 'role',
 ));
 
+my $inliner = sub {
+    my $self = shift;
+    my $val  = shift;
+
+    return 'Moose::Util::does_role('
+             . $val . ', '
+             . B::perlstring($self->role)
+         . ')';
+};
+
 sub new {
     my ( $class, %args ) = @_;
 
-    $args{parent} = Moose::Util::TypeConstraints::find_type_constraint('Role');
-    my $self      = $class->_new(\%args);
+    $args{parent} = Moose::Util::TypeConstraints::find_type_constraint('Object');
+
+    my $role_name = $args{role};
+    $args{constraint} = sub { Moose::Util::does_role( $_[0], $role_name ) };
+
+    $args{inlined} = $inliner;
+
+    my $self = $class->_new( \%args );
 
     $self->_create_hand_optimized_type_constraint;
     $self->compile_type_constraint();
@@ -47,8 +60,8 @@ 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__" )
         } @{ Class::MOP::class_of($self->role)->get_roles },
     );
@@ -84,11 +97,11 @@ sub is_subtype_of {
     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);
@@ -102,14 +115,12 @@ sub create_child_type {
 
 1;
 
+# ABSTRACT: Role/TypeConstraint parallel hierarchy
+
 __END__
 
 =pod
 
-=head1 NAME
-
-Moose::Meta::TypeConstraint::Role - Role/TypeConstraint parallel hierarchy
-
 =head1 DESCRIPTION
 
 This class represents type constraints for a role.
@@ -165,21 +176,6 @@ object!
 
 =head1 BUGS
 
-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.
-
-=head1 AUTHOR
-
-Yuval Kogman E<lt>nothingmuch@cpan.orgE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright 2006-2009 by Infinity Interactive, Inc.
-
-L<http://www.iinteractive.com>
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself.
+See L<Moose/BUGS> for details on reporting bugs.
 
 =cut