X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FUtil%2FTypeConstraints%2FOptimizedConstraints.pm;h=7546b24a79be44732dd4492dc1cb7b372147f16d;hb=3ee7b5ad664d6b70cb48914bda65cc5c9b905baa;hp=45a4a3e8b81a642361266a7fa1ac733415e88546;hpb=c7d8fe950098e91780355ed7a91f066e682eb4a3;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Util/TypeConstraints/OptimizedConstraints.pm b/lib/Moose/Util/TypeConstraints/OptimizedConstraints.pm
index 45a4a3e..7546b24 100644
--- a/lib/Moose/Util/TypeConstraints/OptimizedConstraints.pm
+++ b/lib/Moose/Util/TypeConstraints/OptimizedConstraints.pm
@@ -3,9 +3,10 @@ package Moose::Util::TypeConstraints::OptimizedConstraints;
 use strict;
 use warnings;
 
+use Class::MOP;
 use Scalar::Util 'blessed', 'looks_like_number';
 
-our $VERSION   = '0.55_02';
+our $VERSION   = '0.80';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
@@ -33,31 +34,12 @@ sub Object { blessed($_[0]) && blessed($_[0]) ne 'Regexp' }
 sub Role { blessed($_[0]) && $_[0]->can('does') }
 
 sub ClassName {
-    return 0 if ref($_[0]) || !defined($_[0]) || !length($_[0]);
-
-    # walk the symbol table tree to avoid autovififying
-    # \*{${main::}{"Foo::"}} == \*main::Foo::
-
-    my $pack = \*::;
-    foreach my $part (split('::', $_[0])) {
-        return 0 unless exists ${$$pack}{"${part}::"};
-        $pack = \*{${$$pack}{"${part}::"}};
-    }
-
-    # check for $VERSION or @ISA
-    return 1 if exists ${$$pack}{VERSION}
-             && defined *{${$$pack}{VERSION}}{SCALAR};
-    return 1 if exists ${$$pack}{ISA}
-             && defined *{${$$pack}{ISA}}{ARRAY};
-
-    # check for any method
-    foreach ( keys %{$$pack} ) {
-        next if substr($_, -2, 2) eq '::';
-        return 1 if defined *{${$$pack}{$_}}{CODE};
-    }
-
-    # fail
-    return 0;
+    return Class::MOP::is_class_loaded( $_[0] );
+}
+
+sub RoleName {
+    ClassName($_[0])
+    && (Class::MOP::class_of($_[0]) || return)->isa('Moose::Meta::Role')
 }
 
 # NOTE:
@@ -78,48 +60,50 @@ bodies for various moose types
 
 =head1 DESCRIPTION
 
-This file contains the hand optimized versions of Moose type constraints, 
+This file contains the hand optimized versions of Moose type constraints,
 no user serviceable parts inside.
 
 =head1 FUNCTIONS
 
 =over 4
 
-=item Value
+=item C<Value>
+
+=item C<Ref>
 
-=item Ref
+=item C<Str>
 
-=item Str
+=item C<Num>
 
-=item Num
+=item C<Int>
 
-=item Int
+=item C<ScalarRef>
 
-=item ScalarRef
+=item C<ArrayRef>
 
-=item ArrayRef
+=item C<HashRef>
 
-=item HashRef
+=item C<CodeRef>
 
-=item CodeRef
+=item C<RegexpRef>
 
-=item RegexpRef
+=item C<GlobRef>
 
-=item GlobRef
+=item C<FileHandle>
 
-=item FileHandle
+=item C<Object>
 
-=item Object
+=item C<Role>
 
-=item Role
+=item C<ClassName>
 
-=item ClassName
+=item C<RoleName>
 
 =back
 
 =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.
 
@@ -129,7 +113,7 @@ Yuval Kogman E<lt>nothingmuch@cpan.orgE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2007-2008 by Infinity Interactive, Inc.
+Copyright 2007-2009 by Infinity Interactive, Inc.
 
 L<http://www.iinteractive.com>