X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FExporter.pm;h=971be8aad4573bfa2d26c204ad87106fc69e3b7c;hb=2efecf0c95cc665cfeb69e36107a1c1320ff52cf;hp=5884c68a7bf1c6c6e949fc61bfdd566492d1e475;hpb=1ff34b4c204afd341fbb946205acb1a08fe2d4a4;p=gitmo%2FMouse.git

diff --git a/lib/Mouse/Exporter.pm b/lib/Mouse/Exporter.pm
index 5884c68..971be8a 100644
--- a/lib/Mouse/Exporter.pm
+++ b/lib/Mouse/Exporter.pm
@@ -4,11 +4,20 @@ use warnings;
 
 use Carp qw(confess);
 
-use Mouse::Util qw(get_code_info not_supported);
-
 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;
+    return;
+}
+
 
 sub setup_import_methods{
     my($class, %args) = @_;
@@ -27,7 +36,7 @@ sub setup_import_methods{
             push @export_from, $current;
 
             my $also = $SPEC{$current}{also} or next;
-            push @stack, grep{ !$seen{$_}++ } @{ $also };
+            push @stack, grep{ !$seen{$_}++ } ref($also) ? @{ $also } : $also;
         }
     }
     else{
@@ -50,7 +59,7 @@ sub setup_import_methods{
 
                     if(ref($thingy)){
                         $code = $thingy;
-                        ($code_package, $code_name) = get_code_info($code);
+                        ($code_package, $code_name) = Mouse::Util::get_code_info($code);
                     }
                     else{
                         no strict 'refs';
@@ -76,9 +85,9 @@ sub setup_import_methods{
         $args{EXPORTS}    = \%exports;
         $args{REMOVABLES} = \@removables;
 
-        $args{group}{all}     ||= \@all;
+        $args{groups}{all}     ||= \@all;
 
-        if(my $default_list = $args{group}{default}){
+        if(my $default_list = $args{groups}{default}){
             my %default;
             foreach my $keyword(@{$default_list}){
                 $default{$keyword} = $exports{$keyword}
@@ -87,8 +96,8 @@ sub setup_import_methods{
             $args{DEFAULT} = \%default;
         }
         else{
-            $args{group}{default} ||= \@all;
-            $args{DEFAULT}          = $args{EXPORTS};
+            $args{groups}{default} ||= \@all;
+            $args{DEFAULT}           = $args{EXPORTS};
         }
 
         if(@init_meta_methods){
@@ -101,6 +110,17 @@ sub setup_import_methods{
     *{$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;
 }
 
@@ -115,12 +135,13 @@ sub do_import {
     my $into = _get_caller_package(ref($args[0]) ? shift @args : undef);
 
     my @exports;
+
     foreach my $arg(@args){
         if($arg =~ s/^-//){
-            not_supported "-$arg";
+            Mouse::Util::not_supported("-$arg");
         }
         elsif($arg =~ s/^://){
-            my $group = $spec->{group}{$arg}
+            my $group = $spec->{groups}{$arg}
                 || confess(qq{The $package package does not export the group "$arg"});
             push @exports, @{$group};
         }
@@ -129,10 +150,10 @@ sub do_import {
         }
     }
 
-    $^H              |= $strict_bits;         # strict->import;
+    $^H              |= _strict_bits;         # strict->import;
     ${^WARNING_BITS}  = $warnings::Bits{all}; # warnings->import;
 
-    if($into eq 'main' && !$spec->{_not_export_to_main}){
+    if($into eq 'main' && !$spec->{_export_to_main}){
         warn qq{$package does not export its sugar to the 'main' package.\n};
         return;
     }
@@ -185,45 +206,78 @@ 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) = @_;
 
-    # 2 extra level because it's called by import so there's a layer
-    # of indirection
-    my $offset = 1;
-
     if(ref $arg){
         return defined($arg->{into})       ? $arg->{into}
-             : defined($arg->{into_level}) ? scalar caller($offset + $arg->{into_level})
-             :                               scalar caller($offset);
+             : defined($arg->{into_level}) ? scalar caller(_LEVEL + $arg->{into_level})
+             :                               scalar caller(_LEVEL);
     }
     else{
-        return scalar caller($offset);
+        return scalar caller(_LEVEL);
     }
 }
 
+#sub _spec{ %SPEC }
+
 1;
 
 __END__
 
 =head1 NAME
 
-Mouse - The Mouse Exporter
+Mouse::Exporter - make an import() and unimport() just like Mouse.pm
 
 =head1 SYNOPSIS
 
-    package MouseX::Foo;
-    use Mouse::Exporter;
-
-    Mouse::Exporter->setup_import_methods(
-
-    );
+    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;
+
+    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.
+
+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 SEE ALSO
 
 L<Moose::Exporter>
 
 =cut
+