Inherited attributes may now be extended without restriction

[gitmo/Moose.git] / lib / Moose / Meta / TypeConstraint.pm

diff --git a/lib/Moose/Meta/TypeConstraint.pm b/lib/Moose/Meta/TypeConstraint.pm
index b4aa0fa..53ba3a7 100644 (file)
--- a/lib/Moose/Meta/TypeConstraint.pm
+++ b/lib/Moose/Meta/TypeConstraint.pm
@@ -12,7 +12,7 @@ use Sub::Name    'subname';
 use Carp         'confess';
 use Scalar::Util 'blessed';
 
-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',
@@ -57,23 +58,29 @@ sub new {
 }
 
 sub coerce   { ((shift)->coercion || confess "Cannot coerce without a type coercion")->coerce(@_) }
-sub check    { $_[0]->_compiled_type_constraint->($_[1]) }
+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 is_a_type_of {
@@ -123,11 +130,9 @@ sub _compile_hand_optimized_type_constraint {
 
     my $type_constraint = $self->hand_optimized_type_constraint;
 
-    return sub {
-        confess unless ref $type_constraint;
-        return undef unless $type_constraint->($_[0]);
-        return 1;
-    };
+    confess unless ref $type_constraint;
+
+    return $type_constraint;
 }
 
 sub _compile_subtype {
@@ -148,23 +153,23 @@ sub _compile_subtype {
 
     # 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 ...
@@ -250,6 +255,8 @@ the C<message> will be used to construct a custom error message.
 
 =item B<message>
 
+=item B<get_message ($value)>
+
 =item B<has_coercion>
 
 =item B<coercion>
@@ -283,7 +290,7 @@ 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>