Implement confliction checks in roles

[gitmo/Mouse.git] / lib / Mouse / Role.pm

diff --git a/lib/Mouse/Role.pm b/lib/Mouse/Role.pm
index 43bcdd9..7104736 100644 (file)
--- a/lib/Mouse/Role.pm
+++ b/lib/Mouse/Role.pm
@@ -7,7 +7,7 @@ use Carp 'confess', 'croak';
 use Scalar::Util 'blessed';
 
 use Mouse::Meta::Role;
-use Mouse::Util;
+use Mouse::Util qw(load_class);
 
 our @EXPORT = qw(before after around super override inner augment has extends with requires excludes confess blessed);
 our %is_removable = map{ $_ => undef } @EXPORT;
@@ -15,7 +15,7 @@ delete $is_removable{confess};
 delete $is_removable{blessed};
 
 sub before {
-    my $meta = Mouse::Meta::Role->initialize(caller);
+    my $meta = Mouse::Meta::Role->initialize(scalar caller);
 
     my $code = pop;
     for (@_) {
@@ -24,7 +24,7 @@ sub before {
 }
 
 sub after {
-    my $meta = Mouse::Meta::Role->initialize(caller);
+    my $meta = Mouse::Meta::Role->initialize(scalar caller);
 
     my $code = pop;
     for (@_) {
@@ -33,7 +33,7 @@ sub after {
 }
 
 sub around {
-    my $meta = Mouse::Meta::Role->initialize(caller);
+    my $meta = Mouse::Meta::Role->initialize(scalar caller);
 
     my $code = pop;
     for (@_) {
@@ -78,7 +78,7 @@ sub augment {
 }
 
 sub has {
-    my $meta = Mouse::Meta::Role->initialize(caller);
+    my $meta = Mouse::Meta::Role->initialize(scalar caller);
 
     my $name = shift;
     my %opts = @_;
@@ -86,20 +86,15 @@ sub has {
     $meta->add_attribute($name => \%opts);
 }
 
-sub extends  { confess "Roles do not currently support 'extends'" }
+sub extends  { confess "Roles do not support 'extends'" }
 
 sub with     {
-    my $meta = Mouse::Meta::Role->initialize(caller);
-    my $role  = shift;
-    my $args  = shift || {};
-    confess "Mouse::Role only supports 'with' on individual roles at a time" if @_ || !ref $args;
-
-    Mouse::load_class($role);
-    $role->meta->apply($meta, %$args);
+    my $meta = Mouse::Meta::Role->initialize(scalar caller);
+    Mouse::Util::apply_all_roles($meta->name, @_);
 }
 
 sub requires {
-    my $meta = Mouse::Meta::Role->initialize(caller);
+    my $meta = Mouse::Meta::Role->initialize(scalar caller);
     Carp::croak "Must specify at least one method" unless @_;
     $meta->add_required_methods(@_);
 }
@@ -120,10 +115,6 @@ sub import {
         return;
     }
 
-    my $meta_method = sub{
-        Mouse::Meta::Role->initialize(ref($_[0]) || $_[0]);
-    };
-
     Mouse::Meta::Role->initialize($caller)->add_method(meta => sub {
         return Mouse::Meta::Role->initialize(ref($_[0]) || $_[0]);
     });