[Moose-commits] r7840 - in Mouse/trunk: lib/Mouse/Meta t

[tokuhirom at code2.0beta.co.uk]

Author: tokuhirom
Date: 2009-03-06 17:32:11 -0800 (Fri, 06 Mar 2009)
New Revision: 7840

Added:
   Mouse/trunk/t/047-attribute-metaclass-role.t
Modified:
   Mouse/trunk/lib/Mouse/Meta/Role.pm
Log:
oops. we want to use 'metaclass' in role, too :(

Modified: Mouse/trunk/lib/Mouse/Meta/Role.pm
===================================================================
--- Mouse/trunk/lib/Mouse/Meta/Role.pm	2009-03-07 00:14:59 UTC (rev 7839)
+++ Mouse/trunk/lib/Mouse/Meta/Role.pm	2009-03-07 01:32:11 UTC (rev 7840)
@@ -2,6 +2,7 @@
 use strict;
 use warnings;
 use Carp 'confess';
+use Mouse::Util;
 
 do {
     my %METACLASS_CACHE;
@@ -107,7 +108,19 @@
         for my $name ($self->get_attribute_list) {
             next if $class->has_attribute($name);
             my $spec = $self->get_attribute($name);
-            Mouse::Meta::Attribute->create($class, $name, %$spec);
+
+            my $metaclass = 'Mouse::Meta::Attribute';
+            if ( my $metaclass_name = $spec->{metaclass} ) {
+                my $new_class = Mouse::Util::resolve_metaclass_alias(
+                    'Attribute',
+                    $metaclass_name
+                );
+                if ( $metaclass ne $new_class ) {
+                    $metaclass = $new_class;
+                }
+            }
+
+            $metaclass->create($class, $name, %$spec);
         }
     } else {
         # apply role to role
@@ -188,7 +201,19 @@
             for my $name ($self->get_attribute_list) {
                 next if $class->has_attribute($name);
                 my $spec = $self->get_attribute($name);
-                Mouse::Meta::Attribute->create($class, $name, %$spec);
+
+                my $metaclass = 'Mouse::Meta::Attribute';
+                if ( my $metaclass_name = $spec->{metaclass} ) {
+                    my $new_class = Mouse::Util::resolve_metaclass_alias(
+                        'Attribute',
+                        $metaclass_name
+                    );
+                    if ( $metaclass ne $new_class ) {
+                        $metaclass = $new_class;
+                    }
+                }
+
+                $metaclass->create($class, $name, %$spec);
             }
         }
     } else {

Added: Mouse/trunk/t/047-attribute-metaclass-role.t
===================================================================
--- Mouse/trunk/t/047-attribute-metaclass-role.t	                        (rev 0)
+++ Mouse/trunk/t/047-attribute-metaclass-role.t	2009-03-07 01:32:11 UTC (rev 7840)
@@ -0,0 +1,92 @@
+#!/usr/bin/env perl
+use strict;
+use warnings;
+use Test::More tests => 7;
+use lib 't/lib';
+
+do {
+    package MouseX::AttributeHelpers::Number;
+    use Mouse;
+    extends 'Mouse::Meta::Attribute';
+
+    around 'create' => sub {
+        my ($next, @args) = @_;
+        my $attr = $next->(@args);
+        my %provides = %{$attr->{provides}};
+        my $method_constructors = {
+            add => sub {
+                my ($attr, $name) = @_;
+                return sub {
+                    $_[0]->$name( $_[0]->$name() + $_[1])
+                };
+            },
+        };
+        while (my ($name, $aliased) = each %provides) {
+            $attr->associated_class->add_method(
+                $aliased => $method_constructors->{$name}->($attr, $attr->name)
+            );
+        }
+        return $attr;
+    };
+
+    package # hide me from search.cpan.org
+        Mouse::Meta::Attribute::Custom::Number;
+    sub register_implementation { 'MouseX::AttributeHelpers::Number' }
+
+    1;
+    
+    package Foo;
+    use Mouse::Role;
+
+    has 'i' => (
+        metaclass => 'Number',
+        is => 'rw',
+        isa => 'Int',
+        provides => {
+            'add' => 'add_number'
+        },
+    );
+    sub f_m {}
+
+    package Bar;
+    use Mouse::Role;
+
+    has 'j' => (
+        metaclass => 'Number',
+        is => 'rw',
+        isa => 'Int',
+        provides => {
+            'add' => 'add_number_j'
+        },
+    );
+    sub b_m {}
+
+    package Klass1;
+    use Mouse;
+    with 'Foo';
+
+    package Klass2;
+    use Mouse;
+    with 'Foo', 'Bar';
+
+};
+
+{
+    # normal
+    can_ok 'Klass1', 'add_number';
+    my $k = Klass1->new(i=>3);
+    $k->add_number(4);
+    is $k->i, 7;
+}
+
+{
+    # combine
+    can_ok 'Klass2', 'f_m';
+    can_ok 'Klass2', 'b_m';
+    can_ok 'Klass2', 'add_number';
+    can_ok 'Klass2', 'add_number_j';
+    my $k = Klass2->new(i=>3);
+    $k->add_number(4);
+    is $k->i, 7;
+}
+