simplification of code, fixes #45260 and makes behavior same as Moose attributes

[gitmo/MooseX-ClassAttribute.git] / lib / MooseX / ClassAttribute / Trait / Attribute.pm

diff --git a/lib/MooseX/ClassAttribute/Trait/Attribute.pm b/lib/MooseX/ClassAttribute/Trait/Attribute.pm
index 7fe6a89..01b25da 100644 (file)
--- a/lib/MooseX/ClassAttribute/Trait/Attribute.pm
+++ b/lib/MooseX/ClassAttribute/Trait/Attribute.pm
@@ -3,8 +3,6 @@ package MooseX::ClassAttribute::Trait::Attribute;
 use strict;
 use warnings;
 
-use MooseX::ClassAttribute::Meta::Method::Accessor;
-
 use namespace::autoclean;
 use Moose::Role;
 
@@ -12,10 +10,6 @@ use Moose::Role;
 # because it overrides a lot of behavior. However, as a subclass it
 # won't cooperate with _other_ subclasses.
 
-around 'accessor_metaclass' => sub {
-    return 'MooseX::ClassAttribute::Meta::Method::Accessor';
-};
-
 around '_process_options' => sub {
     my $orig    = shift;
     my $class   = shift;
@@ -28,75 +22,36 @@ around '_process_options' => sub {
     return $class->$orig( $name, $options );
 };
 
-around attach_to_class => sub {
+around 'attach_to_class' => sub {
     my $orig = shift;
     my $self = shift;
     my $meta = shift;
 
     $self->$orig($meta);
-
-    $self->_initialize($meta)
-        unless $self->is_lazy();
+    $self->initialize_instance_slot($meta, $meta->name);
 };
 
-around 'detach_from_class' => sub {
-    my $orig = shift;
-    my $self = shift;
-    my $meta = shift;
-
-    $self->clear_value($meta);
-
-    $self->$orig($meta);
+override set_initial_value => sub {
+    my ($self, $instance, $value) = @_;
+    $self->_set_initial_slot_value(
+        $self,
+        $instance,
+        $value
+    );
 };
 
-sub _initialize {
-    my $self      = shift;
-    my $metaclass = shift;
 
-    if ( $self->has_default() ) {
-        $self->set_value( undef, $self->default() );
-    }
-    elsif ( $self->has_builder() ) {
-        $self->set_value( undef, $self->_call_builder( $metaclass->name() ) );
-    }
-}
-
-around 'default' => sub {
-    my $orig = shift;
-    my $self = shift;
-
-    my $default = $self->$orig();
-
-    if ( $self->is_default_a_coderef() ) {
-        return $default->( $self->associated_class() );
-    }
-
-    return $default;
+before 'detach_from_class' => sub {
+    shift->clear_value(shift);
 };
 
-around '_call_builder' => sub {
-    shift;
-    my $self  = shift;
-    my $class = shift;
-
-    my $builder = $self->builder();
-
-    return $class->$builder()
-        if $class->can( $self->builder );
-
-    confess(  "$class does not support builder method '"
-            . $self->builder
-            . "' for attribute '"
-            . $self->name
-            . "'" );
-};
+sub set_slot_value { $_[0]->set_value($_[0], $_[3]) }
 
 around 'set_value' => sub {
     shift;
     my $self = shift;
     shift;    # ignoring instance or class name
     my $value = shift;
-
     $self->associated_class()
         ->set_class_attribute_value( $self->name() => $value );
 };
@@ -125,6 +80,53 @@ around 'clear_value' => sub {
         ->clear_class_attribute_value( $self->name() );
 };
 
+override '_inline_instance_get' => sub {
+    my $self = shift;
+
+    return $self->associated_class()
+        ->inline_get_class_slot_value( $self->slots() );
+};
+
+
+override '_inline_weaken_value' => sub {
+    my $self = shift;
+    my ($instance, $value) = @_;
+    return unless $self->is_weak_ref;
+
+    my $mi = $self->associated_class->get_meta_instance;
+    return (
+        $self->associated_class->inline_weaken_class_slot_value( $self->slots(), $value ),
+            'if ref ' . $value . ';',
+    );
+};
+
+override '_inline_instance_set' => sub {
+    my $self  = shift;
+    shift;
+    my $value = shift;
+
+    my $meta = $self->associated_class();
+
+    my $code
+        = $meta->inline_set_class_slot_value( $self->slots(), $value ) . ";";
+
+    return $code;
+};
+
+override '_inline_instance_has' => sub {
+    my $self = shift;
+
+    return $self->associated_class()
+        ->inline_is_class_slot_initialized( $self->slots() );
+};
+
+override '_inline_clear_value' => sub {
+    my $self = shift;
+
+    return $self->associated_class()
+        ->inline_deinitialize_class_slot( $self->slots() );
+};
+
 1;
 
 # ABSTRACT: A trait for class attributes