fix inflating method modifiers applied to multiple methods

[gitmo/Moo.git] / lib / Moo / HandleMoose.pm

diff --git a/lib/Moo/HandleMoose.pm b/lib/Moo/HandleMoose.pm
index 3bcb725..5c763e8 100644 (file)
--- a/lib/Moo/HandleMoose.pm
+++ b/lib/Moo/HandleMoose.pm
@@ -56,7 +56,7 @@ sub inject_real_metaclass_for {
   my ($name) = @_;
   our %DID_INJECT;
   return Class::MOP::get_metaclass_by_name($name) if $DID_INJECT{$name};
-  require Moose; require Moo; require Moo::Role;
+  require Moose; require Moo; require Moo::Role; require Scalar::Util;
   Class::MOP::remove_metaclass_by_name($name);
   my ($am_role, $meta, $attr_specs, $attr_order) = do {
     if (my $info = $Moo::Role::INFO{$name}) {
@@ -101,14 +101,30 @@ sub inject_real_metaclass_for {
     foreach my $name (@$attr_order) {
       $seen_name{$name} = 1;
       my %spec = %{$attr_specs->{$name}};
-      delete $spec{index};
+      my %spec_map = (
+        map { $_->name => $_->init_arg||$_->name }
+        (
+          (grep { $_->has_init_arg }
+             $meta->attribute_metaclass->meta->get_all_attributes),
+          grep { exists($_->{init_arg}) ? defined($_->init_arg) : 1 }
+          map {
+            my $meta = Moose::Util::resolve_metatrait_alias('Attribute', $_)
+                         ->meta;
+            map $meta->get_attribute($_), $meta->get_attribute_list
+          }  @{$spec{traits}||[]}
+        )
+      );
+      # have to hard code this because Moose's role meta-model is lacking
+      $spec_map{traits} ||= 'traits';
+
       $spec{is} = 'ro' if $spec{is} eq 'lazy' or $spec{is} eq 'rwp';
-      delete $spec{asserter};
       my $coerce = $spec{coerce};
       if (my $isa = $spec{isa}) {
         my $tc = $spec{isa} = do {
           if (my $mapped = $TYPE_MAP{$isa}) {
             my $type = $mapped->();
+            Scalar::Util::blessed($type) && $type->isa("Moose::Meta::TypeConstraint")
+              or die "error inflating attribute '$name' for package '$_[0]': \$TYPE_MAP{$isa} did not return a valid type constraint'";
             $coerce ? $type->create_child_type(name => $type->name) : $type;
           } else {
             Moose::Meta::TypeConstraint->new(
@@ -134,6 +150,10 @@ sub inject_real_metaclass_for {
         $spec{isa} = $tc;
         $spec{coerce} = 1;
       }
+      %spec =
+        map { $spec_map{$_} => $spec{$_} }
+        grep { exists $spec_map{$_} }
+        keys %spec;
       push @attrs, $meta->add_attribute($name => %spec);
     }
     foreach my $mouse (do { our %MOUSE; @{$MOUSE{$name}||[]} }) {
@@ -159,7 +179,8 @@ sub inject_real_metaclass_for {
     $meta->add_required_methods(@{$info->{requires}});
     foreach my $modifier (@{$info->{modifiers}}) {
       my ($type, @args) = @$modifier;
-      $meta->${\"add_${type}_method_modifier"}(@args);
+      my $code = pop @args;
+      $meta->${\"add_${type}_method_modifier"}($_, $code) for @args;
     }
   } else {
     foreach my $attr (@attrs) {