fixing this to work correctly

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

diff --git a/lib/MooseX/AttributeHelpers/Collection/Array.pm b/lib/MooseX/AttributeHelpers/Collection/Array.pm
index fc46ebb..77eabd8 100644 (file)
--- a/lib/MooseX/AttributeHelpers/Collection/Array.pm
+++ b/lib/MooseX/AttributeHelpers/Collection/Array.pm
@@ -6,83 +6,67 @@ use Moose::Util::TypeConstraints;
 our $VERSION   = '0.01';
 our $AUTHORITY = 'cpan:STEVAN';
 
-extends 'Moose::Meta::Attribute';
-
-my %METHOD_CONSTRUCTORS = (
-    'push' => sub {
-        my $attr = shift;
-        return sub { 
-            my $instance = shift;
-            push @{$attr->get_value($instance)} => @_; 
-        };
-    },
-    'pop' => sub {
-        my $attr = shift;
-        return sub { pop @{$attr->get_value($_[0])} };
-    },    
-    'unshift' => sub {
-        my $attr = shift;
-        return sub { 
-            my $instance = shift;
-            unshift @{$attr->get_value($instance)} => @_; 
-        };
-    },    
-    'shift' => sub {
-        my $attr = shift;
-        return sub { shift @{$attr->get_value($_[0])} };
-    },    
-    'get' => sub {
-        my $attr = shift;
-        return sub { $attr->get_value($_[0])->[$_[1]] };
-    },    
-    'set' => sub {
-        my $attr = shift;
-        return sub { $attr->get_value($_[0])->[$_[1]] = $_[2] };
-    },    
-);
-
-has 'provides' => (
-    is       => 'ro',
-    isa      => subtype('HashRef' => where { 
-        (exists $METHOD_CONSTRUCTORS{$_} || return) for keys %{$_}; 1;
-    }),
-    required => 1,
+extends 'MooseX::AttributeHelpers::Base';
+
+has '+method_constructors' => (
+    default => sub {
+        return +{
+            'push' => sub {
+                my $attr = shift;
+                return sub { 
+                    my $instance = shift;
+                    push @{$attr->get_value($instance)} => @_; 
+                };
+            },
+            'pop' => sub {
+                my $attr = shift;
+                return sub { pop @{$attr->get_value($_[0])} };
+            },    
+            'unshift' => sub {
+                my $attr = shift;
+                return sub { 
+                    my $instance = shift;
+                    unshift @{$attr->get_value($instance)} => @_; 
+                };
+            },    
+            'shift' => sub {
+                my $attr = shift;
+                return sub { shift @{$attr->get_value($_[0])} };
+            },    
+            'get' => sub {
+                my $attr = shift;
+                return sub { $attr->get_value($_[0])->[$_[1]] };
+            },    
+            'set' => sub {
+                my $attr = shift;
+                return sub { $attr->get_value($_[0])->[$_[1]] = $_[2] };
+            },    
+            'count' => sub {
+                my $attr = shift;
+                return sub { scalar @{$attr->get_value($_[0])} };        
+            },
+            'empty' => sub {
+                my $attr = shift;
+                return sub { scalar @{$attr->get_value($_[0])} ? 1 : 0 };        
+            }
+        }
+    }
 );
 
-has '+$!default'       => (required => 1);
-has '+type_constraint' => (required => 1);
-
-before '_process_options' => sub {
-    my ($self, %options) = @_;
-    
-    if (exists $options{provides}) {
-        (exists $options{isa})
-            || confess "You must define a type with the Array metaclass";  
-             
-        (find_type_constraint($options{isa})->is_subtype_of('ArrayRef'))
-            || confess "The type constraint for a Array must be a subtype of ArrayRef";
-    }
-};
-
-after 'install_accessors' => sub {
-    my $attr  = shift;
-    my $class = $attr->associated_class;
-    
-    foreach my $key (keys %{$attr->provides}) {
-        (exists $METHOD_CONSTRUCTORS{$key})
-            || confess "Unsupported method type ($key)";
-        $class->add_method(
-            $attr->provides->{$key}, 
-            $METHOD_CONSTRUCTORS{$key}->($attr)
-        );
-    }
-};
+sub _process_options_for_provides {
+    my ($self, $options) = @_;
+    (exists $options->{isa})
+        || confess "You must define a type with the Array metaclass";  
+         
+    (find_type_constraint($options->{isa})->is_a_type_of('ArrayRef'))
+        || confess "The type constraint for a Array ($options->{isa}) must be a subtype of ArrayRef";
+}
 
 no Moose;
-no Moose::Util::TypeConstraints;
+no Moose::Util::TypeConstraints;;
 
 # register the alias ...
-package Moose::Meta::Attribute::Custom::Collection;
+package Moose::Meta::Attribute::Custom::Collection::Array;
 sub register_implementation { 'MooseX::AttributeHelpers::Collection::Array' }