X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FTypeConstraint%2FClass.pm;h=f4f95592e2da3d7e14c5f11f6e047d8bc7f6fbc6;hb=ae7820b1b884344a7ee90d94b484ca46459eb7b1;hp=e544e9c71f45c1811eb6e686ee75f78c63ff3013;hpb=a7be0f8593e4e7b7f570f49027ee4f8f25d4d8bc;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Meta/TypeConstraint/Class.pm b/lib/Moose/Meta/TypeConstraint/Class.pm
index e544e9c..f4f9559 100644
--- a/lib/Moose/Meta/TypeConstraint/Class.pm
+++ b/lib/Moose/Meta/TypeConstraint/Class.pm
@@ -7,7 +7,7 @@ use metaclass;
 use Scalar::Util 'blessed';
 use Moose::Util::TypeConstraints ();
 
-our $VERSION   = '0.69';
+our $VERSION   = '1.06';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
@@ -33,8 +33,8 @@ sub _create_hand_optimized_type_constraint {
     my $self = shift;
     my $class = $self->class;
     $self->hand_optimized_type_constraint(
-        sub { 
-            blessed( $_[0] ) && $_[0]->isa($class) 
+        sub {
+            blessed( $_[0] ) && blessed( $_[0] ) ne 'Regexp' && $_[0]->isa($class)
         }
     );
 }
@@ -49,10 +49,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( class => $_, name => "__ANON__" )
-        } $self->class->meta->superclasses,
+        } Class::MOP::class_of($self->class)->superclasses,
     );
 }
 
@@ -78,16 +78,17 @@ sub is_a_type_of {
 sub is_subtype_of {
     my ($self, $type_or_name_or_class ) = @_;
 
-    if ( not ref $type_or_name_or_class ) {
-        # it might be a class
-        return 1 if $self->class->isa( $type_or_name_or_class );
-    }
-
     my $type = Moose::Util::TypeConstraints::find_type_constraint($type_or_name_or_class);
-    
-    return unless defined $type;
 
-    if ( $type->isa(__PACKAGE__) ) {
+    if ( not defined $type ) {
+        if ( not ref $type_or_name_or_class ) {
+            # it might be a class
+            return 1 if $self->class->isa( $type_or_name_or_class );
+        }
+        return;
+    }
+
+    if ( $type->isa(__PACKAGE__) && $type->class ne $self->class) {
         # if $type_or_name_or_class isn't a class, it might be the TC name of another ::Class type
         # or it could also just be a type object in this branch
         return $self->class->isa( $type->class );
@@ -106,6 +107,18 @@ sub create_child_type {
     return Moose::Meta::TypeConstraint->new(@args, parent => $self);
 }
 
+sub get_message {
+    my $self = shift;
+    my ($value) = @_;
+
+    if ($self->has_message) {
+        return $self->SUPER::get_message(@_);
+    }
+
+    $value = (defined $value ? overload::StrVal($value) : 'undef');
+    return "Validation failed for '" . $self->name . "' with value $value (not isa " . $self->class . ")";
+}
+
 1;
 
 __END__
@@ -116,39 +129,68 @@ __END__
 
 Moose::Meta::TypeConstraint::Class - Class/TypeConstraint parallel hierarchy
 
+=head1 DESCRIPTION
+
+This class represents type constraints for a class.
+
+=head1 INHERITANCE
+
+C<Moose::Meta::TypeConstraint::Class> is a subclass of
+L<Moose::Meta::TypeConstraint>.
+
 =head1 METHODS
 
 =over 4
 
-=item B<new>
+=item B<< Moose::Meta::TypeConstraint::Class->new(%options) >>
+
+This creates a new class type constraint based on the given
+C<%options>.
+
+It takes the same options as its parent, with two exceptions. First,
+it requires an additional option, C<class>, which is name of the
+constraint's class.  Second, it automatically sets the parent to the
+C<Object> type.
+
+The constructor also overrides the hand optimized type constraint with
+one it creates internally.
+
+=item B<< $constraint->class >>
+
+Returns the class name associated with the constraint.
 
-=item B<class>
+=item B<< $constraint->parents >>
 
-=item B<hand_optimized_type_constraint>
+Returns all the type's parent types, corresponding to its parent
+classes.
 
-=item B<has_hand_optimized_type_constraint>
+=item B<< $constraint->is_subtype_of($type_name_or_object) >>
 
-=item B<equals>
+If the given type is also a class type, then this checks that the
+type's class is a subclass of the other type's class.
 
-=item B<is_a_type_of>
+Otherwise it falls back to the implementation in
+L<Moose::Meta::TypeConstraint>.
 
-=item B<is_subtype_of>
+=item B<< $constraint->create_child_type(%options) >>
 
-=item B<parents>
+This returns a new L<Moose::Meta::TypeConstraint> object with the type
+as its parent.
 
-Return all the parent types, corresponding to the parent classes.
+Note that it does I<not> return a
+C<Moose::Meta::TypeConstraint::Class> object!
 
-=item B<meta>
+=item B<< $constraint->get_message($value) >>
 
-=item B<create_child_type>
+This is the same as L<Moose::Meta::TypeConstraint/get_message> except
+that it explicitly says C<isa> was checked. This is to help users deal
+with accidentally autovivified type constraints.
 
 =back
 
 =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.
+See L<Moose/BUGS> for details on reporting bugs.
 
 =head1 AUTHOR
 
@@ -156,7 +198,7 @@ Yuval Kogman E<lt>nothingmuch@cpan.orgE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006-2009 by Infinity Interactive, Inc.
+Copyright 2006-2010 by Infinity Interactive, Inc.
 
 L<http://www.iinteractive.com>