X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FAttribute.pm;h=df091ccef6b65be4bf4dddde81a8b4d4b2d7f233;hb=93d190e0204bf7f6b9dd6920c0539866ed89b487;hp=a6b5f03516f2313f260e932030a77db16bad02c5;hpb=2e7e86c63f956238494249295af0ea8b4489392e;p=gitmo%2FMouse.git

diff --git a/lib/Mouse/Meta/Attribute.pm b/lib/Mouse/Meta/Attribute.pm
index a6b5f03..df091cc 100644
--- a/lib/Mouse/Meta/Attribute.pm
+++ b/lib/Mouse/Meta/Attribute.pm
@@ -17,22 +17,6 @@ sub new {
 
     $args{is} ||= '';
 
-    if ($args{lazy_build}) {
-        confess("You can not use lazy_build and default for the same attribute $name")
-            if exists $args{default};
-        $args{lazy}      = 1;
-        $args{required}  = 1;
-        $args{builder} ||= "_build_${name}";
-        if ($name =~ /^_/) {
-            $args{clearer}   ||= "_clear${name}";
-            $args{predicate} ||= "_has${name}";
-        } 
-        else {
-            $args{clearer}   ||= "clear_${name}";
-            $args{predicate} ||= "has_${name}";
-        }
-    }
-
     bless \%args, $class;
 }
 
@@ -42,6 +26,7 @@ sub _is_metadata      { $_[0]->{is}              }
 sub is_required       { $_[0]->{required}        }
 sub default           { $_[0]->{default}         }
 sub is_lazy           { $_[0]->{lazy}            }
+sub is_lazy_build     { $_[0]->{lazy_build}      }
 sub predicate         { $_[0]->{predicate}       }
 sub clearer           { $_[0]->{clearer}         }
 sub handles           { $_[0]->{handles}         }
@@ -182,6 +167,7 @@ sub create {
     $args{name} = $name;
     $args{class} = $class;
 
+    %args = $self->canonicalize_args($name, %args);
     $self->validate_args($name, %args);
 
     $args{type_constraint} = delete $args{isa}
@@ -222,11 +208,37 @@ sub create {
     return $attribute;
 }
 
+sub canonicalize_args {
+    my $self = shift;
+    my $name = shift;
+    my %args = @_;
+
+    if ($args{lazy_build}) {
+        $args{lazy}      = 1;
+        $args{required}  = 1;
+        $args{builder}   = "_build_${name}"
+            if !exists($args{builder});
+        if ($name =~ /^_/) {
+            $args{clearer}   = "_clear${name}" if !exists($args{clearer});
+            $args{predicate} = "_has${name}" if !exists($args{predicate});
+        }
+        else {
+            $args{clearer}   = "clear_${name}" if !exists($args{clearer});
+            $args{predicate} = "has_${name}" if !exists($args{predicate});
+        }
+    }
+
+    return %args;
+}
+
 sub validate_args {
     my $self = shift;
     my $name = shift;
     my %args = @_;
 
+    confess "You can not use lazy_build and default for the same attribute ($name)"
+        if $args{lazy_build} && exists $args{default};
+
     confess "You cannot have lazy attribute ($name) without specifying a default value for it"
         if $args{lazy} && !exists($args{default}) && !exists($args{builder});
 
@@ -369,6 +381,8 @@ installed. Some error checking is done.
 
 =head2 has_builder -> Bool
 
+=head2 is_lazy_build => Bool
+
 =head2 should_auto_deref -> Bool
 
 Informational methods.
@@ -399,5 +413,25 @@ this attribute's type constraint;
 Checks that the given value passes this attribute's type constraint. Returns 1
 on success, otherwise C<confess>es.
 
+=head2 canonicalize_args Name, %args -> %args
+
+Canonicalizes some arguments to create. In particular, C<lazy_build> is
+canonicalized into C<lazy>, C<builder>, etc.
+
+=head2 validate_args Name, %args -> 1 | ERROR
+
+Checks that the arguments to create the attribute (ie those specified by
+C<has>) are valid.
+
+=head2 clone_parent OwnerClass, AttributeName, %args -> Mouse::Meta::Attribute
+
+Creates a new attribute in OwnerClass, inheriting options from parent classes.
+Accessors and helper methods are installed. Some error checking is done.
+
+=head2 get_parent_args OwnerClass, AttributeName -> Hash
+
+Returns the options that the parent class of C<OwnerClass> used for attribute
+C<AttributeName>.
+
 =cut