web-console 3.2.1 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cccaecbc9077b0e460d946cc12b7a740c1832885
-  data.tar.gz: a554f379e1a93e39794530da43da5964da36a074
+  metadata.gz: bf5732bddc2528664e5567694ec06c4c4a6c0fab
+  data.tar.gz: 302c11d030141cde9b568ff1a5c50f6f3cdbead9
 SHA512:
-  metadata.gz: 552ed1aca142857e5bb4d6e21b50c151348b9538018ed4464cf3c0b00d016272db4758cfbd0d96ee2c603f998536e8ab8f71e9a345f2d423d1fd2cbdebbd3335
-  data.tar.gz: 81df2259f8350875c61108d8edb3a274d4a169e91dd67a874d5b4dd32c2629fe17b7aaa1135fcd65c54b5316892aa83b61cab272c9df004986bfdfd53cd53ad7
+  metadata.gz: cd24a5c51ea68a52e01adb457a16a716b5b3d608f9e817f1bc8c0123ed688029f54363cebcca80eafe2d11e300cae467880d3536e89d21ca088e8513b78b95f0
+  data.tar.gz: 36b4e435412d84bbea06f5a3cda46a90a3cb440a0e6eb2f603649042be804d2760fa043e3ab319b3a060b12a46f83d064e10d7263eeea9cdc3ab58d9f9d4719c

data/README.markdown

@@ -26,7 +26,7 @@ application, add the following to your `Gemfile`.
 
 ```ruby
 group :development do
-  gem 'web-console', '~> 3.0'
+  gem 'web-console'
 end
 ```
 

data/lib/web_console.rb

@@ -7,6 +7,7 @@ module WebConsole
 
   autoload :View
   autoload :Evaluator
+  autoload :ExceptionMapper
   autoload :Session
   autoload :Response
   autoload :Request

data/lib/web_console/exception_mapper.rb

@@ -0,0 +1,33 @@
+module WebConsole
+  class ExceptionMapper
+    def initialize(exception)
+      @backtrace = exception.backtrace
+      @bindings = exception.bindings
+    end
+
+    def first
+      guess_the_first_application_binding || @bindings.first
+    end
+
+    def [](index)
+      guess_binding_for_index(index) || @bindings[index]
+    end
+
+    private
+
+    def guess_binding_for_index(index)
+      file, line = @backtrace[index].to_s.split(':')
+      line = line.to_i
+
+      @bindings.find do |binding|
+        binding.eval('__FILE__') == file && binding.eval('__LINE__') == line
+      end
+    end
+
+    def guess_the_first_application_binding
+      @bindings.find do |binding|
+        binding.eval('__FILE__').to_s.start_with?(Rails.root.to_s)
+      end
+    end
+  end
+end

data/lib/web_console/session.rb

@@ -30,9 +30,9 @@ module WebConsole
       # storage.
       def from(storage)
         if exc = storage[:__web_console_exception]
-          new(exc.bindings)
+          new(ExceptionMapper.new(exc))
         elsif binding = storage[:__web_console_binding]
-          new(binding)
+          new([binding])
         end
       end
     end
@@ -42,8 +42,8 @@ module WebConsole
 
     def initialize(bindings)
       @id = SecureRandom.hex(16)
-      @bindings = Array(bindings)
-      @evaluator = Evaluator.new(application_binding || @bindings.first)
+      @bindings = bindings
+      @evaluator = Evaluator.new(bindings.first)
 
       store_into_memory
     end
@@ -64,10 +64,6 @@ module WebConsole
 
     private
 
-      def application_binding
-        @bindings.find { |b| b.eval('__FILE__').to_s.start_with?(Rails.root.to_s) }
-      end
-
       def store_into_memory
         inmemory_storage[id] = self
       end

data/lib/web_console/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web-console
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.0
 platform: ruby
 authors:
 - Charlie Somerville
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2016-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -73,12 +73,12 @@ files:
 - lib/web_console.rb
 - lib/web_console/errors.rb
 - lib/web_console/evaluator.rb
+- lib/web_console/exception_mapper.rb
 - lib/web_console/extensions.rb
 - lib/web_console/integration.rb
 - lib/web_console/integration/cruby.rb
 - lib/web_console/integration/rubinius.rb
 - lib/web_console/locales/en.yml
-- lib/web_console/mapper.rb
 - lib/web_console/middleware.rb
 - lib/web_console/railtie.rb
 - lib/web_console/request.rb

data/lib/web_console/mapper.rb

@@ -1,14 +0,0 @@
-module WebConsole
-  class Mapper
-    def initialize(exception)
-      @exception = exception
-      @bindings = exception.bindings
-    end
-
-    def [](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