Fix composing classes with multiple Mojo::Base roles, closes #1170 #1171

mojolicious · Dec 20, 2017 · a9d214d · a9d214d
1 parent 722f46a
commit a9d214d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/lib/Mojo/Base.pm b/lib/Mojo/Base.pm
@@ -66,24 +66,18 @@ sub import {
   # Base
   if ($flags[0] eq '-base') { $flags[0] = $class }
 
-  # Strict
-  elsif ($flags[0] eq '-strict') { $flags[0] = undef }
-
   # Role
-  elsif ($flags[0] eq '-role') {
+  if ($flags[0] eq '-role') {
     Carp::croak 'Role::Tiny 2.000001+ is required for roles' unless ROLES;
+    Mojo::Util::monkey_patch($caller, 'has', sub { attr($caller, @_) });
     eval "package $caller; use Role::Tiny; 1" or die $@;
   }
 
-  # Module
-  elsif ($flags[0] && !$flags[0]->can('new')) {
-    require(Mojo::Util::class_to_path($flags[0]));
-  }
-
-  # "has" and possibly ISA
-  if ($flags[0]) {
+  # Module and not -strict
+  elsif ($flags[0] !~ /^-/) {
     no strict 'refs';
-    push @{"${caller}::ISA"}, $flags[0] unless $flags[0] eq '-role';
+    require(Mojo::Util::class_to_path($flags[0])) unless $flags[0]->can('new');
+    push @{"${caller}::ISA"}, $flags[0];
     Mojo::Util::monkey_patch($caller, 'has', sub { attr($caller, @_) });
   }
 

diff --git a/t/mojo/roles.t b/t/mojo/roles.t
@@ -97,6 +97,13 @@ is $obj7->name,    'Joel',         'base attribute';
 is $obj7->whisper, 'psst, joel',   'method from first role';
 is $obj7->hello,   'HEY! JOEL!!!', 'method from second role';
 
+# Multiple Mojo::Base roles
+my $obj8 = Mojo::RoleTest->with_roles('+quiet', 'Mojo::RoleTest::Hello')
+  ->new(name => 'Joel');
+is $obj8->name,    'Joel',        'base attribute';
+is $obj8->whisper, 'psst, joel',  'method from first role';
+is $obj8->hello,   'hello mojo!', 'method from second role';
+
 # Classes that are not subclasses of Mojo::Base
 my $stream = Mojo::ByteStream->with_roles('Mojo::RoleTest::Hello')->new;
 is $stream->hello, 'hello mojo!', 'right result';