docfix

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

diff --git a/lib/Class/MOP/Attribute.pm b/lib/Class/MOP/Attribute.pm
index 767ec1d..bcd1097 100644 (file)
--- a/lib/Class/MOP/Attribute.pm
+++ b/lib/Class/MOP/Attribute.pm
@@ -9,7 +9,7 @@ use Class::MOP::Method::Accessor;
 use Carp         'confess';
 use Scalar::Util 'blessed', 'reftype', 'weaken';
 
-our $VERSION   = '0.18';
+our $VERSION   = '0.20';
 our $AUTHORITY = 'cpan:STEVAN';
 
 use base 'Class::MOP::Object';
@@ -133,12 +133,29 @@ sub init_arg  { $_[0]->{'$!init_arg'}  }
 # end bootstrapped away method section.
 # (all methods below here are kept intact)
 
-sub get_read_method  { $_[0]->reader || $_[0]->accessor }
-sub get_write_method { $_[0]->writer || $_[0]->accessor }
+sub get_read_method  { 
+    my $self   = shift;    
+    my $reader = $self->reader || $self->accessor;
+    # normal case ...
+    return $reader unless ref $reader;
+    # the HASH ref case
+    my ($name) = %$reader;
+    return $name;
+}
+
+sub get_write_method { 
+    my $self   = shift;
+    my $writer = $self->writer || $self->accessor; 
+    # normal case ...
+    return $writer unless ref $writer;
+    # the HASH ref case
+    my ($name) = %$writer;
+    return $name;    
+}
 
 sub get_read_method_ref {
     my $self = shift;
-    if (my $reader = $self->get_read_method) {    
+    if ((my $reader = $self->get_read_method) && $self->associated_class) {   
         return $self->associated_class->get_method($reader);
     }
     else {
@@ -148,8 +165,8 @@ sub get_read_method_ref {
 
 sub get_write_method_ref {
     my $self = shift;    
-    if (my $writer = $self->get_write_method) {    
-        return $self->assocaited_class->get_method($writer);
+    if ((my $writer = $self->get_write_method) && $self->associated_class) {         
+        return $self->associated_class->get_method($writer);
     }
     else {
         return sub { $self->set_value(@_) };
@@ -381,12 +398,6 @@ value of C<-foo>, then the following code will Just Work.
 In an init_arg is not assigned, it will automatically use the
 value of C<$name>.
 
-=item I<default>
-
-The value of this key is the default value which
-C<Class::MOP::Class::construct_instance> will initialize the
-attribute to.
-
 =item I<builder>
 
 The value of this key is the name of the method that will be
@@ -394,6 +405,12 @@ called to obtain the value used to initialize the attribute.
 This should be a method in the class associated with the attribute,
 not a method in the attribute class itself.
 
+=item I<default>
+
+The value of this key is the default value which
+C<Class::MOP::Class::construct_instance> will initialize the
+attribute to.
+
 B<NOTE:>
 If the value is a simple scalar (string or number), then it can
 be just passed as is. However, if you wish to initialize it with