X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FTypeConstraint%2FClass.pm;h=1be980c71c70b3f92f26a42da632033a335e3ed9;hb=HEAD;hp=e46ffa87a46c41ad30f6dc45996c31f30b2ab1c2;hpb=1aab401193858f866a86af1b13b417dca841f567;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Meta/TypeConstraint/Class.pm b/lib/Moose/Meta/TypeConstraint/Class.pm
index e46ffa8..1be980c 100644
--- a/lib/Moose/Meta/TypeConstraint/Class.pm
+++ b/lib/Moose/Meta/TypeConstraint/Class.pm
@@ -4,41 +4,43 @@ use strict;
 use warnings;
 use metaclass;
 
+use B;
 use Scalar::Util 'blessed';
 use Moose::Util::TypeConstraints ();
 
-our $VERSION   = '0.64';
-$VERSION = eval $VERSION;
-our $AUTHORITY = 'cpan:STEVAN';
-
 use base 'Moose::Meta::TypeConstraint';
 
 __PACKAGE__->meta->add_attribute('class' => (
     reader => 'class',
+    Class::MOP::_definition_context(),
 ));
 
+my $inliner = sub {
+    my $self = shift;
+    my $val  = shift;
+
+    return 'Scalar::Util::blessed(' . $val . ')'
+             . ' && ' . $val . '->isa(' . B::perlstring($self->class) . ')';
+};
+
 sub new {
     my ( $class, %args ) = @_;
 
-    $args{parent} = Moose::Util::TypeConstraints::find_type_constraint('Object');
-    my $self      = $class->_new(\%args);
+    $args{parent}
+        = Moose::Util::TypeConstraints::find_type_constraint('Object');
+
+    my $class_name = $args{class};
+    $args{constraint} = sub { $_[0]->isa($class_name) };
+
+    $args{inlined} = $inliner;
+
+    my $self = $class->SUPER::new( \%args );
 
-    $self->_create_hand_optimized_type_constraint;
     $self->compile_type_constraint();
 
     return $self;
 }
 
-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 parents {
     my $self = shift;
     return (
@@ -49,10 +51,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,
     );
 }
 
@@ -61,7 +63,13 @@ sub equals {
 
     my $other = Moose::Util::TypeConstraints::find_type_constraint($type_or_name);
 
-    return unless defined $other;
+    if (!defined($other)) {
+        if (!ref($type_or_name)) {
+            return $self->class eq $type_or_name;
+        }
+        return;
+    }
+
     return unless $other->isa(__PACKAGE__);
 
     return $self->class eq $other->class;
@@ -70,24 +78,25 @@ sub equals {
 sub is_a_type_of {
     my ($self, $type_or_name) = @_;
 
-    my $type = Moose::Util::TypeConstraints::find_type_constraint($type_or_name);
-
-    ($self->equals($type) || $self->is_subtype_of($type_or_name));
+    ($self->equals($type_or_name) || $self->is_subtype_of($type_or_name));
 }
 
 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
+            my $class = $self->class;
+            return 1 if $class ne $type_or_name_or_class
+                     && $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,61 +115,87 @@ 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;
 
+# ABSTRACT: Class/TypeConstraint parallel hierarchy
+
 __END__
 
 =pod
 
-=head1 NAME
+=head1 DESCRIPTION
+
+This class represents type constraints for a class.
 
-Moose::Meta::TypeConstraint::Class - Class/TypeConstraint parallel hierarchy
+=head1 INHERITANCE
+
+C<Moose::Meta::TypeConstraint::Class> is a subclass of
+L<Moose::Meta::TypeConstraint>.
 
 =head1 METHODS
 
 =over 4
 
-=item B<new>
-
-=item B<class>
+=item B<< Moose::Meta::TypeConstraint::Class->new(%options) >>
 
-=item B<hand_optimized_type_constraint>
+This creates a new class type constraint based on the given
+C<%options>.
 
-=item B<has_hand_optimized_type_constraint>
+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.
 
-=item B<equals>
+The constructor also overrides the hand optimized type constraint with
+one it creates internally.
 
-=item B<is_a_type_of>
+=item B<< $constraint->class >>
 
-=item B<is_subtype_of>
+Returns the class name associated with the constraint.
 
-=item B<parents>
+=item B<< $constraint->parents >>
 
-Return all the parent types, corresponding to the parent classes.
+Returns all the type's parent types, corresponding to its parent
+classes.
 
-=item B<meta>
+=item B<< $constraint->is_subtype_of($type_name_or_object) >>
 
-=item B<create_child_type>
+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.
 
-=back
+Otherwise it falls back to the implementation in
+L<Moose::Meta::TypeConstraint>.
 
-=head1 BUGS
+=item B<< $constraint->create_child_type(%options) >>
 
-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.
+This returns a new L<Moose::Meta::TypeConstraint> object with the type
+as its parent.
 
-=head1 AUTHOR
+Note that it does I<not> return a
+C<Moose::Meta::TypeConstraint::Class> object!
 
-Yuval Kogman E<lt>nothingmuch@cpan.orgE<gt>
+=item B<< $constraint->get_message($value) >>
 
-=head1 COPYRIGHT AND LICENSE
+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.
 
-Copyright 2006-2008 by Infinity Interactive, Inc.
+=back
 
-L<http://www.iinteractive.com>
+=head1 BUGS
 
-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