X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FAttribute%2FNative%2FTrait.pm;h=c3b92121240ac3480b8429677ad269ae5d2d680d;hb=a7821be5fbdedff67afce753d73c580ae5ada592;hp=311ee28c2a48b3f2af048133c551cbb147eb22cb;hpb=6d0815b59db07f71cdbfd978ed6f574e57e2b3ea;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Meta/Attribute/Native/Trait.pm b/lib/Moose/Meta/Attribute/Native/Trait.pm
index 311ee28..c3b9212 100644
--- a/lib/Moose/Meta/Attribute/Native/Trait.pm
+++ b/lib/Moose/Meta/Attribute/Native/Trait.pm
@@ -3,52 +3,22 @@ package Moose::Meta::Attribute::Native::Trait;
 use Moose::Role;
 use Moose::Util::TypeConstraints;
 
-our $VERSION   = '0.93';
+our $VERSION   = '1.14';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
 requires '_helper_type';
 
-# these next two are the possible methods you can use in the 'handles'
-# map.
-
-# provide a Class or Role which we can collect the method providers
-# from
-
-# or you can provide a HASH ref of anon subs yourself. This will also
-# collect and store the methods from a method_provider as well
-has 'method_constructors' => (
-    is      => 'ro',
-    isa     => 'HashRef',
-    lazy    => 1,
-    default => sub {
-        my $self = shift;
-        return +{} unless $self->has_method_provider;
-        # or grab them from the role/class
-        my $method_provider = $self->method_provider->meta;
-        return +{
-            map {
-                $_ => $method_provider->get_method($_)
-            } $method_provider->get_method_list
-        };
-    },
-);
-
-has '+default'         => ( required => 1 );
-has '+type_constraint' => ( required => 1 );
-
-# methods called prior to instantiation
-
 before '_process_options' => sub {
     my ( $self, $name, $options ) = @_;
 
     $self->_check_helper_type( $options, $name );
 
     $options->{is} = $self->_default_is
-        if ! exists $options->{is} && $self->can('_default_is');
+        if !exists $options->{is} && $self->can('_default_is');
 
     $options->{default} = $self->_default_default
-        if ! exists $options->{default} && $self->can('_default_default');
+        if !exists $options->{default} && $self->can('_default_default');
 };
 
 sub _check_helper_type {
@@ -67,8 +37,28 @@ sub _check_helper_type {
         "The type constraint for $name must be a subtype of $type but it's a $isa";
 }
 
+before 'install_accessors' => sub { (shift)->_check_handles_values };
+
+sub _check_handles_values {
+    my $self = shift;
+
+    my $method_constructors = $self->method_constructors;
+
+    my %handles = $self->_canonicalize_handles;
+
+    for my $original_method ( values %handles ) {
+        my $name = $original_method->[0];
+
+        my $accessor_class
+            = $self->_native_accessor_class_root . '::' . $name;
+
+        ( $accessor_class->can('new') || exists $method_constructors->{$name} )
+            || confess "$name is an unsupported method type";
+    }
+}
+
 around '_canonicalize_handles' => sub {
-    my $next    = shift;
+    shift;
     my $self    = shift;
     my $handles = $self->handles;
 
@@ -76,7 +66,7 @@ around '_canonicalize_handles' => sub {
 
     unless ( 'HASH' eq ref $handles ) {
         $self->throw_error(
-            "The 'handles' option must be a HASH reference, not $handles" );
+            "The 'handles' option must be a HASH reference, not $handles");
     }
 
     return map {
@@ -86,49 +76,66 @@ around '_canonicalize_handles' => sub {
     } keys %$handles;
 };
 
-# methods called after instantiation
-
-before 'install_accessors' => sub { (shift)->_check_handles_values };
-
-sub _check_handles_values {
-    my $self = shift;
-
-    my $method_constructors = $self->method_constructors;
-
-    my %handles = $self->_canonicalize_handles;
-
-    for my $original_method ( values %handles ) {
-        my $name = $original_method->[0];
-        ( exists $method_constructors->{$name} )
-            || confess "$name is an unsupported method type";
-    }
-
-}
-
 around '_make_delegation_method' => sub {
     my $next = shift;
     my ( $self, $handle_name, $method_to_call ) = @_;
 
     my ( $name, @curried_args ) = @$method_to_call;
 
-    my $method_constructors = $self->method_constructors;
+    my $accessor_class
+        = $self->_native_accessor_class_root . '::' . $name;
 
-    my $code = $method_constructors->{$name}->(
-        $self,
-        $self->get_read_method_ref,
-        $self->get_write_method_ref,
-    );
-
-    return $next->(
-        $self,
-        $handle_name,
-        sub {
-            my $instance = shift;
-            return $code->( $instance, @curried_args, @_ );
-        },
-    );
+    if ( $accessor_class->can('new') ) {
+        return $accessor_class->new(
+            name              => $handle_name,
+            package_name      => $self->associated_class->name,
+            attribute         => $self,
+            curried_arguments => \@curried_args,
+        );
+    }
+    else {
+        my $method_constructors = $self->method_constructors;
+
+        my $code = $method_constructors->{$name}->(
+            $self,
+            $self->get_read_method_ref,
+            $self->get_write_method_ref,
+        );
+
+        return $next->(
+            $self,
+            $handle_name,
+            sub {
+                my $instance = shift;
+                return $code->( $instance, @curried_args, @_ );
+            }
+        );
+    }
 };
 
+sub _native_accessor_class_root {
+    my $self = shift;
+
+    return 'Moose::Meta::Method::Accessor::Native::' . $self->_native_type;
+}
+
+has 'method_constructors' => (
+    is      => 'ro',
+    isa     => 'HashRef',
+    lazy    => 1,
+    default => sub {
+        my $self = shift;
+        return +{}
+            unless $self->can('has_method_provider')
+                && $self->has_method_provider;
+
+        # or grab them from the role/class
+        my $method_provider = $self->method_provider->meta;
+        return +{ map { $_->name => $_ }
+                $method_provider->_get_local_methods };
+    },
+);
+
 no Moose::Role;
 no Moose::Util::TypeConstraints;
 
@@ -142,9 +149,7 @@ Moose::Meta::Attribute::Native::Trait - Base role for helpers
 
 =head1 BUGS
 
-All complex software has bugs lurking in it, and this module is no
-exception. If you find a bug please either email me, or add the bug
-to cpan-RT.
+See L<Moose/BUGS> for details on reporting bugs.
 
 =head1 SEE ALSO