X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FTypeConstraint%2FClass.pm;h=39b45e078a1cc7722050426a51a97154b2d92642;hb=b3853db9543d3f4da31a681df2300fc2de3c3077;hp=7df0e78d2a61b123cea30d0d4e7ea1ce2d702e5b;hpb=a4550ed1c56166a6a7ec26ae594f73140c3d77e3;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Meta/TypeConstraint/Class.pm b/lib/Moose/Meta/TypeConstraint/Class.pm
index 7df0e78..39b45e0 100644
--- a/lib/Moose/Meta/TypeConstraint/Class.pm
+++ b/lib/Moose/Meta/TypeConstraint/Class.pm
@@ -7,56 +7,94 @@ use metaclass;
 use Scalar::Util 'blessed';
 use Moose::Util::TypeConstraints ();
 
-our $VERSION   = '0.01';
+our $VERSION   = '0.59';
+$VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
 use base 'Moose::Meta::TypeConstraint';
 
+__PACKAGE__->meta->add_attribute('class' => (
+    reader => 'class',
+));
+
 sub new {
-    my $class = shift;
-    my $self  = $class->meta->new_object(@_, 
-        parent => Moose::Util::TypeConstraints::find_type_constraint('Object') 
-    );
-    $self->compile_type_constraint()
-        unless $self->_has_compiled_type_constraint;
+    my ( $class, %args ) = @_;
+
+    $args{parent} = Moose::Util::TypeConstraints::find_type_constraint('Object');
+    my $self      = $class->_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 (
         $self->parent,
-        map { 
-            # NOTE:
-            # Hmm, should this be find_or_create_type_constraint?
-            # What do you think nothingmuch??
-            # - SL
+        map {
+            # FIXME find_type_constraint might find a TC named after the class but that isn't really it
+            # I did this anyway since it's a convention that preceded TypeConstraint::Class, and it should DWIM
+            # 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($_) 
-        } $self->name->meta->superclasses,
+                || 
+            __PACKAGE__->new( class => $_, name => "__ANON__" )
+        } $self->class->meta->superclasses,
     );
 }
 
-sub hand_optimized_type_constraint {
-    my $self  = shift;
-    my $class = $self->name;
-    sub {
-      Moose::Util::TypeConstraints::OptimizedConstraints::ObjectOfType($_[0], $class)
-    }
-}
+sub equals {
+    my ( $self, $type_or_name ) = @_;
+
+    my $other = Moose::Util::TypeConstraints::find_type_constraint($type_or_name);
 
-sub has_hand_optimized_type_constraint { 1 }
+    return unless defined $other;
+    return unless $other->isa(__PACKAGE__);
+
+    return $self->class eq $other->class;
+}
 
 sub is_a_type_of {
-    my ($self, $type_name) = @_;
+    my ($self, $type_or_name) = @_;
+
+    my $type = Moose::Util::TypeConstraints::find_type_constraint($type_or_name);
 
-    return $self->name eq $type_name || $self->is_subtype_of($type_name);
+    ($self->equals($type) || $self->is_subtype_of($type_or_name));
 }
 
 sub is_subtype_of {
-    my ($self, $type_name) = @_;
+    my ($self, $type_or_name_or_class ) = @_;
 
-    return 1 if $type_name eq 'Object';
-    return $self->name->isa( $type_name );
+    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 $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 );
+    } else {
+        # the only other thing we are a subtype of is Object
+        $self->SUPER::is_subtype_of($type);
+    }
 }
 
 1;
@@ -75,10 +113,14 @@ Moose::Meta::TypeConstraint::Class - Class/TypeConstraint parallel hierarchy
 
 =item B<new>
 
+=item B<class>
+
 =item B<hand_optimized_type_constraint>
 
 =item B<has_hand_optimized_type_constraint>
 
+=item B<equals>
+
 =item B<is_a_type_of>
 
 =item B<is_subtype_of>