more-tweaks

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

diff --git a/lib/Moose/Util/TypeConstraints.pm b/lib/Moose/Util/TypeConstraints.pm
index 6c65523..b70c870 100644 (file)
--- a/lib/Moose/Util/TypeConstraints.pm
+++ b/lib/Moose/Util/TypeConstraints.pm
@@ -4,79 +4,85 @@ package Moose::Util::TypeConstraints;
 use strict;
 use warnings;
 
-use Sub::Name    'subname';
+use Carp         'confess';
 use Scalar::Util 'blessed';
 
 our $VERSION = '0.02';
 
+use Moose::Meta::TypeConstraint;
+use Moose::Meta::TypeCoercion;
+
 sub import {
        shift;
        my $pkg = shift || caller();
-       return if $pkg eq ':no_export';
+       return if $pkg eq '-no-export';
        no strict 'refs';
-       foreach my $export (qw(
-               type subtype as where
-               )) {
+       foreach my $export (qw(type subtype as where coerce from via find_type_constraint)) {
                *{"${pkg}::${export}"} = \&{"${export}"};
-       }
-       
-       foreach my $constraint (qw(
-               Any 
-               Value Ref
-               Str Int
-               ScalarRef ArrayRef HashRef CodeRef RegexpRef
-               Object
-               )) {
-               *{"${pkg}::${constraint}"} = \&{"${constraint}"};
        }       
-       
 }
 
-my %TYPES;
+{
+    my %TYPES;
+    sub find_type_constraint { $TYPES{$_[0]} }
+
+    sub _create_type_constraint { 
+        my ($name, $parent, $check) = @_;
+        (!exists $TYPES{$name})
+            || confess "The type constraint '$name' has already been created"
+                if defined $name;
+        $parent = $TYPES{$parent} if defined $parent;
+        my $constraint = Moose::Meta::TypeConstraint->new(
+            name       => $name || '__ANON__',
+            parent     => $parent,            
+            constraint => $check,           
+        );
+        $TYPES{$name} = $constraint if defined $name;
+        return $constraint;
+    }
+
+    sub _install_type_coercions { 
+        my ($type_name, $coercion_map) = @_;
+        my $type = $TYPES{$type_name};
+        (!$type->has_coercion)
+            || confess "The type coercion for '$type_name' has already been registered";        
+        my $type_coercion = Moose::Meta::TypeCoercion->new(
+            type_coercion_map => $coercion_map,
+            type_constraint   => $type
+        );            
+        $type->coercion($type_coercion);
+    }
+    
+    sub export_type_contstraints_as_functions {
+        my $pkg = caller();
+           no strict 'refs';
+       foreach my $constraint (keys %TYPES) {
+               *{"${pkg}::${constraint}"} = $TYPES{$constraint}->_compiled_type_constraint;
+       }        
+    }    
+}
 
-#sub find_type_constraint { $TYPES{$_[0]} }
+# type constructors
 
 sub type ($$) {
        my ($name, $check) = @_;
-       my $pkg = caller();
-       my $full_name = "${pkg}::${name}";
-       no strict 'refs';
-       *{$full_name} = $TYPES{$name} = subname $full_name => sub { 
-               return $TYPES{$name} unless defined $_[0];
-               local $_ = $_[0];
-               return undef unless $check->($_[0]);
-               $_[0];
-       };
+       _create_type_constraint($name, undef, $check);
 }
 
 sub subtype ($$;$) {
-       my ($name, $parent, $check) = @_;
-       if (defined $check) {
-               my $pkg = caller();
-               my $full_name = "${pkg}::${name}";              
-               no strict 'refs';
-               $parent = $TYPES{$parent} unless $parent && ref($parent) eq 'CODE';
-               *{$full_name} = $TYPES{$name} = subname $full_name => sub { 
-                       return $TYPES{$name} unless defined $_[0];                      
-                       local $_ = $_[0];
-                       return undef unless defined $parent->($_[0]) && $check->($_[0]);
-                       $_[0];
-               };      
-       }
-       else {
-               ($parent, $check) = ($name, $parent);
-               $parent = $TYPES{$parent} unless $parent && ref($parent) eq 'CODE';             
-               return subname '__anon_subtype__' => sub { 
-                       return $TYPES{$name} unless defined $_[0];                      
-                       local $_ = $_[0];
-                       return undef unless defined $parent->($_[0]) && $check->($_[0]);
-                       $_[0];
-               };              
-       }
+       unshift @_ => undef if scalar @_ == 2;
+       _create_type_constraint(@_);
+}
+
+sub coerce ($@) {
+    my ($type_name, @coercion_map) = @_;   
+    _install_type_coercions($type_name, \@coercion_map);
 }
 
 sub as    ($) { $_[0] }
+sub from  ($) { $_[0] }
 sub where (&) { $_[0] }
+sub via   (&) { $_[0] }
 
 # define some basic types
 
@@ -121,6 +127,10 @@ Moose::Util::TypeConstraints - Type constraint system for Moose
   subtype NaturalLessThanTen 
       => as Natural
       => where { $_ < 10 };
+      
+  coerce Num 
+      => from Str
+        => via { 0+$_ }; 
 
 =head1 DESCRIPTION
 
@@ -130,10 +140,6 @@ validation.
 
 This is B<NOT> a type system for Perl 5.
 
-The type and subtype constraints are basically functions which will 
-validate their first argument. If called with no arguments, they will 
-return themselves (this is syntactic sugar for Moose attributes).
-
 This module also provides a simple hierarchy for Perl 5 types, this 
 could probably use some work, but it works for me at the moment.
 
@@ -153,6 +159,20 @@ Suggestions for improvement are welcome.
     
 =head1 FUNCTIONS
 
+=head2 Type Constraint Registry
+
+=over 4
+
+=item B<find_type_constraint ($type_name)>
+
+=item B<_create_type_constraint ($type_name, $type_constraint)>
+
+=item B<_install_type_coercions>
+
+=item B<export_type_contstraints_as_functions>
+
+=back
+
 =head2 Type Constraint Constructors
 
 =over 4
@@ -165,6 +185,12 @@ Suggestions for improvement are welcome.
 
 =item B<where>
 
+=item B<coerce>
+
+=item B<from>
+
+=item B<via>
+
 =back
 
 =head2 Built-in Type Constraints