X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=lib%2FMouse%2FExporter.pm;h=e3cb85a848be0546f216482683baf1bb67294bec;hp=971be8aad4573bfa2d26c204ad87106fc69e3b7c;hb=3d7c6ec96a92be50258d124bdec61fb91bca3830;hpb=5ea1528fe2d2674078792994204fd8387a619c2b

diff --git a/lib/Mouse/Exporter.pm b/lib/Mouse/Exporter.pm
index 971be8a..e3cb85a 100644
--- a/lib/Mouse/Exporter.pm
+++ b/lib/Mouse/Exporter.pm
@@ -14,7 +14,7 @@ require Mouse::Util;
 
 sub import{
     $^H              |= _strict_bits;         # strict->import;
-    ${^WARNING_BITS}  = $warnings::Bits{all}; # warnings->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, undef, @args) = @_; # the third argument is redundant
-        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}
@@ -151,19 +166,33 @@ 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;
-    }
+    ${^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 = $package->$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_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){
@@ -198,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};
@@ -206,75 +236,82 @@ sub do_unimport {
     return;
 }
 
-# 1 extra level because it's called by import so there's a layer
-# of indirection
-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
 
 Mouse::Exporter - make an import() and unimport() just like Mouse.pm
 
+=head1 VERSION
+
+This document describes Mouse version 0.49
+
 =head1 SYNOPSIS
 
-    package MyApp::Mouse;
-
-    use Mouse ();
-    use Mouse::Exporter;
-
-    Mouse::Exporter->setup_import_methods(
-      as_is     => [ 'has_rw', 'other_sugar', \&Some::Random::thing ],
-      also      => 'Mouse',
-    );
-
+    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;
-        my ( $name, %options ) = @_;
-        $meta->add_attribute(
-          $name,
-          is => 'rw',
-          %options,
-        );
-    }
-
-    # then later ...
-    package MyApp::User;
-
-    use MyApp::Mouse;
-
-    has 'name';
-    has_rw 'size';
-    thing;
-
+        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
-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.
+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.
 
+=head1 METHODS
+
+=head2 C<< setup_import_methods( ARGS ) >>
+
+=head2 C<< build_import_methods( ARGS ) -> (\&import, \&unimport) >>
+
 =head1 SEE ALSO
 
 L<Moose::Exporter>