don't try and apply modifiers during role composition

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

diff --git a/lib/Moo/_Utils.pm b/lib/Moo/_Utils.pm
index 0e5d787..6bf8f22 100644 (file)
--- a/lib/Moo/_Utils.pm
+++ b/lib/Moo/_Utils.pm
@@ -3,27 +3,30 @@ package Moo::_Utils;
 use strictures 1;
 use base qw(Exporter);
 
-our @EXPORT = qw(_getglob _install_modifier _maybe_load_module);
+our @EXPORT = qw(_getglob _install_modifier _load_module _maybe_load_module);
 
 sub _getglob { no strict 'refs'; \*{$_[0]} }
 
 sub _install_modifier {
-  require Class::Method::Modifiers;
   my ($into, $type, $name, $code) = @_;
-  my $ref = ref(my $to_modify = $into->can($name));
 
-  # if it isn't CODE, then either we're about to die, or it's a blessed
-  # coderef - if it's a blessed coderef it might be deferred, and the
-  # user's already doing something clever so a minor speed hit is meh.
-
-  if ($ref && $ref ne 'CODE') {
-    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);
   }
+
   Class::Method::Modifiers::install_modifier(@_);
 }
 
 our %MAYBE_LOADED;
 
+sub _load_module {
+  return 1 if $_[0]->can('can');
+  (my $proto = $_[0]) =~ s/::/\//g;
+  require "${proto}.pm";
+  return 1;
+}
+
 sub _maybe_load_module {
   return $MAYBE_LOADED{$_[0]} if exists $MAYBE_LOADED{$_[0]};
   (my $proto = $_[0]) =~ s/::/\//g;