Use new API for metaroles

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

diff --git a/lib/Mouse/Exporter.pm b/lib/Mouse/Exporter.pm
index 9ac5661..e3cb85a 100644 (file)
--- a/lib/Mouse/Exporter.pm
+++ b/lib/Mouse/Exporter.pm
@@ -149,7 +149,7 @@ sub do_import {
         my $arg = shift @args;
         if($arg =~ s/^-//){
             if($arg eq 'traits'){
-                push @traits, @{shift(@args)};
+                push @traits, ref($args[0]) ? @{shift(@args)} : shift(@args);
             }
             else {
                 Mouse::Util::not_supported("-$arg");
@@ -171,23 +171,29 @@ sub do_import {
     if($spec->{INIT_META}){
         my $meta;
         foreach my $init_meta(@{$spec->{INIT_META}}){
-            $meta = $into->$init_meta(for_class => $into);
+            $meta = $package->$init_meta(for_class => $into);
         }
 
         if(@traits){
             my $type = (split /::/, ref $meta)[-1]; # e.g. "Class" for "My::Meta::Class"
             @traits =
-                map{ ref($_) ? $_ : Mouse::Util::resolve_metaclass_alias($type => $_, trait => 1) }
-                @traits;
+                map{
+                    ref($_) ? $_
+                            : Mouse::Util::resolve_metaclass_alias($type => $_, trait => 1)
+                } @traits;
 
-            not_supported('-traits');
             require Mouse::Util::MetaRole;
-            Mouse::Util::MetaRole::apply_metaclass_roles(
-                for_class       => $into,
-                metaclass_roles => \@traits,
+            Mouse::Util::MetaRole::apply_metaroles(
+                for       => $into,
+                Mouse::Util::is_a_metarole($into->meta)
+                    ? (role_metaroles  => { role  => \@traits })
+                    : (class_metaroles => { class => \@traits }),
             );
         }
     }
+    elsif(@traits){
+        Carp::confess("Cannot provide traits when $package does not have an init_meta() method");
+    }
 
     if(@exports){
         foreach my $keyword(@exports){
@@ -221,6 +227,7 @@ sub do_unimport {
     };
 
     for my $keyword (@{ $spec->{REMOVABLES} }) {
+        next if !exists $stash->{$keyword};
         my $gv = \$stash->{$keyword};
         if(ref($gv) eq 'GLOB' && *{$gv}{CODE} == $spec->{EXPORTS}{$keyword}){ # make sure it is from us
             delete $stash->{$keyword};
@@ -229,27 +236,24 @@ sub do_unimport {
     return;
 }
 
-# 1 extra level because it's called by import so there's a layer\r
-# of indirection\r
-sub _LEVEL(){ 1 }
-
 sub _get_caller_package {
     my($arg) = @_;
 
+    # We need one extra level because it's called by import so there's a layer
+    # of indirection
     if(ref $arg){
         return defined($arg->{into})       ? $arg->{into}
-             : defined($arg->{into_level}) ? scalar caller(_LEVEL + $arg->{into_level})
-             :                               scalar caller(_LEVEL);
+             : defined($arg->{into_level}) ? scalar caller(1 + $arg->{into_level})
+             :                               scalar caller(1);
     }
     else{
-        return scalar caller(_LEVEL);
+        return scalar caller(1);
     }
 }
 
 #sub _spec{ %SPEC }
 
 1;
-
 __END__
 
 =head1 NAME
@@ -258,46 +262,46 @@ Mouse::Exporter - make an import() and unimport() just like Mouse.pm
 
 =head1 VERSION
 
-This document describes Mouse version 0.40_04
+This document describes Mouse version 0.49
 
 =head1 SYNOPSIS
 
-    package MyApp::Mouse;\r
-\r
-    use Mouse ();\r
-    use Mouse::Exporter;\r
-\r
-    Mouse::Exporter->setup_import_methods(\r
-      as_is     => [ 'has_rw', 'other_sugar', \&Some::Random::thing ],\r
-      also      => 'Mouse',\r
-    );\r
-\r
+    package MyApp::Mouse;
+
+    use Mouse ();
+    use Mouse::Exporter;
+
+    Mouse::Exporter->setup_import_methods(
+      as_is     => [ 'has_rw', 'other_sugar', \&Some::Random::thing ],
+      also      => 'Mouse',
+    );
+
     sub has_rw {
-        my $meta = caller->meta;\r
-        my ( $name, %options ) = @_;\r
-        $meta->add_attribute(\r
-          $name,\r
-          is => 'rw',\r
-          %options,\r
-        );\r
-    }\r
-\r
-    # then later ...\r
-    package MyApp::User;\r
-
-    use MyApp::Mouse;\r
-\r
-    has 'name';\r
-    has_rw 'size';\r
-    thing;\r
-\r
+        my $meta = caller->meta;
+        my ( $name, %options ) = @_;
+        $meta->add_attribute(
+          $name,
+          is => 'rw',
+          %options,
+        );
+    }
+
+    # then later ...
+    package MyApp::User;
+
+    use MyApp::Mouse;
+
+    has 'name';
+    has_rw 'size';
+    thing;
+
     no MyApp::Mouse;
 
 =head1 DESCRIPTION
 
-This module encapsulates the exporting of sugar functions in a\r
-C<Mouse.pm>-like manner. It does this by building custom C<import>,\r
-C<unimport> methods for your module, based on a spec you provide.\r
+This module encapsulates the exporting of sugar functions in a
+C<Mouse.pm>-like manner. It does this by building custom C<import>,
+C<unimport> methods for your module, based on a spec you provide.
 
 Note that C<Mouse::Exporter> does not provide the C<with_meta> option,
 but you can easily get the metaclass by C<< caller->meta >> as L</SYNOPSIS> shows.