X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=lib%2FMouse%2FExporter.pm;h=fc3bfb0641a878cc9b0fe3ace2bf89d2bffe565b;hp=881a6aa72d16992c37cd5aa7433da0caaeeca55f;hb=5176a3e41f75dc3f0de6049ac642087580f94680;hpb=d794b33466a638e2b8d1dbc1b184773380c14b3c

diff --git a/lib/Mouse/Exporter.pm b/lib/Mouse/Exporter.pm
index 881a6aa..fc3bfb0 100644
--- a/lib/Mouse/Exporter.pm
+++ b/lib/Mouse/Exporter.pm
@@ -6,15 +6,15 @@ use Carp qw(confess);
 
 my %SPEC;
 
-my $strict_bits = strict::bits(qw(subs refs vars));
+use constant _strict_bits => strict::bits(qw(subs refs vars));
 
 # it must be "require", because Mouse::Util depends on Mouse::Exporter,
 # which depends on Mouse::Util::import()
 require Mouse::Util;
 
 sub import{
-    $^H              |= $strict_bits;         # strict->import;
-    ${^WARNING_BITS}  = $warnings::Bits{all}; # warnings->import;
+    $^H              |= _strict_bits;         # strict->import;
+    ${^WARNING_BITS} |= $warnings::Bits{all}; # warnings->import;
     return;
 }
 
@@ -24,6 +24,30 @@ sub setup_import_methods{
 
     my $exporting_package = $args{exporting_package} ||= caller();
 
+    my($import, $unimport) = $class->build_import_methods(%args);
+
+    no strict 'refs';
+
+    *{$exporting_package . '::import'}    = $import;
+    *{$exporting_package . '::unimport'}  = $unimport;
+
+    # for backward compatibility
+    *{$exporting_package . '::export_to_level'} = sub{
+        my($package, $level, undef, @args) = @_; # the third argument is redundant
+        $package->import({ into_level => $level + 1 }, @args);
+    };
+    *{$exporting_package . '::export'} = sub{
+        my($package, $into, @args) = @_;
+        $package->import({ into => $into }, @args);
+    };
+    return;
+}
+
+sub build_import_methods{
+    my($class, %args) = @_;
+
+    my $exporting_package = $args{exporting_package} ||= caller();
+
     $SPEC{$exporting_package} = \%args;
 
     # canonicalize args
@@ -78,7 +102,7 @@ sub setup_import_methods{
 
             if(my $init_meta = $package->can('init_meta')){
                 if(!grep{ $_ == $init_meta } @init_meta_methods){
-                    unshift @init_meta_methods, $init_meta;
+                    push @init_meta_methods, $init_meta;
                 }
             }
         }
@@ -105,23 +129,7 @@ sub setup_import_methods{
         }
     }
 
-    no strict 'refs';
-
-    *{$exporting_package . '::import'}    = \&do_import;
-    *{$exporting_package . '::unimport'}  = \&do_unimport;
-
-    # for backward compatibility
-
-    *{$exporting_package . '::export_to_level'} = sub{
-        my($package, $level, @args) = @_;
-        do_import($package, { into_level => $level + 1 }, @args);
-    };
-    *{$exporting_package . '::export'} = sub{
-        my($package, $into, @args) = @_;
-        do_import($package, { into => $into }, @args);
-    };
-
-    return;
+    return (\&do_import, \&do_unimport);
 }
 
 
@@ -135,10 +143,17 @@ sub do_import {
     my $into = _get_caller_package(ref($args[0]) ? shift @args : undef);
 
     my @exports;
+    my @traits;
 
-    foreach my $arg(@args){
+    while(@args){
+        my $arg = shift @args;
         if($arg =~ s/^-//){
-            Mouse::Util::not_supported("-$arg");
+            if($arg eq 'traits'){
+                push @traits, ref($args[0]) ? @{shift(@args)} : shift(@args);
+            }
+            else {
+                Mouse::Util::not_supported("-$arg");
+            }
         }
         elsif($arg =~ s/^://){
             my $group = $spec->{groups}{$arg}
@@ -150,20 +165,32 @@ sub do_import {
         }
     }
 
-    $^H              |= $strict_bits;         # strict->import;
-    ${^WARNING_BITS}  = $warnings::Bits{all}; # warnings->import;
-
-    if($into eq 'main' && !$spec->{_export_to_main}){
-        warn qq{$package does not export its sugar to the 'main' package.\n};
-        return;
-    }
+    $^H              |= _strict_bits;         # strict->import;
+    ${^WARNING_BITS} |= $warnings::Bits{all}; # warnings->import;
 
     if($spec->{INIT_META}){
+        my $meta;
         foreach my $init_meta(@{$spec->{INIT_META}}){
-            $into->$init_meta(for_class => $into);
+            $meta = $into->$init_meta(for_class => $into);
         }
 
-        # _apply_meta_traits($into); # TODO
+        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;
+
+            require Mouse::Util::MetaRole;
+            Mouse::Util::MetaRole::apply_metaclass_roles(
+                for_class       => $into,
+                metaclass_roles => \@traits,
+            );
+        }
+    }
+    elsif(@traits){
+        Carp::confess("Cannot provide traits when $package does not have an init_meta() method");
     }
 
     if(@exports){
@@ -223,14 +250,19 @@ sub _get_caller_package {
     }
 }
 
-1;
+#sub _spec{ %SPEC }
 
+1;
 __END__
 
 =head1 NAME
 
 Mouse::Exporter - make an import() and unimport() just like Mouse.pm
 
+=head1 VERSION
+
+This document describes Mouse version 0.42
+
 =head1 SYNOPSIS
 
     package MyApp::Mouse;
@@ -273,8 +305,15 @@ 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.
 
+=head1 METHODS
+
+=head2 C<< setup_import_methods( ARGS ) >>
+
+=head2 C<< build_import_methods( ARGS ) -> (\&import, \&unimport) >>
+
 =head1 SEE ALSO
 
 L<Moose::Exporter>
 
 =cut
+