X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FAttribute.pm;h=9110900f6a4fa9457529cfd24010732780f2a694;hb=823419c540f9e77090f31f11e04b14477c0372c4;hp=a66fb320c78a580186518ee1b7a61cdfb08d53e3;hpb=3b48bcc824fb6cfa90f907cf4d83e01c224a72dd;p=gitmo%2FMouse.git

diff --git a/lib/Mouse/Meta/Attribute.pm b/lib/Mouse/Meta/Attribute.pm
index a66fb32..9110900 100644
--- a/lib/Mouse/Meta/Attribute.pm
+++ b/lib/Mouse/Meta/Attribute.pm
@@ -16,6 +16,7 @@ my %valid_options = map { $_ => undef } (
   'does',
   'handles',
   'init_arg',
+  'insertion_order',
   'is',
   'isa',
   'lazy',
@@ -37,24 +38,20 @@ my %valid_options = map { $_ => undef } (
   # Moose defines, but Mouse doesn't
   #'definition_context',
   #'initializer',
-  #'insertion_order',
 
   # special case for AttributeHelpers
   'provides',
   'curries',
 );
 
+our @CARP_NOT = qw(Mouse::Meta::Class);
+
 sub new {
     my $class = shift;
     my $name  = shift;
 
     my $args  = $class->Mouse::Object::BUILDARGS(@_);
 
-    # XXX: for backward compatibility (with method modifiers)
-    if($class->can('canonicalize_args') != \&canonicalize_args){
-        %{$args} = $class->canonicalize_args($name, %{$args});
-    }
-
     $class->_process_options($name, $args);
 
     $args->{name} = $name;
@@ -76,10 +73,9 @@ sub new {
 
     # (3) bad options found
     if(@bad){
-        @bad = sort @bad;
-        local $Carp::Internal{'Mouse'}              = 1;
-        local $Carp::Internal{'Mouse::Meta::Class'} = 1;
-        Carp::carp("Found unknown argument(s) passed to '$name' attribute constructor in '$class': @bad");
+        Carp::carp(
+            "Found unknown argument(s) passed to '$name' attribute constructor in '$class': "
+            . Mouse::Util::english_list(@bad));
     }
 
     my $self = bless $args, $class;
@@ -95,11 +91,6 @@ sub new {
 sub has_read_method      { $_[0]->has_reader || $_[0]->has_accessor }
 sub has_write_method     { $_[0]->has_writer || $_[0]->has_accessor }
 
-sub _create_args { # DEPRECATED
-    $_[0]->{_create_args} = $_[1] if @_ > 1;
-    $_[0]->{_create_args}
-}
-
 sub interpolate_class{
     my($class, $args) = @_;
 
@@ -134,27 +125,9 @@ sub interpolate_class{
     return( $class, @traits );
 }
 
-sub canonicalize_args{ # DEPRECATED
-    my ($self, $name, %args) = @_;
-
-    Carp::cluck("$self->canonicalize_args has been deprecated."
-        . "Use \$self->_process_options instead.");
-
-    return %args;
-}
-
-sub create { # DEPRECATED
-    my ($self, $class, $name, %args) = @_;
-
-    Carp::cluck("$self->create has been deprecated."
-        . "Use \$meta->add_attribute and \$attr->install_accessors instead.");
-
-    # noop
-    return $self;
-}
-
 sub _coerce_and_verify {
-    my($self, $value, $instance) = @_;
+    #my($self, $value, $instance) = @_;
+    my($self, $value) = @_;
 
     my $type_constraint = $self->{type_constraint};
     return $value if !defined $type_constraint;
@@ -188,20 +161,29 @@ sub _throw_type_constraint_error {
     );
 }
 
+sub illegal_options_for_inheritance {
+    return qw(reader writer accessor clearer predicate);
+}
+
 sub clone_and_inherit_options{
     my $self = shift;
     my $args = $self->Mouse::Object::BUILDARGS(@_);
 
-    my($attribute_class, @traits) = ref($self)->interpolate_class($args);
+    foreach my $illegal($self->illegal_options_for_inheritance) {
+        if(exists $args->{$illegal} and exists $self->{$illegal}) {
+            $self->throw_error("Illegal inherited option: $illegal");
+        }
+    }
 
-    $args->{traits} = \@traits if @traits;
-    # do not inherit the 'handles' attribute
     foreach my $name(keys %{$self}){
-        if(!exists $args->{$name} && $name ne 'handles'){
-            $args->{$name} = $self->{$name};
+        if(!exists $args->{$name}){
+            $args->{$name} = $self->{$name}; # inherit from self
         }
     }
 
+    my($attribute_class, @traits) = ref($self)->interpolate_class($args);
+    $args->{traits} = \@traits if @traits;
+
     # remove temporary caches
     foreach my $attr(keys %{$args}){
         if($attr =~ /\A _/xms){
@@ -209,36 +191,14 @@ sub clone_and_inherit_options{
         }
     }
 
-    return $attribute_class->new($self->name, $args);
-}
-
-sub clone_parent { # DEPRECATED
-    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->clone_and_inherited_args($class, $name, %args);
-}
-
-sub get_parent_args { # DEPRECATED
-    my $self  = shift;
-    my $class = shift;
-    my $name  = shift;
-
-    for my $super ($class->linearized_isa) {
-        my $super_attr = $super->can("meta") && $super->meta->get_attribute($name)
-            or next;
-        return %{ $super_attr->_create_args };
+    # remove default if lazy_build => 1
+    if($args->{lazy_build}) {
+        delete $args->{default};
     }
 
-    $self->throw_error("Could not find an attribute by the name of '$name' to inherit from");
+    return $attribute_class->new($self->name, $args);
 }
 
-
 sub get_read_method {
     return $_[0]->reader || $_[0]->accessor
 }
@@ -299,7 +259,8 @@ sub clear_value {
 
 
 sub associate_method{
-    my ($attribute, $method_name) = @_;
+    #my($attribute, $method_name) = @_;
+    my($attribute) = @_;
     $attribute->{associated_methods}++;
     return;
 }
@@ -324,6 +285,10 @@ sub install_accessors{
         my %handles = $attribute->_canonicalize_handles($attribute->{handles});
 
         while(my($handle, $method_to_call) = each %handles){
+            if($metaclass->has_method($handle)) {
+                $attribute->throw_error("You cannot overwrite a locally defined method ($handle) with a delegation");
+            }
+
             $metaclass->add_method($handle =>
                 $attribute->_make_delegation_method(
                     $handle, $method_to_call));
@@ -332,15 +297,12 @@ sub install_accessors{
         }
     }
 
-    if($attribute->can('create') != \&create){
-        # backword compatibility
-        $attribute->create($metaclass, $attribute->name, %{$attribute});
-    }
-
     return;
 }
 
-sub delegation_metaclass() { 'Mouse::Meta::Method::Delegation' }
+sub delegation_metaclass() { ## no critic
+    'Mouse::Meta::Method::Delegation'
+}
 
 sub _canonicalize_handles {
     my($self, $handles) = @_;
@@ -378,13 +340,6 @@ sub _make_delegation_method {
         ->_generate_delegation($self, $handle, $method_to_call);
 }
 
-sub throw_error{
-    my $self = shift;
-
-    my $metaclass = (ref $self && $self->associated_class) || 'Mouse::Meta::Class';
-    $metaclass->throw_error(@_, depth => 1);
-}
-
 1;
 __END__
 
@@ -394,7 +349,12 @@ Mouse::Meta::Attribute - The Mouse attribute metaclass
 
 =head1 VERSION
 
-This document describes Mouse version 0.50_03
+This document describes Mouse version 0.70
+
+=head1 DESCRIPTION
+
+This is a meta object protocol for Mouse attributes,
+which is a subset of Moose::Meta::Attribute.
 
 =head1 METHODS