adding support for checking container types in the constructor

[gitmo/MooseX-AttributeHelpers.git] / lib / MooseX / AttributeHelpers / Collection.pm

diff --git a/lib/MooseX/AttributeHelpers/Collection.pm b/lib/MooseX/AttributeHelpers/Collection.pm
index d821b15..12c3d99 100644 (file)
--- a/lib/MooseX/AttributeHelpers/Collection.pm
+++ b/lib/MooseX/AttributeHelpers/Collection.pm
@@ -15,28 +15,9 @@ has 'container_type' => (
 );
 
 has 'container_type_constraint' => (
-    is      => 'rw',
-    isa     => 'Moose::Meta::TypeConstraint',
-    lazy    => 1,
-    default => sub {
-        my $self = shift;
-        ($self->has_container_type)
-            || confess "You cannot create a container_type_constraint if you dont have a container type";
-
-        my $container_type = $self->container_type;
-        my $constraint     = find_type_constraint($container_type);
-
-        # NOTE:
-        # I am not sure DWIM-ery is a good thing
-        # here, so i am going to err on the side 
-        # of caution, and blow up if you have
-        # not made a type constraint for this yet.
-        # - SL
-        (defined $constraint)
-            || confess "You must predefine the '$container_type' constraint before you can use it as a container type";
-        
-        return $constraint;
-    }
+    is       => 'rw',
+    isa      => 'Moose::Meta::TypeConstraint',
+    required => 1,
 );
 
 before 'process_options_for_provides' => sub {
@@ -44,11 +25,44 @@ before 'process_options_for_provides' => sub {
     
     if (exists $options->{isa}) {
         my $type = $options->{isa};
+        
+        # ... we should check if the type exists already
+        # and then we should use it,.. however, this means
+        # we need to extract the container type constraint
+        # as well, which is a little trickier
+        
         if ($type =~ /^(.*)\[(.*)\]$/) {
             my $core_type      = $1;
             my $container_type = $2;
-            $options->{isa}            = $core_type;
+            
             $options->{container_type} = $container_type;
+            
+            my $container_type_constraint = find_type_constraint($container_type);
+ 
+            # NOTE:
+            # I am not sure DWIM-ery is a good thing
+            # here, so i am going to err on the side 
+            # of caution, and blow up if you have
+            # not made a type constraint for this yet.
+            # - SL
+            (defined $container_type_constraint)
+                || confess "You must predefine the '$container_type' constraint before you can use it as a container type";            
+
+            $options->{container_type_constraint} = $container_type_constraint;
+                        
+            if ($core_type eq 'ArrayRef') {
+                $options->{isa} = subtype('ArrayRef' => where {
+                    foreach my $x (@$_) { ($container_type_constraint->check($x)) || return } 1;
+                });
+            }
+            elsif ($core_type eq 'HashRef') {
+                $options->{isa} = subtype('HashRef' => where {
+                    foreach my $x (values %$_) { ($container_type_constraint->check($x)) || return } 1;
+                });           
+            }
+            else {
+                confess "Your isa must be either ArrayRef or HashRef (sorry no subtype support yet)";
+            }
         }
     }
 };