web-console 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 940d433552a2c981a254f3af3ff379d66a26f2e4
-  data.tar.gz: 45500122fe48a390b65b22526ba10647c08770e6
+  metadata.gz: cccaecbc9077b0e460d946cc12b7a740c1832885
+  data.tar.gz: a554f379e1a93e39794530da43da5964da36a074
 SHA512:
-  metadata.gz: d74f2c2b0a3f0c8d44e3d8ff2e1b6cff68c8c49e5577d94ab841920915e25a580843e88ac5baa4b3ccd3a3fcc12b75783338dc34efccaf2255095e71486bb445
-  data.tar.gz: 315b4431853bbf0710e6ce7d3e3148ff4665f8f296ba4497436e73efb5e304c3c5e733dc25972fbe6d9b3999641fd55934d9a70db5c98107532f1f1513b4fcc8
+  metadata.gz: 552ed1aca142857e5bb4d6e21b50c151348b9538018ed4464cf3c0b00d016272db4758cfbd0d96ee2c603f998536e8ab8f71e9a345f2d423d1fd2cbdebbd3335
+  data.tar.gz: 81df2259f8350875c61108d8edb3a274d4a169e91dd67a874d5b4dd32c2629fe17b7aaa1135fcd65c54b5316892aa83b61cab272c9df004986bfdfd53cd53ad7

data/CHANGELOG.markdown

@@ -2,6 +2,10 @@
 
 ## master (unreleased)
 
+## 3.2.1
+
+* [#202](https://github.com/rails/web-console/pull/202) Use first binding when there is no application binding ([@sh19910711])
+
 ## 3.2.0
 
 * [#198](https://github.com/rails/web-console/pull/198) Pick the first application trace binding on errors ([@sh19910711])

data/lib/web_console/mapper.rb

@@ -2,10 +2,13 @@ module WebConsole
   class Mapper
     def initialize(exception)
       @exception = exception
+      @bindings = exception.bindings
     end
 
     def [](index)
-      @exception.backtrace[index]
+      trace = @exception.backtrace[index]
+      file, line = trace.to_s.strip(':')
+      @bindings.find { |b| b.eval('__FILE__') == file && b.eval('__LINE__') == line }
     end
   end
 end

data/lib/web_console/session.rb

@@ -43,7 +43,7 @@ module WebConsole
     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 @@ module WebConsole
 
     private
 
-      def initial_binding
+      def application_binding
         @bindings.find { |b| b.eval('__FILE__').to_s.start_with?(Rails.root.to_s) }
       end
 

data/lib/web_console/version.rb

@@ -1,3 +1,3 @@
 module WebConsole
-  VERSION = '3.2.0'
+  VERSION = '3.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web-console
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Charlie Somerville
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-06 00:00:00.000000000 Z
+date: 2016-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties