From: Graham Knop <haarg@haarg.org>
Date: Sun, 5 May 2013 17:29:19 +0000 (-0400)
Subject: also include attributes from attribute traits on inflate
X-Git-Tag: v1.003000~77
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=820e3970b417c0258438bd3405cd365ec4cb0a3c;p=gitmo%2FMoo.git

also include attributes from attribute traits on inflate
---

diff --git a/lib/Moo/HandleMoose.pm b/lib/Moo/HandleMoose.pm
index 9eea5a3..524b7be 100644
--- a/lib/Moo/HandleMoose.pm
+++ b/lib/Moo/HandleMoose.pm
@@ -95,17 +95,30 @@ sub inject_real_metaclass_for {
   Sub::Defer::undefer_sub($_) for grep defined, values %methods;
   my @attrs;
   {
-    my %spec_map = (
-      map { $_->name => $_->init_arg }
-      grep { $_->has_init_arg }
-      $meta->attribute_metaclass->meta->get_all_attributes
-    );
     # This local is completely not required for roles but harmless
     local @{_getstash($name)}{keys %methods};
     my %seen_name;
     foreach my $name (@$attr_order) {
       $seen_name{$name} = 1;
       my %spec = %{$attr_specs->{$name}};
+      my %spec_map = (
+        map { $_->name => $_->init_arg }
+        grep { $_->has_init_arg }
+        $meta->attribute_metaclass->meta->get_all_attributes
+      );
+      for my $trait (@{$spec{traits}||[]}) {
+        my $trait_meta = Moose::Util::resolve_metatrait_alias('Attribute', $trait)->meta;
+        my @trait_attrs =
+          map { $trait_meta->get_attribute($_) }
+          $trait_meta->get_attribute_list;
+        for my $trait_attr (@trait_attrs) {
+          my $orig = $trait_attr->original_options;
+          my $init_arg = (exists $orig->{init_arg} ? $orig->{init_arg} : $trait_attr->name)
+            or next;
+          $spec_map{$trait_attr->name} = $init_arg;
+        }
+      }
+
       $spec{is} = 'ro' if $spec{is} eq 'lazy' or $spec{is} eq 'rwp';
       my $coerce = $spec{coerce};
       if (my $isa = $spec{isa}) {