instance-refactored

[gitmo/Class-MOP.git] / lib / Class / MOP / Attribute.pm

diff --git a/lib/Class/MOP/Attribute.pm b/lib/Class/MOP/Attribute.pm
index 748bafa..3190a4b 100644 (file)
--- a/lib/Class/MOP/Attribute.pm
+++ b/lib/Class/MOP/Attribute.pm
@@ -7,7 +7,7 @@ use warnings;
 use Carp         'confess';
 use Scalar::Util 'blessed', 'reftype', 'weaken';
 
-our $VERSION = '0.05';
+our $VERSION = '0.08';
 
 sub meta { 
     require Class::MOP::Class;
@@ -60,6 +60,22 @@ sub clone {
     return bless { %{$self}, %options } => blessed($self);
 }
 
+sub initialize_instance_slot {
+    my ($self, $instance, $params) = @_;
+    my $init_arg = $self->{init_arg};
+    # try to fetch the init arg from the %params ...
+    my $val;        
+    $val = $params->{$init_arg} if exists $params->{$init_arg};
+    # if nothing was in the %params, we can use the 
+    # attribute's default value (if it has one)
+    if (!defined $val && defined $self->{default}) {
+        $val = $self->default($instance);
+    }
+    $self->associated_class
+         ->get_meta_instance
+         ->set_slot_value($instance, $self->name, $val);
+}
+
 # NOTE:
 # the next bunch of methods will get bootstrapped 
 # away in the Class::MOP bootstrapping section
@@ -113,29 +129,41 @@ sub detach_from_class {
 ## Method generation helpers
 
 sub generate_accessor_method {
-    my ($self, $attr_name) = @_;
-    sub {
-        $_[0]->{$attr_name} = $_[1] if scalar(@_) == 2;
-        $_[0]->{$attr_name};
+    my $self = shift;
+    my $meta_instance = $self->associated_class->get_meta_instance;    
+    my $attr_name = $self->name;
+    return sub {
+        $meta_instance->set_slot_value($_[0], $attr_name, $_[1]) if scalar(@_) == 2;
+        $meta_instance->get_slot_value($_[0], $attr_name);
     };
 }
 
 sub generate_reader_method {
-    my ($self, $attr_name) = @_; 
-    sub { 
+    my $self = shift;
+    my $meta_instance = $self->associated_class->get_meta_instance;
+    my $attr_name = $self->name;
+    return sub { 
         confess "Cannot assign a value to a read-only accessor" if @_ > 1;
-        $_[0]->{$attr_name}; 
+        $meta_instance->get_slot_value($_[0], $attr_name); 
     };   
 }
 
 sub generate_writer_method {
-    my ($self, $attr_name) = @_; 
-    sub { $_[0]->{$attr_name} = $_[1] };
+    my $self = shift;
+    my $meta_instance = $self->associated_class->get_meta_instance;
+    my $attr_name = $self->name;
+    return sub { 
+        $meta_instance->set_slot_value($_[0], $attr_name, $_[1]);
+    };
 }
 
 sub generate_predicate_method {
-    my ($self, $attr_name) = @_; 
-    sub { defined $_[0]->{$attr_name} ? 1 : 0 };
+    my $self = shift;
+    my $meta_instance = $self->associated_class->get_meta_instance;
+    my $attr_name = $self->name;
+    return sub { 
+        defined $meta_instance->get_slot_value($_[0], $attr_name) ? 1 : 0;
+    };
 }
 
 sub process_accessors {
@@ -263,8 +291,6 @@ An attribute must (at the very least), have a C<$name>. All other
 C<%options> are contained added as key-value pairs. Acceptable keys
 are as follows:
 
-=item B<clone (%options)>
-
 =over 4
 
 =item I<init_arg>
@@ -375,6 +401,10 @@ defined, and false (C<0>) otherwise.
 
 =back
 
+=item B<clone (%options)>
+
+=item B<initialize_instance_slot ($instance, $params)>
+
 =back 
 
 =head2 Informational
@@ -434,6 +464,12 @@ These are all basic predicate methods for the values passed into C<new>.
 
 =item B<detach_from_class>
 
+=item B<slot_name>
+
+=item B<allocate_slots>
+
+=item B<deallocate_slots>
+
 =back
 
 =head2 Attribute Accessor generation
@@ -459,13 +495,13 @@ use the custom method passed through the constructor.
 
 =over 4
 
-=item B<generate_accessor_method ($attr_name)>
+=item B<generate_accessor_method>
 
-=item B<generate_predicate_method ($attr_name)>
+=item B<generate_predicate_method>
 
-=item B<generate_reader_method ($attr_name)>
+=item B<generate_reader_method>
 
-=item B<generate_writer_method ($attr_name)>
+=item B<generate_writer_method>
 
 =back