X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse.pm;h=22d07eb16a0ffd4c9859a95ff95e3dfbc1448631;hb=74f2f839994288ca48292d561c9dc2d822deae39;hp=20283e8056fa621fa2921d59c092332b1f937ca3;hpb=5253d13d59d5d4268088af1459bc7a4adf34b6ea;p=gitmo%2FMouse.git

diff --git a/lib/Mouse.pm b/lib/Mouse.pm
index 20283e8..22d07eb 100644
--- a/lib/Mouse.pm
+++ b/lib/Mouse.pm
@@ -1,11 +1,21 @@
-#!/usr/bin/env perl
+
 package Mouse;
 use strict;
 use warnings;
+use 5.006;
 use base 'Exporter';
 
-our $VERSION = '0.11';
-use 5.006;
+our $VERSION;
+
+BEGIN {
+    $VERSION  = '0.12';
+
+    if ($ENV{MOUSE_DEBUG}) {
+        *DEBUG = sub (){ 1 };
+    } else {
+        *DEBUG = sub (){ 0 };
+    }
+}
 
 use Carp 'confess';
 use Mouse::Util 'blessed';
@@ -66,17 +76,12 @@ sub around {
 }
 
 sub with {
-    my $meta = Mouse::Meta::Class->initialize(caller);
-
-    my $role  = shift;
-
-    confess "Mouse::Role only supports 'with' on individual roles at a time" if @_;
-
-    Mouse::load_class($role);
-    $role->meta->apply($meta);
+    Mouse::Util::apply_all_roles((caller)[0], @_);
 }
 
 sub import {
+    my $class = shift;
+
     strict->import;
     warnings->import;
 
@@ -90,7 +95,15 @@ sub import {
     no warnings 'redefine';
     *{$caller.'::meta'} = sub { $meta };
 
-    Mouse->export_to_level(1, @_);
+    if (@_) {
+        __PACKAGE__->export_to_level( 1, $class, @_);
+    } else {
+        # shortcut for the common case of no type character
+        no strict 'refs';
+        for my $keyword (@EXPORT) {
+            *{ $caller . '::' . $keyword } = *{__PACKAGE__ . '::' . $keyword};
+        }
+    }
 }
 
 sub unimport {