X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FUtil%2FTypeConstraints.pm;h=9dfa98b40585c7c9a1f10e3c3a0aa0265465244c;hb=9af1d28be417ff8c05dea73e3a7e7f8f2b92bb26;hp=b2c5db7c92eb7dbdcd2409b9da8f72ac2f22dabb;hpb=4e036ee4269310099ef139f2fa14673d821f629a;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Util/TypeConstraints.pm b/lib/Moose/Util/TypeConstraints.pm
index b2c5db7..9dfa98b 100644
--- a/lib/Moose/Util/TypeConstraints.pm
+++ b/lib/Moose/Util/TypeConstraints.pm
@@ -5,152 +5,256 @@ use strict;
 use warnings;
 
 use Carp         'confess';
-use Sub::Name    'subname';
 use Scalar::Util 'blessed';
-
-our $VERSION = '0.02';
+use B            'svref_2object';
+use Sub::Exporter;
+
+our $VERSION   = '0.12';
+our $AUTHORITY = 'cpan:STEVAN';
+
+# Prototyped subs must be predeclared because we have a circular dependency
+# with Moose::Meta::Attribute et. al. so in case of us being use'd first the
+# predeclaration ensures the prototypes are in scope when consumers are
+# compiled
+
+sub find_type_constraint ($);
+sub _create_type_constraint ($$$;$$);
+sub _install_type_coercions ($$);
+sub create_type_constraint_union (@);
+sub type ($$;$$);
+sub subtype ($$;$$$);
+sub coerce ($@);
+sub as      ($);
+sub from    ($);
+sub where   (&);
+sub via     (&);
+sub message     (&);
+sub optimize_as (&);
+sub enum ($;@);
 
 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 coerce from via)) {
-		*{"${pkg}::${export}"} = \&{"${export}"};
-	}	
+use Moose::Meta::TypeCoercion;
+
+my @exports = qw/
+    type subtype as where message optimize_as
+    coerce from via 
+    enum
+    find_type_constraint
+/;
+
+Sub::Exporter::setup_exporter({ 
+    exports => \@exports,
+    groups  => { default => [':all'] }
+});
+
+sub unimport {
+    no strict 'refs';    
+    my $class = caller();
+    # loop through the exports ...
+    foreach my $name (@exports) {
+        # if we find one ...
+        if (defined &{$class . '::' . $name}) {
+            my $keyword = \&{$class . '::' . $name};
+            
+            # make sure it is from Moose
+            my $pkg_name = eval { svref_2object($keyword)->GV->STASH->NAME };
+            next if $@;
+            next if $pkg_name ne 'Moose::Util::TypeConstraints';
+            
+            # and if it is from Moose then undef the slot
+            delete ${$class . '::'}{$name};
+        }
+    }
 }
 
 {
     my %TYPES;
-    sub find_type_constraint { 
-        my $type_name = shift;
-        $TYPES{$type_name}->constraint_code; 
+    sub find_type_constraint ($) { 
+        return $TYPES{$_[0]}->[1] 
+            if exists $TYPES{$_[0]};
+        return;
+    }
+    
+    sub _dump_type_constraints {
+        require Data::Dumper;        
+        Data::Dumper::Dumper(\%TYPES);
     }
+    
+    sub _create_type_constraint ($$$;$$) { 
+        my $name   = shift;
+        my $parent = shift;
+        my $check  = shift;;
+        
+        my ($message, $optimized);
+        for (@_) {
+            $message   = $_->{message}   if exists $_->{message};
+            $optimized = $_->{optimized} if exists $_->{optimized};            
+        }
 
-    sub register_type_constraint { 
-        my ($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
+        my $pkg_defined_in = scalar(caller(0));
+        
+        ($TYPES{$name}->[0] eq $pkg_defined_in)
+            || confess ("The type constraint '$name' has already been created in " 
+                       . $TYPES{$name}->[0] . " and cannot be created again in "
+                       . $pkg_defined_in)
+                 if defined $name && exists $TYPES{$name};   
+                              
+        $parent = find_type_constraint($parent) if defined $parent;
+        my $constraint = Moose::Meta::TypeConstraint->new(
+            name       => $name || '__ANON__',
+            parent     => $parent,            
+            constraint => $check,       
+            message    => $message,    
+            optimized  => $optimized,
         );
+        $TYPES{$name} = [ $pkg_defined_in, $constraint ] if defined $name;
+        return $constraint;
+    }
+
+    sub _install_type_coercions ($$) { 
+        my ($type_name, $coercion_map) = @_;
+        my $type = find_type_constraint($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 dump_type_constraints {
-        require Data::Dumper;
-        $Data::Dumper::Deparse = 1;
-        Data::Dumper::Dumper(\%TYPES);
+    sub create_type_constraint_union (@) {
+        my (@type_constraint_names) = @_;
+        return Moose::Meta::TypeConstraint->union(
+            map { 
+                find_type_constraint($_) 
+            } @type_constraint_names
+        );
     }
     
-    sub export_type_contstraints_as_functions {
+    sub export_type_constraints_as_functions {
         my $pkg = caller();
 	    no strict 'refs';
     	foreach my $constraint (keys %TYPES) {
-    		*{"${pkg}::${constraint}"} = $TYPES{$constraint}->constraint_code;
+    		*{"${pkg}::${constraint}"} = find_type_constraint($constraint)->_compiled_type_constraint;
     	}        
     }
-
-    sub find_type_coercion { 
-        my $type_name = shift;
-        $TYPES{$type_name}->coercion_code; 
-    }
-
-    sub register_type_coercion { 
-        my ($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);
-    }
+    
+    *Moose::Util::TypeConstraints::export_type_contstraints_as_functions = \&export_type_constraints_as_functions;
+    
+    sub list_all_type_constraints { keys %TYPES }   
 }
 
+# type constructors
 
-sub type ($$) {
-	my ($name, $check) = @_;
-	my $full_name = caller() . "::${name}";
-	register_type_constraint($name => subname $full_name => sub { 
-		local $_ = $_[0];
-		return undef unless $check->($_[0]);
-		$_[0];
-	});
+sub type ($$;$$) {
+    splice(@_, 1, 0, undef);
+	goto &_create_type_constraint;	
 }
 
-sub subtype ($$;$) {
-	my ($name, $parent, $check) = @_;
-	if (defined $check) {
-	    my $full_name = caller() . "::${name}";
-		$parent = find_type_constraint($parent) 
-		    unless $parent && ref($parent) eq 'CODE';
-		register_type_constraint($name => subname $full_name => sub { 			
-			local $_ = $_[0];
-			return undef unless defined $parent->($_[0]) && $check->($_[0]);
-			$_[0];
-		});	
-	}
-	else {
-		($parent, $check) = ($name, $parent);
-		$parent = find_type_constraint($parent) 
-		    unless $parent && ref($parent) eq 'CODE';		
-		return subname '__anon_subtype__' => sub { 			
-			local $_ = $_[0];
-			return undef unless defined $parent->($_[0]) && $check->($_[0]);
-			$_[0];
-		};		
-	}
+sub subtype ($$;$$$) {
+	unshift @_ => undef if scalar @_ <= 2;	
+	goto &_create_type_constraint;
 }
 
 sub coerce ($@) {
-    my ($type_name, @coercion_map) = @_;
-    #use Data::Dumper;
-    #warn Dumper \@coercion_map;    
-    my @coercions;
-    while (@coercion_map) {
-        my ($constraint_name, $action) = splice(@coercion_map, 0, 2);
-        my $constraint = find_type_constraint($constraint_name);
-        (defined $constraint)
-            || confess "Could not find the type constraint ($constraint_name)";
-        push @coercions => [  $constraint, $action ];
-    }
-    register_type_coercion($type_name, sub { 
-        my $thing = shift;
-        foreach my $coercion (@coercions) {
-            my ($constraint, $converter) = @$coercion;
-            if (defined $constraint->($thing)) {
-			    local $_ = $thing;                
-                return $converter->($thing);
-            }
-        }
-        return $thing;
-    });
+    my ($type_name, @coercion_map) = @_;   
+    _install_type_coercions($type_name, \@coercion_map);
 }
 
-sub as    ($) { $_[0] }
-sub from  ($) { $_[0] }
-sub where (&) { $_[0] }
-sub via   (&) { $_[0] }
+sub as      ($) { $_[0] }
+sub from    ($) { $_[0] }
+sub where   (&) { $_[0] }
+sub via     (&) { $_[0] }
+
+sub message     (&) { +{ message   => $_[0] } }
+sub optimize_as (&) { +{ optimized => $_[0] } }
+
+sub enum ($;@) {
+    my ($type_name, @values) = @_;
+    (scalar @values >= 2)
+        || confess "You must have at least two values to enumerate through";
+    my $regexp = join '|' => @values;
+	_create_type_constraint(
+	    $type_name,
+	    'Str',
+	    sub { qr/^$regexp$/i }
+	);    
+}
 
 # define some basic types
 
-type Any => where { 1 };
+type 'Any'  => where { 1 }; # meta-type including all
+type 'Item' => where { 1 }; # base-type 
 
-type Value => where { !ref($_) };
-type Ref   => where {  ref($_) };
+subtype 'Undef'   => as 'Item' => where { !defined($_) };
+subtype 'Defined' => as 'Item' => where {  defined($_) };
 
-subtype Int => as Value => where {  Scalar::Util::looks_like_number($_) };
-subtype Str => as Value => where { !Scalar::Util::looks_like_number($_) };
+subtype 'Bool'
+    => as 'Item' 
+    => where { !defined($_) || $_ eq "" || "$_" eq '1' || "$_" eq '0' };
 
-subtype ScalarRef => as Ref => where { ref($_) eq 'SCALAR' };	
-subtype ArrayRef  => as Ref => where { ref($_) eq 'ARRAY'  };
-subtype HashRef   => as Ref => where { ref($_) eq 'HASH'   };	
-subtype CodeRef   => as Ref => where { ref($_) eq 'CODE'   };
-subtype RegexpRef => as Ref => where { ref($_) eq 'Regexp' };	
+subtype 'Value' 
+    => as 'Defined' 
+    => where { !ref($_) } 
+    => optimize_as { defined($_[0]) && !ref($_[0]) };
+    
+subtype 'Ref'
+    => as 'Defined' 
+    => where {  ref($_) } 
+    => optimize_as { ref($_[0]) };
+
+subtype 'Str' 
+    => as 'Value' 
+    => where { 1 } 
+    => optimize_as { defined($_[0]) && !ref($_[0]) };
+
+subtype 'Num' 
+    => as 'Value' 
+    => where { Scalar::Util::looks_like_number($_) } 
+    => optimize_as { !ref($_[0]) && Scalar::Util::looks_like_number($_[0]) };
+    
+subtype 'Int' 
+    => as 'Num'   
+    => where { "$_" =~ /^-?[0-9]+$/ }
+    => optimize_as { defined($_[0]) && !ref($_[0]) && $_[0] =~ /^-?[0-9]+$/ };
+
+subtype 'ScalarRef' => as 'Ref' => where { ref($_) eq 'SCALAR' } => optimize_as { ref($_[0]) eq 'SCALAR' };
+subtype 'ArrayRef'  => as 'Ref' => where { ref($_) eq 'ARRAY'  } => optimize_as { ref($_[0]) eq 'ARRAY'  };
+subtype 'HashRef'   => as 'Ref' => where { ref($_) eq 'HASH'   } => optimize_as { ref($_[0]) eq 'HASH'   };	
+subtype 'CodeRef'   => as 'Ref' => where { ref($_) eq 'CODE'   } => optimize_as { ref($_[0]) eq 'CODE'   };
+subtype 'RegexpRef' => as 'Ref' => where { ref($_) eq 'Regexp' } => optimize_as { ref($_[0]) eq 'Regexp' };	
+subtype 'GlobRef'   => as 'Ref' => where { ref($_) eq 'GLOB'   } => optimize_as { ref($_[0]) eq 'GLOB'   };
+
+# NOTE:
+# scalar filehandles are GLOB refs, 
+# but a GLOB ref is not always a filehandle
+subtype 'FileHandle' 
+    => as 'GlobRef' 
+    => where { Scalar::Util::openhandle($_) }
+    => optimize_as { ref($_[0]) eq 'GLOB' && Scalar::Util::openhandle($_[0]) };
 
 # NOTE: 
 # blessed(qr/.../) returns true,.. how odd
-subtype Object => as Ref => where { blessed($_) && blessed($_) ne 'Regexp' };
+subtype 'Object' 
+    => as 'Ref' 
+    => where { blessed($_) && blessed($_) ne 'Regexp' }
+    => optimize_as { blessed($_[0]) && blessed($_[0]) ne 'Regexp' };
+
+subtype 'Role' 
+    => as 'Object' 
+    => where { $_->can('does') }
+    => optimize_as { blessed($_[0]) && $_[0]->can('does') };
+    
+subtype 'ClassName' 
+    => as 'Str' 
+    => where { eval { $_->isa('UNIVERSAL') } }
+    => optimize_as { !ref($_[0]) && eval { $_[0]->isa('UNIVERSAL') } };    
+
+{
+    my @BUILTINS = list_all_type_constraints();
+    sub list_all_builtin_type_constraints { @BUILTINS }
+}
 
 1;
 
@@ -166,44 +270,131 @@ Moose::Util::TypeConstraints - Type constraint system for Moose
 
   use Moose::Util::TypeConstraints;
 
-  type Num => where { Scalar::Util::looks_like_number($_) };
+  type 'Num' => where { Scalar::Util::looks_like_number($_) };
   
-  subtype Natural 
-      => as Num 
+  subtype 'Natural' 
+      => as 'Num' 
       => where { $_ > 0 };
   
-  subtype NaturalLessThanTen 
-      => as Natural
-      => where { $_ < 10 };
+  subtype 'NaturalLessThanTen' 
+      => as 'Natural'
+      => where { $_ < 10 }
+      => message { "This number ($_) is not less than ten!" };
       
-  coerce Num 
-      => from Str
+  coerce 'Num' 
+      => from 'Str'
         => via { 0+$_ }; 
+        
+  enum 'RGBColors' => qw(red green blue);
 
 =head1 DESCRIPTION
 
-This module provides Moose with the ability to create type contraints 
-to be are used in both attribute definitions and for method argument 
-validation. 
+This module provides Moose with the ability to create custom type 
+contraints to be used in attribute definition. 
+
+=head2 Important Caveat
 
-This is B<NOT> a type system for Perl 5.
+This is B<NOT> a type system for Perl 5. These are type constraints, 
+and they are not used by Moose unless you tell it to. No type 
+inference is performed, expression are not typed, etc. etc. etc. 
+
+This is simply a means of creating small constraint functions which 
+can be used to simplify your own type-checking code.
+
+=head2 Slightly Less Important Caveat
+
+It is almost always a good idea to quote your type and subtype names. 
+This is to prevent perl from trying to execute the call as an indirect 
+object call. This issue only seems to come up when you have a subtype
+the same name as a valid class, but when the issue does arise it tends 
+to be quite annoying to debug. 
+
+So for instance, this:
+  
+  subtype DateTime => as Object => where { $_->isa('DateTime') };
+
+will I<Just Work>, while this:
+
+  use DateTime;
+  subtype DateTime => as Object => where { $_->isa('DateTime') };
+
+will fail silently and cause many headaches. The simple way to solve 
+this, as well as future proof your subtypes from classes which have 
+yet to have been created yet, is to simply do this:
+
+  use DateTime;
+  subtype 'DateTime' => as 'Object' => where { $_->isa('DateTime') };
+
+=head2 Default Type Constraints
 
 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.
 
   Any
-      Value
-          Int
-          Str
-      Ref
-          ScalarRef
-          ArrayRef
-          HashRef
-          CodeRef
-          RegexpRef
-          Object	
-
-Suggestions for improvement are welcome.	
+  Item 
+      Bool
+      Undef
+      Defined
+          Value
+              Num
+                Int
+              Str
+                ClassName
+          Ref
+              ScalarRef
+              ArrayRef
+              HashRef
+              CodeRef
+              RegexpRef
+              GlobRef
+                FileHandle
+              Object	
+                  Role
+
+Suggestions for improvement are welcome.
+
+B<NOTE:> The C<Undef> type constraint does not work correctly 
+in every occasion, please use it sparringly.
+
+B<NOTE:> The C<ClassName> type constraint is simply a subtype 
+of string which responds true to C<isa('UNIVERSAL')>. This means
+that your class B<must> be loaded for this type constraint to 
+pass. I know this is not ideal for all, but it is a saner 
+restriction then most others. 
+
+=head2 Use with Other Constraint Modules
+
+This module should play fairly nicely with other constraint 
+modules with only some slight tweaking. The C<where> clause 
+in types is expected to be a C<CODE> reference which checks
+it's first argument and returns a bool. Since most constraint
+modules work in a similar way, it should be simple to adapt 
+them to work with Moose.
+
+For instance, this is how you could use it with 
+L<Declare::Constraints::Simple> to declare a completely new type. 
+
+  type 'HashOfArrayOfObjects' 
+      => IsHashRef(
+          -keys   => HasLength,
+          -values => IsArrayRef( IsObject ));
+
+For more examples see the F<t/204_example_w_DCS.t> test file.
+
+Here is an example of using L<Test::Deep> and it's non-test 
+related C<eq_deeply> function. 
+
+  type 'ArrayOfHashOfBarsAndRandomNumbers' 
+      => where {
+          eq_deeply($_, 
+              array_each(subhashof({
+                  bar           => isa('Bar'),
+                  random_number => ignore()
+              }))) 
+        };
+
+For a complete example see the F<t/205_example_w_TestDeep.t> 
+test file.    
     
 =head1 FUNCTIONS
 
@@ -213,63 +404,128 @@ Suggestions for improvement are welcome.
 
 =item B<find_type_constraint ($type_name)>
 
-=item B<register_type_constraint ($type_name, $type_constraint)>
+This function can be used to locate a specific type constraint 
+meta-object. What you do with it from there is up to you :)
+
+=item B<create_type_constraint_union (@type_constraint_names)>
 
-=item B<find_type_coercion>
+Given a list of C<@type_constraint_names>, this will return a 
+B<Moose::Meta::TypeConstraint::Union> instance.
 
-=item B<register_type_coercion>
+=item B<export_type_constraints_as_functions>
+
+This will export all the current type constraints as functions 
+into the caller's namespace. Right now, this is mostly used for 
+testing, but it might prove useful to others.
 
 =item B<export_type_contstraints_as_functions>
 
-=item B<dump_type_constraints>
+Alias for the above function.
+
+=item B<list_all_type_constraints>
+
+This will return a list of type constraint names, you can then 
+fetch them using C<find_type_constraint ($type_name)> if you 
+want to.
+
+=item B<list_all_builtin_type_constraints>
+
+This will return a list of builtin type constraints, meaning, 
+those which are defined in this module. See the section 
+labeled L<Default Type Constraints> for a complete list.
 
 =back
 
 =head2 Type Constraint Constructors
 
+The following functions are used to create type constraints. 
+They will then register the type constraints in a global store 
+where Moose can get to them if it needs to. 
+
+See the L<SYNOPSIS> for an example of how to use these.
+
 =over 4
 
-=item B<type>
+=item B<type ($name, $where_clause)>
+
+This creates a base type, which has no parent. 
+
+=item B<subtype ($name, $parent, $where_clause, ?$message)>
+
+This creates a named subtype. 
+
+=item B<subtype ($parent, $where_clause, ?$message)>
 
-=item B<subtype>
+This creates an unnamed subtype and will return the type 
+constraint meta-object, which will be an instance of 
+L<Moose::Meta::TypeConstraint>. 
+
+=item B<enum ($name, @values)>
+
+This will create a basic subtype for a given set of strings. 
+The resulting constraint will be a subtype of C<Str> and 
+will match any of the items in C<@values>. See the L<SYNOPSIS> 
+for a simple example.
+
+B<NOTE:> This is not a true proper enum type, it is simple 
+a convient constraint builder.
 
 =item B<as>
 
+This is just sugar for the type constraint construction syntax.
+
 =item B<where>
 
-=item B<coerce>
+This is just sugar for the type constraint construction syntax.
 
-=item B<from>
+=item B<message>
 
-=item B<via>
+This is just sugar for the type constraint construction syntax.
+
+=item B<optimize_as>
+
+This can be used to define a "hand optimized" version of your 
+type constraint which can be used to avoid traversing a subtype
+constraint heirarchy. 
+
+B<NOTE:> You should only use this if you know what you are doing, 
+all the built in types use this, so your subtypes (assuming they 
+are shallow) will not likely need to use this.
 
 =back
 
-=head2 Built-in Type Constraints
+=head2 Type Coercion Constructors
 
-=over 4
+Type constraints can also contain type coercions as well. If you 
+ask your accessor too coerce, the Moose will run the type-coercion 
+code first, followed by the type constraint check. This feature 
+should be used carefully as it is very powerful and could easily 
+take off a limb if you are not careful.
 
-=item B<Any>
+See the L<SYNOPSIS> for an example of how to use these.
 
-=item B<Value>
+=over 4
 
-=item B<Int>
+=item B<coerce>
 
-=item B<Str>
+=item B<from>
 
-=item B<Ref>
+This is just sugar for the type coercion construction syntax.
 
-=item B<ArrayRef>
+=item B<via>
+
+This is just sugar for the type coercion construction syntax.
 
-=item B<CodeRef>
+=back
 
-=item B<HashRef>
+=head2 Namespace Management
 
-=item B<RegexpRef>
+=over 4
 
-=item B<ScalarRef>
+=item B<unimport>
 
-=item B<Object>
+This will remove all the type constraint keywords from the 
+calling class namespace.
 
 =back
 
@@ -285,11 +541,11 @@ Stevan Little E<lt>stevan@iinteractive.comE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006 by Infinity Interactive, Inc.
+Copyright 2006, 2007 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. 
 
-=cut
\ No newline at end of file
+=cut