X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FTypeConstraint.pm;h=05b9c5f8c02b2188de5aab824aabfb222a7ffe50;hp=258817435c37a0a4db380084b4731877639c9fc2;hb=a25ca8d637c040b2f929b1a23dd62ff63d85f5d1;hpb=3b89ea918d7ff7162f2bbeecf24df818148d5315

diff --git a/lib/Mouse/Meta/TypeConstraint.pm b/lib/Mouse/Meta/TypeConstraint.pm
index 2588174..05b9c5f 100644
--- a/lib/Mouse/Meta/TypeConstraint.pm
+++ b/lib/Mouse/Meta/TypeConstraint.pm
@@ -1,6 +1,5 @@
 package Mouse::Meta::TypeConstraint;
-use strict;
-use warnings;
+use Mouse::Util qw(:meta); # enables strict and warnings
 
 use overload
     '""'     => sub { shift->{name} },   # stringify to tc name
@@ -9,8 +8,6 @@ use overload
 use Carp qw(confess);
 use Scalar::Util qw(blessed reftype);
 
-use Mouse::Util qw(:meta);
-
 my $null_check = sub { 1 };
 
 sub new {
@@ -21,13 +18,10 @@ sub new {
     my $check = delete $args{optimized};
 
     if($args{_compiled_type_constraint}){
-        Carp::cluck("'_compiled_type_constraint' has been deprecated, use 'optimized' instead");
-        $check = $args{_compiled_type_constraint};
+        Carp::cluck("'_compiled_type_constraint' has been deprecated, use 'optimized' instead")
+            if _MOUSE_VERBOSE;
 
-        if(blessed($check)){
-            Carp::cluck("Constraint must be a CODE reference");
-            $check = $check->{compiled_type_constraint};
-        }
+        $check = $args{_compiled_type_constraint};
     }
 
     if($check){
@@ -51,6 +45,25 @@ sub new {
     my $self = bless \%args, $class;
     $self->compile_type_constraint() if !$self->{hand_optimized_type_constraint};
 
+    if($self->{type_constraints}){ # Union
+        my @coercions;
+        foreach my $type(@{$self->{type_constraints}}){
+            if($type->has_coercion){
+                push @coercions, $type;
+            }
+        }
+        if(@coercions){
+            $self->{_compiled_type_coercion} = sub {
+                my($thing) = @_;
+                foreach my $type(@coercions){
+                    my $value = $type->coerce($thing);
+                    return $value if $self->check($value);
+                }
+                return $thing;
+            };
+        }
+    }
+
     return $self;
 }
 
@@ -79,67 +92,7 @@ sub message { $_[0]->{message} }
 
 sub _compiled_type_constraint{ $_[0]->{compiled_type_constraint} }
 
-sub check {
-    my $self = shift;
-    $self->_compiled_type_constraint->(@_);
-}
-
-sub validate {
-    my ($self, $value) = @_;
-    if ($self->_compiled_type_constraint->($value)) {
-        return undef;
-    }
-    else {
-        $self->get_message($value);
-    }
-}
-
-sub assert_valid {
-    my ($self, $value) = @_;
-
-    my $error = $self->validate($value);
-    return 1 if ! defined $error;
-
-    confess($error);
-}
-
-sub get_message {
-    my ($self, $value) = @_;
-    if ( my $msg = $self->message ) {
-        local $_ = $value;
-        return $msg->($value);
-    }
-    else {
-        $value = ( defined $value ? overload::StrVal($value) : 'undef' );
-        return
-            "Validation failed for '"
-          . $self->name
-          . "' failed with value $value";
-    }
-}
-
-sub is_a_type_of{
-    my($self, $other) = @_;
-
-    # ->is_a_type_of('__ANON__') is always false
-    return 0 if !blessed($other) && $other eq '__ANON__';
-
-    (my $other_name = $other) =~ s/\s+//g;
-
-    return 1 if $self->name eq $other_name;
-
-    if(exists $self->{type_constraints}){ # union
-        foreach my $type(@{$self->{type_constraints}}){
-            return 1 if $type->name eq $other_name;
-        }
-    }
-
-    for(my $parent = $self->parent; defined $parent; $parent = $parent->parent){
-        return 1 if $parent->name eq $other_name;
-    }
-
-    return 0;
-}
+sub has_coercion{ exists $_[0]->{_compiled_type_coercion} }
 
 sub compile_type_constraint{
     my($self) = @_;
@@ -195,6 +148,98 @@ sub compile_type_constraint{
     return;
 }
 
+sub _add_type_coercions{
+    my $self = shift;
+
+    my $coercions = ($self->{_coercion_map} ||= []);
+    my %has       = map{ $_->[0] => undef } @{$coercions};
+
+    for(my $i = 0; $i < @_; $i++){
+        my $from   = $_[  $i];
+        my $action = $_[++$i];
+
+        if(exists $has{$from}){
+            confess("A coercion action already exists for '$from'");
+        }
+
+        my $type = Mouse::Util::TypeConstraints::find_or_parse_type_constraint($from)
+            or confess("Could not find the type constraint ($from) to coerce from");
+
+        push @{$coercions}, [ $type => $action ];
+    }
+
+    # compile
+    if(exists $self->{type_constraints}){ # union type
+        confess("Cannot add additional type coercions to Union types");
+    }
+    else{
+        $self->{_compiled_type_coercion} = sub {
+           my($thing) = @_;
+           foreach my $pair (@{$coercions}) {
+                #my ($constraint, $converter) = @$pair;
+                if ($pair->[0]->check($thing)) {
+                  local $_ = $thing;
+                  return $pair->[1]->($thing);
+                }
+           }
+           return $thing;
+        };
+    }
+    return;
+}
+
+sub check {
+    my $self = shift;
+    return $self->_compiled_type_constraint->(@_);
+}
+
+sub coerce {
+    my $self = shift;
+    if(!$self->{_compiled_type_coercion}){
+        confess("Cannot coerce without a type coercion ($self)");
+    }
+
+    return $_[0] if $self->_compiled_type_constraint->(@_);
+
+    return $self->{_compiled_type_coercion}->(@_);
+}
+
+sub get_message {
+    my ($self, $value) = @_;
+    if ( my $msg = $self->message ) {
+        local $_ = $value;
+        return $msg->($value);
+    }
+    else {
+        $value = ( defined $value ? overload::StrVal($value) : 'undef' );
+        return "Validation failed for '$self' failed with value $value";
+    }
+}
+
+sub is_a_type_of{
+    my($self, $other) = @_;
+
+    # ->is_a_type_of('__ANON__') is always false
+    return 0 if !blessed($other) && $other eq '__ANON__';
+
+    (my $other_name = $other) =~ s/\s+//g;
+
+    return 1 if $self->name eq $other_name;
+
+    if(exists $self->{type_constraints}){ # union
+        foreach my $type(@{$self->{type_constraints}}){
+            return 1 if $type->name eq $other_name;
+        }
+    }
+
+    for(my $parent = $self->parent; defined $parent; $parent = $parent->parent){
+        return 1 if $parent->name eq $other_name;
+    }
+
+    return 0;
+}
+
+
 1;
 __END__
 
@@ -202,6 +247,10 @@ __END__
 
 Mouse::Meta::TypeConstraint - The Mouse Type Constraint metaclass
 
+=head1 VERSION
+
+This document describes Mouse version 0.37_06
+
 =head1 DESCRIPTION
 
 For the most part, the only time you will ever encounter an