X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2FDevel-REPL.git;a=blobdiff_plain;f=lib%2FDevel%2FREPL%2FPlugin%2FLexEnv.pm;h=8d9d370da9925e1f4b0b0e4cd8c1eff14d65fa18;hp=fd91a91eae527760faa362ec01acf3beb093ada3;hb=e2d0b0198529e2e06593df8ebab7a8413bc932e1;hpb=bd67131f89dd3b141458a20e3b456f23d6f62ee0

diff --git a/lib/Devel/REPL/Plugin/LexEnv.pm b/lib/Devel/REPL/Plugin/LexEnv.pm
index fd91a91..8d9d370 100644
--- a/lib/Devel/REPL/Plugin/LexEnv.pm
+++ b/lib/Devel/REPL/Plugin/LexEnv.pm
@@ -1,13 +1,17 @@
 package Devel::REPL::Plugin::LexEnv;
 
-use Moose::Role;
-use namespace::clean -except => [ 'meta' ];
+use Devel::REPL::Plugin;
+use namespace::sweep;
 use Lexical::Persistence;
+use MooX::Types::MooseLike::Base qw(InstanceOf ArrayRef);
 
-with 'Devel::REPL::Plugin::FindVariable';
+sub BEFORE_PLUGIN {
+    my $self = shift;
+    $self->load_plugin('FindVariable');
+}
 
 has 'lexical_environment' => (
-  isa => 'Lexical::Persistence',
+  isa => InstanceOf('Lexical::Persistence'),
   is => 'rw',
   required => 1,
   lazy => 1,
@@ -15,7 +19,7 @@ has 'lexical_environment' => (
 );
 
 has '_hints' => (
-  isa => "ArrayRef",
+  isa => ArrayRef,
   is => "rw",
   predicate => '_has_hints',
 );
@@ -44,12 +48,45 @@ around 'execute' => sub {
   return $self->$orig($wrapped, @rest);
 };
 
-around 'find_variable' => sub {
-  my $orig = shift;
-  my ($self, $name) = @_;
-  my $variable = $self->lexical_environment->get_context('_')->{$name};
-  return \$variable if $variable;
-  return $orig->(@_);
-};
+# this doesn't work! yarg. we now just check $self->can('lexical_environment')
+# in FindVariable
+
+#around 'find_variable' => sub {
+#  my $orig = shift;
+#  my ($self, $name) = @_;
+#
+#  return \( $self->lexical_environment->get_context('_')->{$name} )
+#    if exists $self->lexical_environment->get_context('_')->{$name};
+#
+#  return $orig->(@_);
+#};
 
 1;
+
+__END__
+
+=head1 NAME
+
+Devel::REPL::Plugin::LexEnv - Provide a lexical environment for the REPL
+
+=head1 SYNOPSIS
+
+ # in your re.pl file:
+ use Devel::REPL;
+ my $repl = Devel::REPL->new;
+ $repl->load_plugin('LexEnv');
+
+ $repl->lexical_environment->do(<<'CODEZ');
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+ use MyApp::Schema;
+ my $s = MyApp::Schema->connect('dbi:Pg:dbname=foo','broseph','elided');
+ CODEZ
+
+ $repl->run;
+
+ # after you run re.pl:
+ $ warn $s->resultset('User')->first->first_name # <-- note that $s works
+
+=cut
+