Merge pull request #202 from sh19910711/patch/0036/raise-before-app

Use first binding when there is no application binding

Author: gsamokovarov

lib/web_console/session.rb

@@ -43,7 +43,7 @@ def from(storage)
     def initialize(bindings)
       @id = SecureRandom.hex(16)
       @bindings = Array(bindings)
-      @evaluator = Evaluator.new(initial_binding)
+      @evaluator = Evaluator.new(application_binding || @bindings.first)
 
       store_into_memory
     end
@@ -64,7 +64,7 @@ def switch_binding_to(index)
 
     private
 
-      def initial_binding
+      def application_binding
         @bindings.find { |b| b.eval('__FILE__').to_s.start_with?(Rails.root.to_s) }
       end
 

test/web_console/session_test.rb

@@ -39,6 +39,15 @@ def initialize(line)
       assert_equal session.eval('__FILE__'), "=> \"#{__FILE__}\"\n"
     end
 
+    test 'use first binding if no application bindings' do
+      binding = Object.new
+      binding.expects(:eval).with('__FILE__').returns 'framework'
+      binding.expects(:eval).with('called?').returns 'yes'
+
+      session = Session.new(binding)
+      assert_equal session.eval('called?'), "=> \"yes\"\n"
+    end
+
     test '#from can create session from a single binding' do
       saved_line, saved_binding = __LINE__, binding
       Thread.current[:__web_console_binding] = saved_binding