Implement confliction checks in roles

[gitmo/Mouse.git] / lib / Mouse / Meta / Class.pm

diff --git a/lib/Mouse/Meta/Class.pm b/lib/Mouse/Meta/Class.pm
index a9c76f4..2689f85 100644 (file)
--- a/lib/Mouse/Meta/Class.pm
+++ b/lib/Mouse/Meta/Class.pm
@@ -281,10 +281,11 @@ sub does_role {
         || $self->throw_error("You must supply a role name to look for");
 
     for my $class ($self->linearized_isa) {
-        my $meta = Mouse::class_of($class);
+        my $meta = Mouse::Meta::Module::class_of($class);
         next unless $meta && $meta->can('roles');
 
         for my $role (@{ $meta->roles }) {
+
             return 1 if $role->does_role($role_name);
         }
     }
@@ -307,6 +308,11 @@ sub create {
         || $class->throw_error("You must pass a HASH ref of methods")
             if exists $options{methods};
 
+    (ref $options{roles} eq 'ARRAY')
+        || $class->throw_error("You must pass an ARRAY ref of roles")
+            if exists $options{roles};
+
+    # instantiate a module
     {
         ( defined $package_name && $package_name )
           || $class->throw_error("You must pass a package name");
@@ -322,6 +328,7 @@ sub create {
         superclasses
         attributes
         methods
+        roles
         version
         authority
     )};
@@ -334,6 +341,7 @@ sub create {
 
     $meta->superclasses(@{$options{superclasses}})
         if exists $options{superclasses};
+
     # NOTE:
     # process attributes first, so that they can
     # install accessors, but locally defined methods
@@ -349,6 +357,9 @@ sub create {
             $meta->add_method($method_name, $options{methods}->{$method_name});
         }
     }
+    if (exists $options{roles}){
+        Mouse::Util::apply_all_roles($package_name, @{$options{roles}});
+    }
     return $meta;
 }