X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FTypeConstraint%2FClass.pm;h=e0debd2fe1a2a04abc3c636bbbf0e3b597753344;hb=462a3e15a74078a0544eeeba2ebe1efd26ac2327;hp=5569cc53c607d28f99ab06f560cba0e84baf263e;hpb=3fef8ce8cbb223d6edec5f444a51a5af6c82ab69;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Meta/TypeConstraint/Class.pm b/lib/Moose/Meta/TypeConstraint/Class.pm
index 5569cc5..e0debd2 100644
--- a/lib/Moose/Meta/TypeConstraint/Class.pm
+++ b/lib/Moose/Meta/TypeConstraint/Class.pm
@@ -4,52 +4,99 @@ use strict;
 use warnings;
 use metaclass;
 
-use Scalar::Util qw(blessed);
+use Scalar::Util 'blessed';
+use Moose::Util::TypeConstraints ();
+
+our $VERSION   = '0.55';
+our $AUTHORITY = 'cpan:STEVAN';
 
 use base 'Moose::Meta::TypeConstraint';
 
-use Moose::Util::TypeConstraints ();
+__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->meta->new_object(%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 { Moose::Util::TypeConstraints::find_type_constraint($_) } $self->name->meta->superclasses,
+        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($_) 
+                || 
+            __PACKAGE__->new( class => $_, name => "__ANON__" )
+        } $self->class->meta->superclasses,
     );
 }
 
-sub hand_optimized_type_constraint {
-    my $self = shift;
-    my $class = $self->name;
-    sub { blessed( $_[0] ) && $_[0]->isa($class) }
-}
+sub equals {
+    my ( $self, $type_or_name ) = @_;
 
-sub has_hand_optimized_type_constraint { 1 }
+    my $other = Moose::Util::TypeConstraints::find_type_constraint($type_or_name);
+
+    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) = @_;
 
-    return $self->name eq $type_name || $self->is_subtype_of($type_name);
+    my $type = Moose::Util::TypeConstraints::find_type_constraint($type_or_name);
+
+    ($self->equals($type) || $self->is_subtype_of($type_or_name));
 }
 
 sub is_subtype_of {
-    my ($self, $type_name) = @_;
-
-    return 1 if $type_name eq 'Object';
-    return $self->name->isa( $type_name );
+    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);
+
+    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;
 
 __END__
+
 =pod
 
 =head1 NAME
@@ -60,20 +107,45 @@ Moose::Meta::TypeConstraint::Class - Class/TypeConstraint parallel hierarchy
 
 =over 4
 
-=item new
+=item B<new>
+
+=item B<class>
 
-=item hand_optimized_type_constraint
+=item B<hand_optimized_type_constraint>
 
-=item has_hand_optimized_type_constraint
+=item B<has_hand_optimized_type_constraint>
 
-=item is_a_type_of
+=item B<equals>
 
-=item is_subtype_of
+=item B<is_a_type_of>
 
-=item parents
+=item B<is_subtype_of>
+
+=item B<parents>
 
 Return all the parent types, corresponding to the parent classes.
 
+=item B<meta>
+
 =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.
+
+=head1 AUTHOR
+
+Yuval Kogman E<lt>nothingmuch@cpan.orgE<gt>
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright 2006-2008 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.
+
 =cut