X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FTypeConstraint.pm;h=cc12df9971bb886cbf93b5aedd04b93ea2328639;hb=c87f0c7f501b1487299a59cb1dbe5297c6462537;hp=054e7fe77c36bdc6449d730152adf3894a474c52;hpb=3726f90575863aeadb6c96d67d1dbbd118df1c9b;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Meta/TypeConstraint.pm b/lib/Moose/Meta/TypeConstraint.pm
index 054e7fe..cc12df9 100644
--- a/lib/Moose/Meta/TypeConstraint.pm
+++ b/lib/Moose/Meta/TypeConstraint.pm
@@ -10,9 +10,9 @@ use overload '""'     => sub { shift->name },   # stringify to tc name
 
 use Sub::Name    'subname';
 use Carp         'confess';
-use Scalar::Util 'blessed';
+use Scalar::Util qw(blessed refaddr);
 
-our $VERSION   = '0.09';
+our $VERSION   = '0.12';
 our $AUTHORITY = 'cpan:STEVAN';
 
 __PACKAGE__->meta->add_attribute('name'       => (reader => 'name'));
@@ -21,8 +21,9 @@ __PACKAGE__->meta->add_attribute('parent'     => (
     predicate => 'has_parent',
 ));
 __PACKAGE__->meta->add_attribute('constraint' => (
-    reader => 'constraint',
-    writer => '_set_constraint',
+    reader  => 'constraint',
+    writer  => '_set_constraint',
+    default => sub { sub { 1 } }
 ));
 __PACKAGE__->meta->add_attribute('message'   => (
     accessor  => 'message',
@@ -35,9 +36,14 @@ __PACKAGE__->meta->add_attribute('coercion'   => (
 __PACKAGE__->meta->add_attribute('hand_optimized_type_constraint' => (
     init_arg  => 'optimized',
     accessor  => 'hand_optimized_type_constraint',
-    predicate => 'has_hand_optimized_type_constraint',    
+    predicate => 'has_hand_optimized_type_constraint',
 ));
 
+sub parents {
+    my $self;
+    $self->parent;
+}
+
 # private accessors
 
 __PACKAGE__->meta->add_attribute('compiled_type_constraint' => (
@@ -48,7 +54,7 @@ __PACKAGE__->meta->add_attribute('package_defined_in' => (
     accessor => '_package_defined_in'
 ));
 
-sub new { 
+sub new {
     my $class = shift;
     my $self  = $class->meta->new_object(@_);
     $self->compile_type_constraint()
@@ -57,37 +63,74 @@ sub new {
 }
 
 sub coerce   { ((shift)->coercion || confess "Cannot coerce without a type coercion")->coerce(@_) }
-sub check    { $_[0]->_compiled_type_constraint->($_[1]) }
-sub validate { 
+sub check    { $_[0]->_compiled_type_constraint->($_[1]) ? 1 : undef }
+sub validate {
     my ($self, $value) = @_;
     if ($self->_compiled_type_constraint->($value)) {
         return undef;
     }
     else {
-        if ($self->has_message) {
-            local $_ = $value;
-            return $self->message->($value);
-        }
-        else {
-            return "Validation failed for '" . $self->name . "' failed";
-        }
+        $self->get_message($value);
     }
 }
 
+sub get_message {
+    my ($self, $value) = @_;
+    $value = (defined $value ? overload::StrVal($value) : 'undef');
+    if (my $msg = $self->message) {
+        local $_ = $value;
+        return $msg->($value);
+    }
+    else {
+        return "Validation failed for '" . $self->name . "' failed with value $value";
+    }    
+}
+
 ## type predicates ...
 
+sub equals {
+    my ( $self, $type_or_name ) = @_;
+
+    my $other = Moose::Util::TypeConstraints::find_type_constraint($type_or_name);
+
+    return 1 if refaddr($self) == refaddr($other);
+
+    if ( $self->has_hand_optimized_type_constraint and $other->has_hand_optimized_type_constraint ) {
+        return 1 if $self->hand_optimized_type_constraint == $other->hand_optimized_type_constraint;
+    }
+
+    return unless $self->constraint == $other->constraint;
+
+    if ( $self->has_parent ) {
+        return unless $other->has_parent;
+        return unless $self->parent->equals( $other->parent );
+    } else {
+        return if $other->has_parent;
+    }
+
+    return 1;
+}
+
 sub is_a_type_of {
-    my ($self, $type_name) = @_;
-    ($self->name eq $type_name || $self->is_subtype_of($type_name));
+    my ($self, $type_or_name) = @_;
+
+    my $type = Moose::Util::TypeConstraints::find_type_constraint($type_or_name);
+
+    ($self->equals($type) || $self->is_subtype_of($type));
 }
 
 sub is_subtype_of {
-    my ($self, $type_name) = @_;
+    my ($self, $type_or_name) = @_;
+
+    my $type = Moose::Util::TypeConstraints::find_type_constraint($type_or_name);
+
     my $current = $self;
+
     while (my $parent = $current->parent) {
-        return 1 if $parent->name eq $type_name;
+        return 1 if $parent->equals($type);
         $current = $parent;
     }
+
     return 0;
 }
 
@@ -102,68 +145,67 @@ sub compile_type_constraint {
 
 sub _actually_compile_type_constraint {
     my $self = shift;
-    
+
     return $self->_compile_hand_optimized_type_constraint
         if $self->has_hand_optimized_type_constraint;
-    
+
     my $check = $self->constraint;
     (defined $check)
-        || confess "Could not compile type constraint '" 
-                . $self->name 
+        || confess "Could not compile type constraint '"
+                . $self->name
                 . "' because no constraint check";
-                
+
     return $self->_compile_subtype($check)
         if $self->has_parent;
-        
+
     return $self->_compile_type($check);
 }
 
 sub _compile_hand_optimized_type_constraint {
     my $self = shift;
-    
+
     my $type_constraint = $self->hand_optimized_type_constraint;
-    
-    return sub {
-        return undef unless $type_constraint->($_[0]);
-        return 1;
-    };    
+
+    confess unless ref $type_constraint;
+
+    return $type_constraint;
 }
 
 sub _compile_subtype {
     my ($self, $check) = @_;
-    
+
     # so we gather all the parents in order
     # and grab their constraints ...
     my @parents;
     foreach my $parent ($self->_collect_all_parents) {
         if ($parent->has_hand_optimized_type_constraint) {
             unshift @parents => $parent->hand_optimized_type_constraint;
-            last;                
+            last;
         }
         else {
             unshift @parents => $parent->constraint;
         }
     }
-    
+
     # then we compile them to run without
     # having to recurse as we did before
-	return subname $self->name => sub { 			
-		local $_ = $_[0];
+    return subname $self->name => sub {
+        local $_ = $_[0];
         foreach my $parent (@parents) {
             return undef unless $parent->($_[0]);
         }
-		return undef unless $check->($_[0]);
-		1;
-	};    
+        return undef unless $check->($_[0]);
+        1;
+    };
 }
 
 sub _compile_type {
     my ($self, $check) = @_;
-	return subname $self->name => sub { 
-		local $_ = $_[0];
-		return undef unless $check->($_[0]);
-		1;
-	};    
+    return subname $self->name => sub {
+        local $_ = $_[0];
+        return undef unless $check->($_[0]);
+        1;
+    };
 }
 
 ## other utils ...
@@ -181,7 +223,7 @@ sub _collect_all_parents {
 
 ## this should get deprecated actually ...
 
-sub union { die "DEPRECATED" }
+sub union { Carp::croak "DEPRECATED" }
 
 1;
 
@@ -195,13 +237,13 @@ Moose::Meta::TypeConstraint - The Moose Type Constraint metaclass
 
 =head1 DESCRIPTION
 
-For the most part, the only time you will ever encounter an 
-instance of this class is if you are doing some serious deep 
-introspection. This API should not be considered final, but 
-it is B<highly unlikely> that this will matter to a regular 
+For the most part, the only time you will ever encounter an
+instance of this class is if you are doing some serious deep
+introspection. This API should not be considered final, but
+it is B<highly unlikely> that this will matter to a regular
 Moose user.
 
-If you wish to use features at this depth, please come to the 
+If you wish to use features at this depth, please come to the
 #moose IRC channel on irc.perl.org and we can talk :)
 
 =head1 METHODS
@@ -212,12 +254,14 @@ If you wish to use features at this depth, please come to the
 
 =item B<new>
 
-=item B<is_a_type_of ($type_name)>
+=item B<equals ($type_name_or_object)>
+
+=item B<is_a_type_of ($type_name_or_object)>
 
-This checks the current type name, and if it does not match, 
+This checks the current type name, and if it does not match,
 checks if it is a subtype of it.
 
-=item B<is_subtype_of ($type_name)>
+=item B<is_subtype_of ($type_name_or_object)>
 
 =item B<compile_type_constraint>
 
@@ -227,15 +271,15 @@ This will apply the type-coercion if applicable.
 
 =item B<check ($value)>
 
-This method will return a true (C<1>) if the C<$value> passes the 
+This method will return a true (C<1>) if the C<$value> passes the
 constraint, and false (C<0>) otherwise.
 
 =item B<validate ($value)>
 
-This method is similar to C<check>, but it deals with the error 
-message. If the C<$value> passes the constraint, C<undef> will be 
-returned. If the C<$value> does B<not> pass the constraint, then 
-the C<message> will be used to construct a custom error message.  
+This method is similar to C<check>, but it deals with the error
+message. If the C<$value> passes the constraint, C<undef> will be
+returned. If the C<$value> does B<not> pass the constraint, then
+the C<message> will be used to construct a custom error message.
 
 =item B<name>
 
@@ -243,12 +287,16 @@ the C<message> will be used to construct a custom error message.
 
 =item B<has_parent>
 
+=item B<parents>
+
 =item B<constraint>
 
 =item B<has_message>
 
 =item B<message>
 
+=item B<get_message ($value)>
+
 =item B<has_coercion>
 
 =item B<coercion>
@@ -272,7 +320,7 @@ itself instead.
 
 =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.
 
@@ -282,11 +330,11 @@ Stevan Little E<lt>stevan@iinteractive.comE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006, 2007 by Infinity Interactive, Inc.
+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. 
+it under the same terms as Perl itself.
 
 =cut