X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FRole.pm;h=b57169d6adecb7e93dd27799df354d873b0c5213;hb=56a558f97f2da37b37db51a6a8ef7f923e84724e;hp=b222a1d5119b3b7850c43030f6efee2d243e1143;hpb=b1b8155380073bc8170b50b17893474865604300;p=gitmo%2FMouse.git

diff --git a/lib/Mouse/Role.pm b/lib/Mouse/Role.pm
index b222a1d..b57169d 100644
--- a/lib/Mouse/Role.pm
+++ b/lib/Mouse/Role.pm
@@ -1,11 +1,10 @@
-#!/usr/bin/env perl
 package Mouse::Role;
 use strict;
 use warnings;
 use base 'Exporter';
 
 use Carp 'confess';
-use Mouse::Util 'blessed';
+use Scalar::Util 'blessed';
 
 use Mouse::Meta::Role;
 
@@ -52,10 +51,11 @@ sub extends  { confess "Roles do not support 'extends'" }
 sub with     {
     my $meta = Mouse::Meta::Role->initialize(caller);
     my $role  = shift;
-    confess "Mouse::Role only supports 'with' on individual roles at a time" if @_;
+    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);
+    $role->meta->apply($meta, %$args);
 }
 
 sub requires {
@@ -67,10 +67,19 @@ sub requires {
 sub excludes { confess "Mouse::Role does not currently support 'excludes'" }
 
 sub import {
+    my $class = shift;
+
     strict->import;
     warnings->import;
 
     my $caller = caller;
+
+    # we should never export to main
+    if ($caller eq 'main') {
+        warn qq{$class does not export its sugar to the 'main' package.\n};
+        return;
+    }
+
     my $meta = Mouse::Meta::Role->initialize(caller);
 
     no strict 'refs';
@@ -95,7 +104,7 @@ __END__
 
 =head1 NAME
 
-Mouse::Role
+Mouse::Role - define a role in Mouse
 
 =head1 KEYWORDS