X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoo.pm;h=09ad5c2b329ea08ed31f5b4aa961e80b061d577c;hb=23a3e34e96e78978af463010852ad97691126369;hp=6a5996771b0759d2477dcd043bf60d42a58020fb;hpb=2cb47d6e4faa46710e45c4f16db7ccf89006def3;p=gitmo%2FMoo.git

diff --git a/lib/Moo.pm b/lib/Moo.pm
index 6a59967..09ad5c2 100644
--- a/lib/Moo.pm
+++ b/lib/Moo.pm
@@ -3,7 +3,7 @@ package Moo;
 use strictures 1;
 use Moo::_Utils;
 
-our $VERSION = '0.009002';
+our $VERSION = '0.009008'; # 0.9.8
 $VERSION = eval $VERSION;
 
 our %MAKERS;
@@ -48,31 +48,47 @@ sub import {
 }
 
 sub _constructor_maker_for {
-  my ($class, $target) = @_;
+  my ($class, $target, $select_super) = @_;
   return unless $MAKERS{$target};
   $MAKERS{$target}{constructor} ||= do {
     require Method::Generate::Constructor;
+    require Sub::Defer;
+    my ($moo_constructor, $con);
+
+    if ($select_super && $MAKERS{$select_super}) {
+      $moo_constructor = 1;
+      $con = $MAKERS{$select_super}{constructor};
+    } else {
+      my $t_new = $target->can('new');
+      if ($t_new) {
+        if ($t_new == Moo::Object->can('new')) {
+          $moo_constructor = 1;
+        } elsif (my $defer_target = (Sub::Defer::defer_info($t_new)||[])->[0]) {
+          my ($pkg) = ($defer_target =~ /^(.*)::[^:]+$/);
+          if ($MAKERS{$pkg}) {
+            $moo_constructor = 1;
+            $con = $MAKERS{$pkg}{constructor};
+          }
+        }
+      } else {
+        $moo_constructor = 1; # no other constructor, make a Moo one
+      }
+    };
     Method::Generate::Constructor
       ->new(
         package => $target,
         accessor_generator => do {
           require Method::Generate::Accessor;
           Method::Generate::Accessor->new;
-        }
+        },
+        construction_string => (
+          $moo_constructor
+            ? ($con ? $con->construction_string : undef)
+            : ('$class->'.$target.'::SUPER::new(@_)')
+        )
       )
       ->install_delayed
-      ->register_attribute_specs(do {
-        my @spec;
-        # using the -last- entry in @ISA means that classes created by
-        # Role::Tiny as N roles + superclass will still get the attributes
-        # from the superclass
-        if (my $super = do { no strict 'refs'; ${"${target}::ISA"}[-1] }) {
-          if (my $con = $MAKERS{$super}{constructor}) {
-            @spec = %{$con->all_attribute_specs};
-          }
-        }
-        @spec;
-      });
+      ->register_attribute_specs(%{$con?$con->all_attribute_specs:{}})
   }
 }
 
@@ -230,7 +246,7 @@ The options for C<has> are as follows:
 =item * is
 
 B<required>, must be C<ro> or C<rw>.  Unsurprisingly, C<ro> generates an
-accessor that will not respond to arguments; to be clear: a setter only. C<rw>
+accessor that will not respond to arguments; to be clear: a getter only. C<rw>
 will create a perlish getter/setter.
 
 =item * isa
@@ -247,10 +263,6 @@ L<Sub::Quote aware|/SUB QUOTE AWARE>
 
 =item * coerce
 
-This Moose feature is not yet supported
-
-=begin hide
-
 Takes a coderef which is meant to coerce the attribute.  The basic idea is to
 do something like the following:
 
@@ -258,9 +270,9 @@ do something like the following:
    $_[0] + 1 unless $_[0] % 2
  },
 
-L<Sub::Quote aware|/SUB QUOTE AWARE>
+Coerce does not require C<isa> to be defined.
 
-=end hide
+L<Sub::Quote aware|/SUB QUOTE AWARE>
 
 =item * trigger
 
@@ -387,3 +399,31 @@ manually set all the options it implies.
 C<auto_deref> is not supported since the author considers it a bad idea.
 
 C<documentation> is not supported since it's a very poor replacement for POD.
+
+=head1 AUTHOR
+
+mst - Matt S. Trout (cpan:MSTROUT) <mst@shadowcat.co.uk>
+
+=head1 CONTRIBUTORS
+
+dg - David Leadbeater (cpan:DGL) <dgl@dgl.cx>
+
+frew - Arthur Axel "fREW" Schmidt (cpan:FREW) <frioux@gmail.com>
+
+hobbs - Andrew Rodland (cpan:ARODLAND) <arodland@cpan.org>
+
+jnap - John Napiorkowski (cpan:JJNAPIORK) <jjn1056@yahoo.com>
+
+ribasushi - Peter Rabbitson (cpan:RIBASUSHI) <ribasushi@cpan.org>
+
+=head1 COPYRIGHT
+
+Copyright (c) 2010-2011 the Moo L</AUTHOR> and L</CONTRIBUTORS>
+as listed above.
+
+=head1 LICENSE
+
+This library is free software and may be distributed under the same terms
+as perl itself.
+
+=cut