getting-there

[gitmo/Moose.git] / lib / Moose / Util / TypeConstraints.pm

diff --git a/lib/Moose/Util/TypeConstraints.pm b/lib/Moose/Util/TypeConstraints.pm
index a4a02f4..eb5524d 100644 (file)
--- a/lib/Moose/Util/TypeConstraints.pm
+++ b/lib/Moose/Util/TypeConstraints.pm
@@ -10,12 +10,14 @@ use Scalar::Util 'blessed';
 
 our $VERSION = '0.02';
 
+use Moose::Meta::TypeConstraint;
+
 sub import {
        shift;
        my $pkg = shift || caller();
        return if $pkg eq ':no_export';
        no strict 'refs';
-       foreach my $export (qw(type subtype as where to coerce)) {
+       foreach my $export (qw(type subtype as where coerce from via)) {
                *{"${pkg}::${export}"} = \&{"${export}"};
        }       
 }
@@ -29,7 +31,12 @@ sub import {
 
     sub register_type_constraint { 
         my ($type_name, $type_constraint) = @_;
-        $TYPES{$type_name} = $type_constraint;
+        (not exists $TYPES{$type_name})
+            || confess "The type constraint '$type_name' has already been registered";
+        $TYPES{$type_name} = Moose::Meta::TypeConstraint->new(
+            name            => $type_name,
+            constraint_code => $type_constraint
+        );
     }
     
     sub dump_type_constraints {
@@ -42,21 +49,21 @@ sub import {
         my $pkg = caller();
            no strict 'refs';
        foreach my $constraint (keys %TYPES) {
-               *{"${pkg}::${constraint}"} = $TYPES{$constraint};
+               *{"${pkg}::${constraint}"} = $TYPES{$constraint}->constraint_code;
        }        
     }
-}
 
-{
-    my %COERCIONS;
     sub find_type_coercion { 
         my $type_name = shift;
-        $COERCIONS{$type_name}; 
+        $TYPES{$type_name}->coercion_code; 
     }
 
     sub register_type_coercion { 
         my ($type_name, $type_coercion) = @_;
-        $COERCIONS{$type_name} = $type_coercion;
+        my $type = $TYPES{$type_name};
+        (!$type->has_coercion)
+            || confess "The type coercion for '$type_name' has already been registered";        
+        $type->set_coercion_code($type_coercion);
     }
 }
 
@@ -75,7 +82,7 @@ sub subtype ($$;$) {
        my ($name, $parent, $check) = @_;
        if (defined $check) {
            my $full_name = caller() . "::${name}";
-               $parent = find_type_constraint($parent) 
+               $parent = find_type_constraint($parent)->constraint_code 
                    unless $parent && ref($parent) eq 'CODE';
                register_type_constraint($name => subname $full_name => sub {                   
                        local $_ = $_[0];
@@ -85,7 +92,7 @@ sub subtype ($$;$) {
        }
        else {
                ($parent, $check) = ($name, $parent);
-               $parent = find_type_constraint($parent) 
+               $parent = find_type_constraint($parent)->constraint_code 
                    unless $parent && ref($parent) eq 'CODE';           
                return subname '__anon_subtype__' => sub {                      
                        local $_ = $_[0];
@@ -102,7 +109,7 @@ sub coerce ($@) {
     my @coercions;
     while (@coercion_map) {
         my ($constraint_name, $action) = splice(@coercion_map, 0, 2);
-        my $constraint = find_type_constraint($constraint_name);
+        my $constraint = find_type_constraint($constraint_name)->constraint_code;
         (defined $constraint)
             || confess "Could not find the type constraint ($constraint_name)";
         push @coercions => [  $constraint, $action ];
@@ -112,6 +119,7 @@ sub coerce ($@) {
         foreach my $coercion (@coercions) {
             my ($constraint, $converter) = @$coercion;
             if (defined $constraint->($thing)) {
+                           local $_ = $thing;                
                 return $converter->($thing);
             }
         }
@@ -120,8 +128,9 @@ sub coerce ($@) {
 }
 
 sub as    ($) { $_[0] }
+sub from  ($) { $_[0] }
 sub where (&) { $_[0] }
-sub to    (&) { $_[0] }
+sub via   (&) { $_[0] }
 
 # define some basic types
 
@@ -168,8 +177,8 @@ Moose::Util::TypeConstraints - Type constraint system for Moose
       => where { $_ < 10 };
       
   coerce Num 
-      => as Str
-        => to { 0+$_ }; 
+      => from Str
+        => via { 0+$_ }; 
 
 =head1 DESCRIPTION
 
@@ -230,7 +239,9 @@ Suggestions for improvement are welcome.
 
 =item B<coerce>
 
-=item B<to>
+=item B<from>
+
+=item B<via>
 
 =back