more multiple inheritance fiddling

[gitmo/Moose.git] / lib / Moose / Meta / Attribute / Native / Trait.pm

diff --git a/lib/Moose/Meta/Attribute/Native/Trait.pm b/lib/Moose/Meta/Attribute/Native/Trait.pm
index 2a77fca..1dcf13c 100644 (file)
--- a/lib/Moose/Meta/Attribute/Native/Trait.pm
+++ b/lib/Moose/Meta/Attribute/Native/Trait.pm
@@ -42,8 +42,6 @@ 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 ) {
@@ -51,10 +49,9 @@ sub _check_handles_values {
 
         my $accessor_class = $self->_native_accessor_class_for($name);
 
-        # XXX - bridge code
-        ( ( $accessor_class && $accessor_class->can('new') )
-                || exists $method_constructors->{$name} )
-            || confess "$name is an unsupported method type";
+        ( $accessor_class && $accessor_class->can('new') )
+            || confess
+            "$name is an unsupported method type - $accessor_class";
     }
 }
 
@@ -85,60 +82,55 @@ around '_make_delegation_method' => sub {
 
     my $accessor_class = $self->_native_accessor_class_for($name);
 
-    # XXX - bridge code
-    if ( $accessor_class && $accessor_class->can('new') ) {
-        return $accessor_class->new(
-            name              => $handle_name,
-            package_name      => $self->associated_class->name,
-            attribute         => $self,
-            curried_arguments => \@curried_args,
-        );
-    }
-    # XXX - bridge code
-    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, @_ );
-            }
-        );
-    }
+    die "Cannot find an accessor class for $name"
+        unless $accessor_class && $accessor_class->can('new');
+
+    return $accessor_class->new(
+        name               => $handle_name,
+        package_name       => $self->associated_class->name,
+        delegate_to_method => $name,
+        attribute          => $self,
+        is_inline          => 1,
+        curried_arguments  => \@curried_args,
+        root_types         => [ $self->_root_types ],
+    );
 };
 
+sub _root_types {
+    return $_[0]->_helper_type;
+}
+
 sub _native_accessor_class_for {
     my ( $self, $suffix ) = @_;
 
-    # XXX - bridge code
-    return unless $self->can('_native_type');
+    my $role
+        = 'Moose::Meta::Method::Accessor::Native::'
+        . $self->_native_type . '::'
+        . $suffix;
+
+    return Moose::Meta::Class->create_anon_class(
+        superclasses =>
+            [ $self->accessor_metaclass, $self->delegation_metaclass ],
+        roles => [$role],
+        cache => 1,
+    )->name;
+}
+
+sub _build_native_type {
+    my $self = shift;
+
+    for my $role_name ( map { $_->name } $self->meta->calculate_all_roles ) {
+        return $1 if $role_name =~ /::Native::Trait::(\w+)$/;
+    }
 
-    return 'Moose::Meta::Method::Accessor::Native::' . $self->_native_type . '::' . $suffix;
+    die "Cannot calculate native type for " . ref $self;
 }
 
-has 'method_constructors' => (
+has '_native_type' => (
     is      => 'ro',
-    isa     => 'HashRef',
+    isa     => 'Str',
     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 };
-    },
+    builder => '_build_native_type',
 );
 
 no Moose::Role;