fix _load_module to deal with subpackages correctly

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

diff --git a/lib/Moo/_Utils.pm b/lib/Moo/_Utils.pm
index c8549e8..aaa903a 100644 (file)
--- a/lib/Moo/_Utils.pm
+++ b/lib/Moo/_Utils.pm
@@ -1,25 +1,36 @@
 package Moo::_Utils;
 
+sub _getglob { \*{$_[0]} }
+sub _getstash { \%{"$_[0]::"} }
+
 use strictures 1;
 use base qw(Exporter);
 
-our @EXPORT = qw(_getglob _install_modifier _maybe_load_module);
-
-sub _getglob { no strict 'refs'; \*{$_[0]} }
+our @EXPORT = qw(_getglob _install_modifier _load_module _maybe_load_module);
 
 sub _install_modifier {
   my ($into, $type, $name, $code) = @_;
-  my $ref = ref(my $to_modify = $into->can($name));
 
-  require Sub::Defer;
-  Sub::Defer::undefer_sub($to_modify);
+  if (my $to_modify = $into->can($name)) { # CMM will throw for us if not
+    require Sub::Defer;
+    Sub::Defer::undefer_sub($to_modify);
+  }
 
-  require Class::Method::Modifiers;
   Class::Method::Modifiers::install_modifier(@_);
 }
 
 our %MAYBE_LOADED;
 
+sub _load_module {
+  (my $proto = $_[0]) =~ s/::/\//g;
+  return 1 if $INC{"${proto}.pm"};
+  # can't just ->can('can') because a sub-package Foo::Bar::Baz
+  # creates a 'Baz::' key in Foo::Bar's symbol table
+  return 1 if grep !/::$/, keys %{_getstash($_[0])||{}};
+  require "${proto}.pm";
+  return 1;
+}
+
 sub _maybe_load_module {
   return $MAYBE_LOADED{$_[0]} if exists $MAYBE_LOADED{$_[0]};
   (my $proto = $_[0]) =~ s/::/\//g;