X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2FImport-Into.git;a=blobdiff_plain;f=lib%2FImport%2FInto.pm;h=7ca9d0bc8062618649b0bcd90c12a01cc28d3ee1;hp=84effea2d8164d5a4bb159361c69d75e33c4e82d;hb=7a9ec1de996eb32a6fb07c942ae3c03744a82a17;hpb=6e5223e6c0c3bdaf61ecd4ec09f875aa57d45dff

diff --git a/lib/Import/Into.pm b/lib/Import/Into.pm
index 84effea..7ca9d0b 100644
--- a/lib/Import/Into.pm
+++ b/lib/Import/Into.pm
@@ -2,13 +2,14 @@ package Import::Into;
 
 use strict;
 use warnings FATAL => 'all';
+use Module::Runtime;
 
-our $VERSION = '1.002002'; # 1.2.2
+our $VERSION = '1.002004';
 
 sub _prelude {
   my $target = shift;
   my ($package, $file, $line, $level)
-    = ref $target         ? @{$target}{qw(package filename line)}
+    = ref $target         ? @{$target}{qw(package filename line level)}
     : $target =~ /[^0-9]/ ? ($target)
                           : (undef, undef, undef, $target);
   if (defined $level) {
@@ -24,8 +25,13 @@ sub _prelude {
 sub _make_action {
   my ($action, $target) = @_;
   my $version = ref $target && $target->{version};
-  my $ver_check = $version ? '$_[0]->VERSION($version);' : '';
-  eval _prelude($target).qq{sub { $ver_check shift->$action(\@_) }}
+  eval _prelude($target)
+    . q[sub {]
+    . q[  my $module = shift;]
+    . q[  Module::Runtime::require_module($module);]
+    . (ref $target && exists $target->{version} ? q[  $module->VERSION($version);] : q[])
+    . q[  $module->].$action.q[(@_);]
+    . q[}]
     or die "Failed to build action sub to ${action} for ${target}: $@";
 }
 
@@ -45,7 +51,7 @@ __END__
 
 =head1 NAME
 
-Import::Into - import packages into other packages
+Import::Into - Import packages into other packages
 
 =head1 SYNOPSIS
 
@@ -53,9 +59,6 @@ Import::Into - import packages into other packages
 
   use Import::Into;
 
-  use Thing1 ();
-  use Thing2 ();
-
   # simple
   sub import {
     Thing1->import::into(scalar caller);
@@ -109,8 +112,8 @@ C<Import::Into> provides global methods to make this painless.
 
 =head2 $package->import::into( $target, @arguments );
 
-A global method, callable on any package.  Imports the given package into
-C<$target>.  C<@arguments> are passed along to the package's import method.
+A global method, callable on any package.  Loads and imports the given package
+into C<$target>.  C<@arguments> are passed along to the package's import method.
 
 C<$target> can be an package name to export to, an integer for the
 caller level to export to, or a hashref with the following options:
@@ -192,7 +195,8 @@ an exporter and a pragma.
 
 So, a solution for that is:
 
-  my $sub = eval "package $target; sub { shift->import(\@_) }";
+  use Module::Runtime;
+  my $sub = eval "package $target; sub { use_module(shift)->import(\@_) }";
   $sub->($thing, @import_args);
 
 which means that import is called from the right place for pragmas to take
@@ -209,7 +213,7 @@ in the directive then need to be fetched using C<caller>:
   my $sub = eval qq{
     package $target;
   #line $line "$file"
-    sub { shift->import(\@_) }
+    sub { use_module(shift)->import(\@_) }
   };
   $sub->($thing, @import_args);
 
@@ -252,14 +256,6 @@ For more craziness of this order, have a look at the article I wrote at
 L<http://shadow.cat/blog/matt-s-trout/madness-with-methods> which covers
 coderef abuse and the C<${\...}> syntax.
 
-Final note: You do still need to ensure that you already loaded C<$thing> - if
-you're receiving this from a parameter, I recommend using L<Module::Runtime>:
-
-  use Import::Into;
-  use Module::Runtime qw(use_module);
-
-  use_module($thing)->import::into($target, @import_args);
-
 And that's it.
 
 =head1 SEE ALSO
@@ -281,6 +277,8 @@ mst - Matt S. Trout (cpan:MSTROUT) <mst@shadowcat.co.uk>
 
 haarg - Graham Knop (cpan:HAARG) <haarg@haarg.org>
 
+Mithaldu - Christian Walde (cpan:MITHALDU) <walde.christian@gmail.com>
+
 =head1 COPYRIGHT
 
 Copyright (c) 2012 the Import::Into L</AUTHOR> and L</CONTRIBUTORS>