X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FTypeConstraint%2FParameterized.pm;h=c3c664ecf28f054bd4040b5a5a0360f4e88a47e4;hb=a7e9b05b9505cd4d2d642ead617de0eb7074e23f;hp=f47efa4ad4d68509573e96cefeaa769f1d7ee30a;hpb=39aba5c9fd57a65a61c4612d36dc0956a917e8e0;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Meta/TypeConstraint/Parameterized.pm b/lib/Moose/Meta/TypeConstraint/Parameterized.pm
index f47efa4..c3c664e 100644
--- a/lib/Moose/Meta/TypeConstraint/Parameterized.pm
+++ b/lib/Moose/Meta/TypeConstraint/Parameterized.pm
@@ -6,8 +6,10 @@ use metaclass;
 
 use Scalar::Util 'blessed';
 use Carp         'confess';
+use Moose::Util::TypeConstraints;
 
-our $VERSION   = '0.01';
+our $VERSION   = '0.55_04';
+$VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
 use base 'Moose::Meta::TypeConstraint';
@@ -17,6 +19,20 @@ __PACKAGE__->meta->add_attribute('type_parameter' => (
     predicate => 'has_type_parameter',
 ));
 
+sub equals {
+    my ( $self, $type_or_name ) = @_;
+
+    my $other = Moose::Util::TypeConstraints::find_type_constraint($type_or_name);
+
+    return unless $other->isa(__PACKAGE__);
+    
+    return (
+        $self->type_parameter->equals( $other->type_parameter )
+            and
+        $self->parent->equals( $other->parent )
+    );
+}
+
 sub compile_type_constraint {
     my $self = shift;
     
@@ -27,34 +43,18 @@ sub compile_type_constraint {
     
     (blessed $type_parameter && $type_parameter->isa('Moose::Meta::TypeConstraint'))
         || confess "The type parameter must be a Moose meta type";
-    
-    my $constraint;
-    
-    my $array_constraint = sub {
-        foreach my $x (@$_) {
-            ($type_parameter->check($x)) || return
-        } 1;
-    };
-
-    my $hash_constraint = sub {
-        foreach my $x (values %$_) {
-            ($type_parameter->check($x)) || return
-        } 1;
-    };
-
-    if ($self->is_subtype_of('ArrayRef')) {
-        $constraint = $array_constraint;
-    }
-    elsif ($self->is_subtype_of('HashRef')) {
-        $constraint = $hash_constraint;
-    }
-    else {
-        confess "The " . $self->name . " constraint cannot be used, because " . $self->parent->name . " doesn't subtype ArrayRef or HashRef.";
+
+    foreach my $type (Moose::Util::TypeConstraints::get_all_parameterizable_types()) {
+        if (my $constraint = $type->generate_constraint_for($self)) {
+            $self->_set_constraint($constraint);
+            return $self->SUPER::compile_type_constraint;            
+        }
     }
     
-    $self->_set_constraint($constraint);
-    
-    $self->SUPER::compile_type_constraint;
+    # if we get here, then we couldn't 
+    # find a way to parameterize this type
+    confess "The " . $self->name . " constraint cannot be used, because " 
+          . $self->parent->name . " doesn't subtype or coerce from a parameterizable type.";
 }
 
 1;
@@ -68,8 +68,6 @@ __END__
 
 Moose::Meta::TypeConstraint::Parameterized - Higher Order type constraints for Moose
 
-=head1 DESCRIPTION
-
 =head1 METHODS
 
 =over 4
@@ -82,6 +80,8 @@ Moose::Meta::TypeConstraint::Parameterized - Higher Order type constraints for M
 
 =item B<meta>
 
+=item B<equals>
+
 =back
 
 =head1 BUGS
@@ -96,7 +96,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>