Merge f5eeaf8 into 1ed1063

njlg · Aug 2, 2016 · aea155c · aea155c
2 parents 1ed1063 + f5eeaf8
commit aea155c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/lib/Rethinkdb.pm b/lib/Rethinkdb.pm
@@ -19,7 +19,7 @@ has 'term' => sub { Rethinkdb::Protocol->new->term; };
 
 sub import {
   my $class   = shift;
-  my $package = caller;
+  my $package = caller || 'main';
 
   no strict;
   *{"$package\::r"} = \&r;
@@ -28,11 +28,13 @@ sub import {
 }
 
 sub r {
-  my $package = caller;
+  my $package = caller || 'main';
   my $self;
 
-  if ($package::_rdb_io) {
-    $self = __PACKAGE__->new( io => $package::_rdb_io );
+  no strict "refs";
+  my $_rdb_io = ${$package . "::_rdb_io"};
+  if ($_rdb_io) {
+    $self = __PACKAGE__->new( io => $_rdb_io );
     $self->io->_rdb($self);
   }
   else {

diff --git a/lib/Rethinkdb/IO.pm b/lib/Rethinkdb/IO.pm
@@ -85,9 +85,10 @@ sub reconnect {
 # put the handle into main package
 sub repl {
   my $self    = shift;
-  my $package = caller;
+  my $package = caller || 'main';
 
-  $package::_rdb_io = $self;
+  no strict "refs";
+  ${$package . "::_rdb_io"} = $self;
   return $self;
 }