Fix an issue in Mouse::Object::new to throw informative messages

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

diff --git a/lib/Mouse/Exporter.pm b/lib/Mouse/Exporter.pm
index d90fbe3..910456c 100644 (file)
--- a/lib/Mouse/Exporter.pm
+++ b/lib/Mouse/Exporter.pm
@@ -4,24 +4,50 @@ use warnings;
 
 use Carp qw(confess);
 
-# it must be "require", because Mouse::Util depends on Mouse::Exporter
-require Mouse::Util;
-
 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;
+    $^H              |= _strict_bits;         # strict->import;
     ${^WARNING_BITS}  = $warnings::Bits{all}; # warnings->import;
     return;
 }
 
+
 sub setup_import_methods{
     my($class, %args) = @_;
 
     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
@@ -34,7 +60,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{
@@ -76,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;
                 }
             }
         }
@@ -103,12 +129,7 @@ sub setup_import_methods{
         }
     }
 
-    no strict 'refs';
-
-    *{$exporting_package . '::import'}    = \&do_import;
-    *{$exporting_package . '::unimport'}  = \&do_unimport;
-
-    return;
+    return (\&do_import, \&do_unimport);
 }
 
 
@@ -122,6 +143,7 @@ sub do_import {
     my $into = _get_caller_package(ref($args[0]) ? shift @args : undef);
 
     my @exports;
+
     foreach my $arg(@args){
         if($arg =~ s/^-//){
             Mouse::Util::not_supported("-$arg");
@@ -136,10 +158,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;
     }
@@ -192,45 +214,88 @@ 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) = @_;
 
-    # 2 extra level because it's called by import so there's a layer\r
-    # of indirection\r
-    my $offset = 1;\r
-
     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
+=head1 VERSION
 
-    package MouseX::Foo;
-    use Mouse::Exporter;
+This document describes Mouse version 0.39
 
-    Mouse::Exporter->setup_import_methods(
+=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
+    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
+    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
+
+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
+