X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FAttribute.pm;h=8511bc2054933aeebf6ddd371e1f4340830176bf;hp=77d935a03711d566f57d795db5a413d1b4c6ddab;hb=1b9e472d8c7e704eced9b2ea83194f83f0265018;hpb=7b133c927969b2e9233a51c6be5caed54c88915e

diff --git a/lib/Mouse/Meta/Attribute.pm b/lib/Mouse/Meta/Attribute.pm
index 77d935a..8511bc2 100644
--- a/lib/Mouse/Meta/Attribute.pm
+++ b/lib/Mouse/Meta/Attribute.pm
@@ -2,29 +2,168 @@ package Mouse::Meta::Attribute;
 use strict;
 use warnings;
 
+use Carp ();
+use Scalar::Util qw(weaken);
+
+use Mouse::Util;
+
 use Mouse::Meta::TypeConstraint;
 use Mouse::Meta::Method::Accessor;
 
+sub BUILDARGS{
+    my $class = shift;
+    my $name  = shift;
+    my %args  = (@_ == 1) ? %{$_[0]} : @_;
+
+    $args{name} = $name;
+
+    # XXX: for backward compatibility (with method modifiers)
+    if($class->can('canonicalize_args') != \&canonicalize_args){
+        %args = $class->canonicalize_args($name, %args);
+    }
+
+    return \%args;
+}
+
 sub new {
-    my ($class, $name, %options) = @_;
+    my $class = shift;
+    my $args  = $class->BUILDARGS(@_);
 
-    $options{name} = $name;
+    my $name = $args->{name};
 
-    $options{init_arg} = $name
-        unless exists $options{init_arg};
+    # taken from Class::MOP::Attribute::new
 
-    my $is = $options{is} ||= '';
+    defined($name)
+        or $class->throw_error('You must provide a name for the attribute');
 
-    if($is eq 'rw'){
-        $options{accessor} = $name if !exists $options{accessor};
+    if(!exists $args->{init_arg}){
+        $args->{init_arg} = $name;
     }
-    elsif($is eq 'ro'){
-        $options{reader}   = $name if !exists $options{reader};
+
+    # 'required' requires eigher 'init_arg', 'builder', or 'default'
+    my $can_be_required = defined( $args->{init_arg} );
+
+    if(exists $args->{builder}){
+        $class->throw_error('builder must be a defined scalar value which is a method name')
+            if ref $args->{builder} || !(defined $args->{builder});
+
+        $can_be_required++;
+    }
+    elsif(exists $args->{default}){
+        if(ref $args->{default} && ref($args->{default}) ne 'CODE'){
+            $class->throw_error("References are not allowed as default values, you must "
+                              . "wrap the default of '$name' in a CODE reference (ex: sub { [] } and not [])");
+        }
+        $can_be_required++;
+    }
+
+    if( $args->{required} && !$can_be_required ) {
+        $class->throw_error("You cannot have a required attribute ($name) without a default, builder, or an init_arg");
     }
 
-    bless \%options, $class;
+    # taken from Mouse::Meta::Attribute->new and _process_args->
+
+    if(exists $args->{is}){
+        my $is = $args->{is};
+
+        if($is eq 'ro'){
+            $args->{reader} ||= $name;
+        }
+        elsif($is eq 'rw'){
+            if(exists $args->{writer}){
+                $args->{reader} ||= $name;
+             }
+             else{
+                $args->{accessor} ||= $name;
+             }
+        }
+        elsif($is eq 'bare'){
+            # do nothing, but don't complain (later) about missing methods
+        }
+        else{
+            $is = 'undef' if !defined $is;
+            $class->throw_error("I do not understand this option (is => $is) on attribute ($name)");
+        }
+    }
+
+    my $tc;
+    if(exists $args->{isa}){
+        $args->{type_constraint} = Mouse::Util::TypeConstraints::find_or_create_isa_type_constraint($args->{isa});
+    }
+    elsif(exists $args->{does}){
+        $args->{type_constraint} = Mouse::Util::TypeConstraints::find_or_create_does_type_constraint($args->{does});
+    }
+    $tc = $args->{type_constraint};
+
+    if($args->{coerce}){
+        defined($tc)
+            || $class->throw_error("You cannot have coercion without specifying a type constraint on attribute ($name)");
+
+        $args->{weak_ref}
+            && $class->throw_error("You cannot have a weak reference to a coerced value on attribute ($name)");
+    }
+
+    if ($args->{lazy_build}) {
+        exists($args->{default})
+            && $class->throw_error("You can not use lazy_build and default for the same attribute ($name)");
+
+        $args->{lazy}      = 1;
+        $args->{builder} ||= "_build_${name}";
+        if ($name =~ /^_/) {
+            $args->{clearer}   ||= "_clear${name}";
+            $args->{predicate} ||= "_has${name}";
+        }
+        else {
+            $args->{clearer}   ||= "clear_${name}";
+            $args->{predicate} ||= "has_${name}";
+        }
+    }
+
+    if ($args->{auto_deref}) {
+        defined($tc)
+            || $class->throw_error("You cannot auto-dereference without specifying a type constraint on attribute ($name)");
+
+        ( $tc->is_a_type_of('ArrayRef') || $tc->is_a_type_of('HashRef') )
+            || $class->throw_error("You cannot auto-dereference anything other than a ArrayRef or HashRef on attribute ($name)");
+    }
+
+    if (exists $args->{trigger}) {
+        ('CODE' eq ref $args->{trigger})
+            || $class->throw_error("Trigger must be a CODE ref on attribute ($name)");
+    }
+
+    if ($args->{lazy}) {
+        (exists $args->{default} || defined $args->{builder})
+            || $class->throw_error("You cannot have lazy attribute ($name) without specifying a default value for it");
+    }
+
+    my $instance = bless $args, $class;
+
+    # extra attributes
+    if($class ne __PACKAGE__){
+        $class->meta->_initialize_instance($instance, $args);
+    }
+
+# XXX: there is no fast way to check attribute validity
+#    my @bad = ...;
+#    if(@bad){
+#        @bad = sort @bad;
+#        Carp::cluck("Found unknown argument(s) passed to '$name' attribute constructor in '$class': @bad");
+#    }
+
+    return $instance
 }
 
+sub does {
+    my ($self, $role_name) = @_;
+    my $meta = Mouse::Meta::Class->initialize(ref($self) || $self);
+
+    (defined $role_name)
+        || $meta->throw_error("You must supply a role name to does()");
+
+    return $meta->does_role($role_name);
+};
+
 # readers
 
 sub name                 { $_[0]->{name}                   }
@@ -45,14 +184,14 @@ sub is_lazy_build        { $_[0]->{lazy_build}             }
 sub is_weak_ref          { $_[0]->{weak_ref}               }
 sub init_arg             { $_[0]->{init_arg}               }
 sub type_constraint      { $_[0]->{type_constraint}        }
-sub find_type_constraint {
-    Carp::carp("This method was deprecated");
-    $_[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 should_coerce        { $_[0]->{coerce}                 }
+
+sub get_read_method      { $_[0]->{reader} || $_[0]->{accessor} }
+sub get_write_method     { $_[0]->{writer} || $_[0]->{accessor} }
 
 # predicates
 
@@ -68,6 +207,9 @@ sub has_type_constraint  { exists $_[0]->{type_constraint} }
 sub has_trigger          { exists $_[0]->{trigger}         }
 sub has_builder          { exists $_[0]->{builder}         }
 
+sub has_read_method      { exists $_[0]->{reader} || exists $_[0]->{accessor} }
+sub has_write_method     { exists $_[0]->{writer} || exists $_[0]->{accessor} }
+
 sub _create_args {
     $_[0]->{_create_args} = $_[1] if @_ > 1;
     $_[0]->{_create_args}
@@ -75,105 +217,59 @@ sub _create_args {
 
 sub accessor_metaclass { 'Mouse::Meta::Method::Accessor' }
 
-sub create {
-    my ($self, $class, $name, %args) = @_;
-
-    $args{name}             = $name;
-    $args{associated_class} = $class;
+sub interpolate_class_and_new{
+    my($class, $name, $args) = @_;
 
-    %args = $self->canonicalize_args($name, %args);
-    $self->validate_args($name, \%args);
-
-    $args{should_coerce} = delete $args{coerce}
-        if exists $args{coerce};
-
-    if (exists $args{isa}) {
-        my $type_constraint = delete $args{isa};
-        $args{type_constraint}= Mouse::Util::TypeConstraints::find_or_create_isa_type_constraint($type_constraint);
+    if(my $metaclass = delete $args->{metaclass}){
+        $class = Mouse::Util::resolve_metaclass_alias( Attribute => $metaclass );
     }
 
-    my $attribute = $self->new($name, %args);
 
-    $attribute->_create_args(\%args);
+    if(my $traits_ref = delete $args->{traits}){
+        my @traits;
+        for (my $i = 0; $i < @{$traits_ref}; $i++) {
+            my $trait = Mouse::Util::resolve_metaclass_alias(Attribute => $traits_ref->[$i], trait => 1);
 
-    $class->add_attribute($attribute);
+            next if $class->does($trait);
 
-    my $associated_methods = 0;
+            push @traits, $trait;
 
-    my $generator_class = $self->accessor_metaclass;
-    foreach my $type(qw(accessor reader writer predicate clearer handles)){
-        if(exists $attribute->{$type}){
-            my $installer    = '_install_' . $type;
-            $generator_class->$installer($attribute, $attribute->{$type}, $class);
-            $associated_methods++;
+            # are there options?
+            push @traits, $traits_ref->[++$i]
+                if ref($traits_ref->[$i+1]);
         }
-    }
 
-    if($associated_methods == 0 && ($attribute->_is_metadata || '') ne 'bare'){
-        Carp::cluck(qq{Attribute ($name) of class }.$class->name.qq{ has no associated methods (did you mean to provide an "is" argument?)});
+        if (@traits) {
+            $class = Mouse::Meta::Class->create_anon_class(
+                superclasses => [ $class ],
+                roles        => \@traits,
+                cache        => 1,
+            )->name;
 
+            $args->{traits} = \@traits;
+        }
     }
 
-    return $attribute;
+    return $class->new($name, $args);
 }
 
-sub canonicalize_args {
-    my $self = shift;
-    my $name = shift;
-    my %args = @_;
+sub canonicalize_args{
+    my ($self, $name, %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});
-        }
-    }
+    Carp::cluck("$self->canonicalize_args has been deprecated."
+        . "Use \$self->BUILDARGS instead.");
 
     return %args;
 }
 
-sub validate_args {
-    my $self = shift;
-    my $name = shift;
-    my $args = shift;
-
-    $self->throw_error("You can not use lazy_build and default for the same attribute ($name)")
-        if $args->{lazy_build} && exists $args->{default};
-
-    $self->throw_error("You cannot have lazy attribute ($name) without specifying a default value for it")
-        if $args->{lazy}
-        && !exists($args->{default})
-        && !exists($args->{builder});
-
-    $self->throw_error("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';
-
-    $self->throw_error("You cannot auto-dereference without specifying a type constraint on attribute ($name)")
-        if $args->{auto_deref} && !exists($args->{isa});
-
-    $self->throw_error("You cannot auto-dereference anything other than a ArrayRef or HashRef on attribute ($name)")
-        if $args->{auto_deref}
-        && $args->{isa} !~ /^(?:ArrayRef|HashRef)(?:\[.*\])?$/;
-
-    if ($args->{trigger}) {
-        if (ref($args->{trigger}) eq 'HASH') {
-            $self->throw_error("HASH-based form of trigger has been removed. Only the coderef form of triggers are now supported.");
-        }
+sub create {
+    my ($self, $class, $name, %args) = @_;
 
-        $self->throw_error("Trigger must be a CODE ref on attribute ($name)")
-            if ref($args->{trigger}) ne 'CODE';
-    }
+    Carp::cluck("$self->create has been deprecated."
+        . "Use \$meta->add_attribute and \$attr->install_accessors instead.");
 
-    return 1;
+    # noop
+    return $self;
 }
 
 sub verify_against_type_constraint {
@@ -213,12 +309,23 @@ sub _canonicalize_handles {
     }
 }
 
+sub clone_and_inherit_options{
+    my $self = shift;
+    my $name = shift;
+
+    return ref($self)->new($name, %{$self}, @_ == 1 ? %{$_[0]} : @_);
+}
+
 sub clone_parent {
     my $self  = shift;
     my $class = shift;
     my $name  = shift;
     my %args  = ($self->get_parent_args($class, $name), @_);
 
+    Carp::cluck("$self->clone_parent has been deprecated."
+        . "Use \$meta->add_attribute and \$attr->install_accessors instead.");
+
+
     $self->create($class, $name, %args);
 }
 
@@ -236,6 +343,27 @@ sub get_parent_args {
     $self->throw_error("Could not find an attribute by the name of '$name' to inherit from");
 }
 
+sub install_accessors{
+    my($attribute) = @_;
+
+    my $metaclass       = $attribute->{associated_class};
+    my $generator_class = $attribute->accessor_metaclass;
+
+    foreach my $type(qw(accessor reader writer predicate clearer handles)){
+        if(exists $attribute->{$type}){
+            my $installer    = '_install_' . $type;
+            $generator_class->$installer($attribute, $attribute->{$type}, $metaclass);
+            $attribute->{associated_methods}++;
+        }
+    }
+
+    if($attribute->can('create') != \&create){
+        $attribute->create($metaclass, $attribute->name, %{$attribute});
+    }
+
+    return;
+}
+
 sub throw_error{
     my $self = shift;