X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FAttribute.pm;h=479c43c945ca0203c5363fe0fb73989d0fe3037a;hb=2b9094e8e533f1635eae1481eef711828f521508;hp=733c1293dda74746f6eeb0aa213c66150cc961d8;hpb=45959ffa208c3156f08f985f42b814fce8559283;p=gitmo%2FMouse.git

diff --git a/lib/Mouse/Meta/Attribute.pm b/lib/Mouse/Meta/Attribute.pm
index 733c129..479c43c 100644
--- a/lib/Mouse/Meta/Attribute.pm
+++ b/lib/Mouse/Meta/Attribute.pm
@@ -2,42 +2,42 @@
 package Mouse::Meta::Attribute;
 use strict;
 use warnings;
+require overload;
 
 use Carp 'confess';
-use Scalar::Util 'blessed';
+require Mouse::Util;
 
 sub new {
     my $class = shift;
     my %args  = @_;
 
-    $args{init_arg} = $args{name}
+    my $name = $args{name};
+
+    $args{init_arg} = $name
         unless exists $args{init_arg};
 
     $args{is} ||= '';
 
-    if ( $args{lazy_build} ) {
-        $args{lazy} = 1;
-        $args{builder} ||= "_build_$args{name}";
-    }
-
     bless \%args, $class;
 }
 
-sub name              { $_[0]->{name}            }
-sub class             { $_[0]->{class}           }
-sub _is_metadata      { $_[0]->{is}              }
-sub is_required       { $_[0]->{required}        }
-sub default           { $_[0]->{default}         }
-sub is_lazy           { $_[0]->{lazy}            }
-sub predicate         { $_[0]->{predicate}       }
-sub clearer           { $_[0]->{clearer}         }
-sub handles           { $_[0]->{handles}         }
-sub is_weak_ref       { $_[0]->{weak_ref}        }
-sub init_arg          { $_[0]->{init_arg}        }
-sub type_constraint   { $_[0]->{type_constraint} }
-sub trigger           { $_[0]->{trigger}         }
-sub builder           { $_[0]->{builder}         }
-sub should_auto_deref { $_[0]->{auto_deref}      }
+sub name              { $_[0]->{name}             }
+sub associated_class  { $_[0]->{associated_class} }
+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}          }
+sub is_weak_ref       { $_[0]->{weak_ref}         }
+sub init_arg          { $_[0]->{init_arg}         }
+sub type_constraint   { $_[0]->{type_constraint}  }
+sub trigger           { $_[0]->{trigger}          }
+sub builder           { $_[0]->{builder}          }
+sub should_auto_deref { $_[0]->{auto_deref}       }
+sub should_coerce     { $_[0]->{should_coerce}    }
 
 sub has_default         { exists $_[0]->{default}         }
 sub has_predicate       { exists $_[0]->{predicate}       }
@@ -52,94 +52,119 @@ sub _create_args {
     $_[0]->{_create_args}
 }
 
+sub inlined_name {
+    my $self = shift;
+    my $name = $self->name;
+    my $key   = "'" . $name . "'";
+    return $key;
+}
+
 sub generate_accessor {
     my $attribute = shift;
 
-    my $name       = $attribute->name;
-    my $key        = $name;
-    my $default    = $attribute->default;
-    my $trigger    = $attribute->trigger;
-    my $type       = $attribute->type_constraint;
-    my $constraint = $attribute->find_type_constraint;
-    my $builder    = $attribute->builder;
+    my $name          = $attribute->name;
+    my $default       = $attribute->default;
+    my $type          = $attribute->type_constraint;
+    my $constraint    = $attribute->find_type_constraint;
+    my $builder       = $attribute->builder;
+    my $trigger       = $attribute->trigger;
+    my $is_weak       = $attribute->is_weak_ref;
+    my $should_deref  = $attribute->should_auto_deref;
+    my $should_coerce = $attribute->should_coerce;
 
-    my $accessor = 'sub {
-        my $self = shift;';
+    my $self  = '$_[0]';
+    my $key   = $attribute->inlined_name;
 
+    my $accessor = "sub {\n";
     if ($attribute->_is_metadata eq 'rw') {
-        $accessor .= 'if (@_) {
-            local $_ = $_[0];';
+        $accessor .= 'if (scalar(@_) >= 2) {' . "\n";
+
+        my $value = '$_[1]';
 
         if ($constraint) {
-            $accessor .= 'do {
-                my $display = defined($_) ? overload::StrVal($_) : "undef";
-                Carp::confess("Attribute ($name) does not pass the type constraint because: Validation failed for \'$type\' failed with value $display") unless $constraint->();
-            };'
+            if ($should_coerce) {
+                $accessor .= $value.' = $attribute->coerce_constraint('.$value.');';
+            }
+            $accessor .= 'local $_ = '.$value.';';
+            $accessor .= '
+                unless ($constraint->()) {
+                    my $display = defined($_) ? overload::StrVal($_) : "undef";
+                    Carp::confess("Attribute ($name) does not pass the type constraint because: Validation failed for \'$type\' failed with value $display");
+            }' . "\n"
         }
 
-        $accessor .= '$self->{$key} = $_;';
+        # if there's nothing left to do for the attribute we can return during
+        # this setter
+        $accessor .= 'return ' if !$is_weak && !$trigger && !$should_deref;
+
+        $accessor .= $self.'->{'.$key.'} = '.$value.';' . "\n";
 
-        if ($attribute->is_weak_ref) {
-            $accessor .= 'Scalar::Util::weaken($self->{$key}) if ref($self->{$key});';
+        if ($is_weak) {
+            $accessor .= 'Mouse::Util::weaken('.$self.'->{'.$key.'}) if ref('.$self.'->{'.$key.'});' . "\n";
         }
 
         if ($trigger) {
-            $accessor .= '$trigger->($self, $_, $attribute);';
+            $accessor .= '$trigger->('.$self.', '.$value.', $attribute);' . "\n";
         }
 
-        $accessor .= '}';
+        $accessor .= "}\n";
     }
     else {
-        $accessor .= 'confess "Cannot assign a value to a read-only accessor" if @_;';
+        $accessor .= 'confess "Cannot assign a value to a read-only accessor" if scalar(@_) >= 2;' . "\n";
     }
 
     if ($attribute->is_lazy) {
-        $accessor .= '$self->{$key} = ';
+        $accessor .= $self.'->{'.$key.'} = ';
 
         $accessor .= $attribute->has_builder
-                   ? '$self->$builder'
-                     : ref($default) eq 'CODE'
-                     ? '$default->($self)'
-                     : '$default';
-
-        $accessor .= ' if !exists($self->{$key});';
+                ? $self.'->$builder'
+                    : ref($default) eq 'CODE'
+                    ? '$default->('.$self.')'
+                    : '$default';
+        $accessor .= ' if !exists '.$self.'->{'.$key.'};' . "\n";
     }
 
-    if ($attribute->should_auto_deref) {
+    if ($should_deref) {
         if ($attribute->type_constraint eq 'ArrayRef') {
             $accessor .= 'if (wantarray) {
-                return @{ $self->{$key} || [] };
+                return @{ '.$self.'->{'.$key.'} || [] };
             }';
         }
         else {
             $accessor .= 'if (wantarray) {
-                return %{ $self->{$key} || {} };
+                return %{ '.$self.'->{'.$key.'} || {} };
             }';
         }
     }
 
-    $accessor .= 'return $self->{$key};
+    $accessor .= 'return '.$self.'->{'.$key.'};
     }';
 
-    return eval $accessor;
+    my $sub = eval $accessor;
+    confess $@ if $@;
+    return $sub;
 }
 
 sub generate_predicate {
     my $attribute = shift;
-    my $key = $attribute->name;
+    my $key = $attribute->inlined_name;
 
-    my $predicate = 'sub { exists($_[0]->{$key}) }';
+    my $predicate = 'sub { exists($_[0]->{'.$key.'}) }';
 
-    return eval $predicate;
+    my $sub = eval $predicate;
+    confess $@ if $@;
+    return $sub;
 }
 
 sub generate_clearer {
     my $attribute = shift;
-    my $key = $attribute->name;
+    my $key = $attribute->inlined_name;
 
-    my $predicate = 'sub { delete($_[0]->{$key}) }';
+    my $clearer = 'sub { delete($_[0]->{'.$key.'}) }';
 
-    return eval $predicate;
+    my $sub = eval $clearer;
+    confess $@ if $@;
+    return $sub;
 }
 
 sub generate_handles {
@@ -158,6 +183,7 @@ sub generate_handles {
         }';
 
         $method_map{$local_method} = eval $method;
+        confess $@ if $@;
     }
 
     return \%method_map;
@@ -167,25 +193,27 @@ sub create {
     my ($self, $class, $name, %args) = @_;
 
     $args{name} = $name;
-    $args{class} = $class;
+    $args{associated_class} = $class;
+
+    %args = $self->canonicalize_args($name, %args);
+    $self->validate_args($name, \%args);
 
-    $self->validate_args($name, %args);
+    $args{should_coerce} = delete $args{coerce}
+        if exists $args{coerce};
 
     $args{type_constraint} = delete $args{isa}
         if exists $args{isa};
 
     my $attribute = $self->new(%args);
-    $attribute->_create_args(\%args);
 
-    my $meta = $class->meta;
+    $attribute->_create_args(\%args);
 
-    $meta->add_attribute($attribute);
+    $class->add_attribute($attribute);
 
     # install an accessor
     if ($attribute->_is_metadata eq 'rw' || $attribute->_is_metadata eq 'ro') {
         my $accessor = $attribute->generate_accessor;
-        no strict 'refs';
-        *{ $class . '::' . $name } = $accessor;
+        $class->add_method($name => $accessor);
     }
 
     for my $method (qw/predicate clearer/) {
@@ -193,41 +221,76 @@ sub create {
         if ($attribute->$predicate) {
             my $generator = "generate_$method";
             my $coderef = $attribute->$generator;
-            no strict 'refs';
-            *{ $class . '::' . $attribute->$method } = $coderef;
+            $class->add_method($attribute->$method => $coderef);
         }
     }
 
     if ($attribute->has_handles) {
         my $method_map = $attribute->generate_handles;
         for my $method_name (keys %$method_map) {
-            no strict 'refs';
-            *{ $class . '::' . $method_name } = $method_map->{$method_name};
+            $class->add_method($method_name => $method_map->{$method_name});
         }
     }
 
     return $attribute;
 }
 
-sub validate_args {
+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 = shift;
+
+    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});
+        if $args->{lazy}
+        && !exists($args->{default})
+        && !exists($args->{builder});
 
     confess "References are not allowed as default values, you must wrap the default of '$name' in a CODE reference (ex: sub { [] } and not [])"
-        if ref($args{default})
-        && ref($args{default}) ne 'CODE';
+        if ref($args->{default})
+        && ref($args->{default}) ne 'CODE';
 
-    confess "You cannot auto-dereference without specifying a type constraint on attribute $name"
-        if $args{auto_deref} && !exists($args{isa});
+    confess "You cannot auto-dereference without specifying a type constraint on attribute ($name)"
+        if $args->{auto_deref} && !exists($args->{isa});
 
-    confess "You cannot auto-dereference anything other than a ArrayRef or HashRef on attribute $name"
-        if $args{auto_deref}
-        && $args{isa} ne 'ArrayRef'
-        && $args{isa} ne 'HashRef';
+    confess "You cannot auto-dereference anything other than a ArrayRef or HashRef on attribute ($name)"
+        if $args->{auto_deref}
+        && $args->{isa} ne 'ArrayRef'
+        && $args->{isa} ne 'HashRef';
+
+    if ($args->{trigger}) {
+        if (ref($args->{trigger}) eq 'HASH') {
+            Carp::carp "HASH-based form of trigger has been removed. Only the coderef form of triggers are now supported.";
+        }
+
+        confess "Trigger must be a CODE ref on attribute ($name)"
+            if ref($args->{trigger}) ne 'CODE';
+    }
 
     return 1;
 }
@@ -238,10 +301,10 @@ sub find_type_constraint {
 
     return unless $type;
 
-    my $checker = Mouse::TypeRegistry->optimized_constraints->{$type};
+    my $checker = Mouse::TypeRegistry->optimized_constraints()->{$type};
     return $checker if $checker;
 
-    return sub { blessed($_) && blessed($_) eq $type };
+    return sub { Mouse::Util::blessed($_) && Mouse::Util::blessed($_) eq $type };
 }
 
 sub verify_type_constraint {
@@ -259,6 +322,13 @@ sub verify_type_constraint {
     Carp::confess("Attribute ($name) does not pass the type constraint because: Validation failed for \'$type\' failed with value $display");
 }
 
+sub coerce_constraint {
+    my($self, $value) = @_;
+    my $type = $self->type_constraint
+        or return $value;
+    return Mouse::TypeRegistry->typecast_constraints($self->associated_class->name, $type, $value);
+}
+
 sub _canonicalize_handles {
     my $self    = shift;
     my $handles = shift;
@@ -288,8 +358,8 @@ sub get_parent_args {
     my $class = shift;
     my $name  = shift;
 
-    for my $super ($class->meta->linearized_isa) {
-        my $super_attr = $super->meta->get_attribute($name)
+    for my $super ($class->linearized_isa) {
+        my $super_attr = $super->can("meta") && $super->meta->get_attribute($name)
             or next;
         return %{ $super_attr->_create_args };
     }
@@ -318,7 +388,7 @@ installed. Some error checking is done.
 
 =head2 name -> AttributeName
 
-=head2 class -> OwnerClass
+=head2 associated_class -> OwnerClass
 
 =head2 is_required -> Bool
 
@@ -356,6 +426,8 @@ installed. Some error checking is done.
 
 =head2 has_builder -> Bool
 
+=head2 is_lazy_build => Bool
+
 =head2 should_auto_deref -> Bool
 
 Informational methods.
@@ -386,5 +458,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