From: Matt S Trout <mst@shadowcat.co.uk>
Date: Mon, 8 Nov 2010 01:37:39 +0000 (+0000)
Subject: BUILDALL for generated constructor
X-Git-Tag: 0.009001~54
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=077bd02695868c617d424bb451b6e63020d2db25;p=gitmo%2FMoo.git

BUILDALL for generated constructor
---

diff --git a/lib/Class/Tiny/Object.pm b/lib/Class/Tiny/Object.pm
index bf19053..8243116 100644
--- a/lib/Class/Tiny/Object.pm
+++ b/lib/Class/Tiny/Object.pm
@@ -12,7 +12,10 @@ sub new {
   $NO_BUILD{$class} = !$class->can('BUILD') unless exists $NO_BUILD{$class};
   $NO_BUILD{$class}
     ? bless({ ref($_[0]) eq 'HASH' ? %{$_[0]} : @_ }, $class)
-    : bless({ ref($_[0]) eq 'HASH' ? %{$_[0]} : @_ }, $class)->BUILDALL;
+    : do {
+	my $proto = ref($_[0]) eq 'HASH' ? $_[0] : { @_ };
+	bless({ %$proto }, $class)->BUILDALL($proto);
+      };
 }
 
 sub BUILDALL {
diff --git a/lib/Method/Generate/BuildAll.pm b/lib/Method/Generate/BuildAll.pm
index b7895b8..3b4b363 100644
--- a/lib/Method/Generate/BuildAll.pm
+++ b/lib/Method/Generate/BuildAll.pm
@@ -8,14 +8,19 @@ use Class::Tiny::_Utils;
 
 sub generate_method {
   my ($self, $into) = @_;
+  quote_sub "${into}::BUILDALL", join '',
+    qq{    my \$self = shift;\n},
+    $self->buildall_body_for($into, '$self', '@_'),
+    qq{    return \$self\n};
+}
+
+sub buildall_body_for {
+  my ($self, $into, $me, $args) = @_;
   my @builds =
     grep *{_getglob($_)}{CODE},
     map "${_}::BUILD",
     reverse @{mro::get_linear_isa($into)};
-  quote_sub "${into}::BUILDALL", join '',
-    qq{    my \$self = shift;\n},
-    (map qq{    \$self->${_}(\@_);\n}, @builds),
-    qq{    return \$self\n};
+  join '', map qq{    ${me}->${_}(${args});\n}, @builds;
 }
 
 1;
diff --git a/lib/Method/Generate/Constructor.pm b/lib/Method/Generate/Constructor.pm
index d62545d..0064eac 100644
--- a/lib/Method/Generate/Constructor.pm
+++ b/lib/Method/Generate/Constructor.pm
@@ -44,6 +44,12 @@ sub generate_method {
   $body .= '    my $new = bless({}, $class);'."\n";
   $body .= $self->_assign_new($spec);
   $body .= $self->_fire_triggers($spec);
+  if ($into->can('BUILD')) {
+    require Method::Generate::BuildAll;
+    $body .= Method::Generate::BuildAll->new->buildall_body_for(
+      $into, '$new', '$args'
+    );
+  }
   $body .= '    return $new;'."\n";
   quote_sub
     "${into}::${name}" => $body,
diff --git a/t/buildall.t b/t/buildall.t
index f27fbc1..7e4b953 100644
--- a/t/buildall.t
+++ b/t/buildall.t
@@ -10,9 +10,24 @@ my @ran;
   package Quux; use Class::Tiny; extends 'Baz'; sub BUILD { push @ran, 'Quux' }
 }
 
+{
+  package Fleem;
+  use Class::Tiny;
+  extends 'Quux';
+  has 'foo' => (is => 'ro');
+  sub BUILD { push @ran, $_[0]->foo, $_[1]->{bar} }
+}
+
 my $o = Quux->new;
 
 is(ref($o), 'Quux', 'object returned');
 is_deeply(\@ran, [ qw(Foo Bar Quux) ], 'BUILDs ran in order');
 
+@ran = ();
+
+$o = Fleem->new(foo => 'Fleem1', bar => 'Fleem2');
+
+is(ref($o), 'Fleem', 'object with inline constructor returned');
+is_deeply(\@ran, [ qw(Foo Bar Quux Fleem1 Fleem2) ], 'BUILDs ran in order');
+
 done_testing;