web-console 2.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02d40821ae813ac4e5893b4c853725833017cb46
-  data.tar.gz: 56b2826919677b8a93e6ecedce69a176949d15ee
+  metadata.gz: caf063e0c1a30832d5fa0b6ce776514809889448
+  data.tar.gz: 0ea92426f743c1463500a0367b8d490501b80e20
 SHA512:
-  metadata.gz: 6c6a07f241b5bfad39c7a588ac92bccc8f0786db1b807d3ab94b4ec13464d7d8514493634c88247a868e78e43169094d216da6f01c3559be45af39854a76a0a0
-  data.tar.gz: 4b656f08efb441715996f541f94806d9f6249171502fded529041c5fc5cead0a73ce4f155fe246f0c4a36c4a0b54f9bdd65fb3091ed5e9b9bfa86b9d95f3a552
+  metadata.gz: dc7485fccd26fc2af5a0110215df7baf09188f6ee94d2cb02a6da71c649bb22f84070ff4f7dd0d1c34ba355ff962ac590f1cf8520b04bc4db91ef5256e8b7b49
+  data.tar.gz: f8e6b128bfc10fba1c76d95287a0316d028281acac1853b451f024a99c23b6c2d26a6ad3cb1fa4b87395aaabd4c446f2dc3a9d1f792ceff2e86b34c1b7e92e76

data/CHANGELOG.markdown

@@ -2,14 +2,51 @@
 
 ## master (unreleased)
 
+## 3.3.1
+
+Drop support for Rails `4.2.0`.
+
+## 3.3.0
+
+* [203](https://github.com/rails/web-console/pull/203) Map bindings to traces based on the trace __FILE__ and __LINE__ ([@gsamokovarov])
+
+## 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])
+* [#189](https://github.com/rails/web-console/pull/189) Silence ActionView rendering information ([@gsamokovarov])
+
+## 3.1.1
+
+* [#185](https://github.com/rails/web-console/pull/185) Fix `rails console` startup ([@gsamokovarov])
+
+## 3.1.0
+
+* [#182](https://github.com/rails/web-console/pull/182) Let `#console` live in `Kernel` ([@schneems])
+* [#181](https://github.com/rails/web-console/pull/181) Log internal Web Console errors ([@gsamokovarov])
+* [#180](https://github.com/rails/web-console/pull/180) Autoload Web Console constants for faster Rails boot time ([@herminiotorres])
+
+## 3.0.0
+
+* [#173](https://github.com/rails/web-console/pull/173) Revert "Change config.development_only default until 4.2.4 is released" ([@gsamokovarov])
+* [#171](https://github.com/rails/web-console/pull/171) Fixed blocked IP logging ([@gsamokovarov])
+* [#162](https://github.com/rails/web-console/pull/162) Render the console inside the body tag ([@gsamokovarov])
+* [#165](https://github.com/rails/web-console/pull/165) Revamped integrations for CRuby and Rubinius ([@gsamokovarov])
+
 ## 2.3.0
 
-* [#181](https://github.com/rails/web-console/pull/181) Log internal Web Console errors ([@schneems])
-* [#150](https://github.com/rails/web-console/pull/150) Revert #150. ([@gsamokovarov])
+This is mainly a Rails 5 compatibility release. If you have the chance, please
+go to 3.1.0 instead.
+
+* [#181](https://github.com/rails/web-console/pull/181) Log internal Web Console errors (@schneems)
+* [#150](https://github.com/rails/web-console/pull/150) Revert #150. (@gsamokovarov)
 
 ## 2.2.1
 
-* [#150](https://github.com/rails/web-console/pull/150) Change config.development_only default until 4.2.4 is released. ([@gsamokovarov])
+* [#150](https://github.com/rails/web-console/pull/150) Change config.development_only default until 4.2.4 is released ([@gsamokovarov])
 
 ## 2.2.0
 
@@ -53,4 +90,5 @@
 [@parterburn]: https://github.com/parterburn
 [@sh19910711]: https://github.com/sh19910711
 [@frenesim]: https://github.com/frenesim
+[@herminiotorres]: https://github.com/herminiotorres
 [@schneems]: https://github.com/schneems

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2014 Charlie Somerville, Genadi Samokovarov, Guillermo Iguaran and Ryan Dao
+Copyright 2014-2016 Charlie Somerville, Genadi Samokovarov, Guillermo Iguaran and Ryan Dao
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -1,10 +1,8 @@
 <p align=right>
   Documentation for:
-  <a href=https://github.com/rails/web-console/tree/v2.0.0>v2.0.0</a>
-  <a href=https://github.com/rails/web-console/tree/v2.1.0>v2.1.0</a>
-  <a href=https://github.com/rails/web-console/tree/v2.1.1>v2.1.1</a>
-  <a href=https://github.com/rails/web-console/tree/v2.1.2>v2.1.2</a>
-  <a href=https://github.com/rails/web-console/tree/v2.1.3>v2.1.3</a>
+  <a href=https://github.com/rails/web-console/tree/v1.0.4>v1.0.4</a>
+  <a href=https://github.com/rails/web-console/tree/v2.2.1>v2.2.1</a>
+  <a href=https://github.com/rails/web-console/tree/v3.0.0>v3.0.0</a>
 </p>
 
 # Web Console [![Build Status](https://travis-ci.org/rails/web-console.svg?branch=master)](https://travis-ci.org/rails/web-console)
@@ -28,7 +26,7 @@ application, add the following to your `Gemfile`.
 
 ```ruby
 group :development do
-  gem 'web-console', '~> 2.0'
+  gem 'web-console'
 end
 ```
 
@@ -37,35 +35,9 @@ restart your server for the _Web Console_ to kick in.
 
 ## Runtime
 
-_Web Console_ uses [John Mair]'s [binding_of_caller] to spawn a console in a
-specific binding. This comes at the price of limited Ruby runtime support.
-
 ### CRuby
 
-CRuby 1.9.2 and below is **not** supported.
-
-### JRuby
-
-JRuby needs to run in interpreted mode. You can enable it by:
-
-```bash
-export JRUBY_OPTS=-J-Djruby.compile.mode=OFF
-
-# If you run JRuby 1.7.12 and above, you can use:
-export JRUBY_OPTS=--dev
-```
-
-An unstable version of [binding_of_caller] is needed as the latest stable one
-won't compile on _JRuby_. To install it, put the following in your application
-`Gemfile`:
-
-```ruby
-group :development do
-  gem 'binding_of_caller', '0.7.3.pre1'
-end
-```
-
-Only _JRuby_ 1.7, is supported (no JRuby 9K support at the moment).
+CRuby 2.2 and above is required.
 
 ### Rubinius
 
@@ -75,7 +47,7 @@ Internal errors like `ZeroDevisionError` aren't caught.
 
 The web console allows you to create an interactive Ruby session in your
 browser. Those sessions are launched automatically in case on an error, but
-they can also be launched manually in in any page.
+they can also be launched manually in any page.
 
 For example, calling `console` in a view will display a console in the current
 page in the context of the view binding.
@@ -96,8 +68,10 @@ class PostsController < ApplicationController
 end
 ```
 
-Only one `console` invocation is allowed per request. If you happen to have
-multiple ones, a `WebConsole::DoubleRenderError` is raised.
+The method is defined in `Kernel` and you can invoke it any application code.
+
+Only one `console` invocation is allowed once per request. If you happen to
+have multiple ones, a `WebConsole::DoubleRenderError` will be raised.
 
 ## Configuration
 
@@ -215,17 +189,16 @@ Make sure you configuration lives in `config/environments/development.rb`.
 
 ## Credits
 
-* Shoutout to [Charlie Somerville] for [better_errors] and [this] code.
-* Kudos to [John Mair] for [binding_of_caller].
+* Shoutout to [Charlie Somerville] for [better_errors].
+* Kudos to [John Mair] for [debug_inspector].
 * Thanks to [Charles Oliver Nutter] for all the _JRuby_ feedback.
-* Hugs and kisses to all of our [contributors].
+* Hugs and kisses to all of our [contributors]!
 
 [better_errors]: https://github.com/charliesome/better_errors
-[binding_of_caller]: https://github.com/banister/binding_of_caller
+[debug_inspector]: https://github.com/banister/debug_inspector
 [Charlie Somerville]: https://github.com/charliesome
 [John Mair]: https://github.com/banister
 [Charles Oliver Nutter]: https://github.com/headius
 [templates]: https://github.com/rails/web-console/tree/master/lib/web_console/templates
-[this]: https://github.com/rails/web-console/blob/master/lib/web_console/integration/cruby.rb#L20-L32
 [rvt]: https://github.com/gsamokovarov/rvt
 [contributors]: https://github.com/rails/web-console/graphs/contributors

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/extensions.rb

@@ -1,23 +1,45 @@
-ActionDispatch::DebugExceptions.class_eval do
-  def render_exception_with_web_console(request, exception)
-    render_exception_without_web_console(request, exception).tap do
-      # Retain superficial Rails 5 compatibility.
-      env = Hash === request ? request : request.env
+module Kernel
+  module_function
 
-      error = ActionDispatch::ExceptionWrapper.new(env, exception).exception
+  # Instructs Web Console to render a console in the specified binding.
+  #
+  # If +bidning+ isn't explicitly given it will default to the binding of the
+  # previous frame. E.g. the one that invoked +console+.
+  #
+  # Raises DoubleRenderError if a double +console+ invocation per request is
+  # detected.
+  def console(binding = WebConsole.caller_bindings.first)
+    raise WebConsole::DoubleRenderError if Thread.current[:__web_console_binding]
 
-      # Get the original exception if ExceptionWrapper decides to follow it.
-      env['web_console.exception'] = error
+    Thread.current[:__web_console_binding] = binding
 
-      # ActionView::Template::Error bypass ExceptionWrapper original
-      # exception following. The backtrace in the view is generated from
-      # reaching out to original_exception in the view.
-      if error.is_a?(ActionView::Template::Error)
-        env['web_console.exception'] = error.original_exception
+    # Make sure nothing is rendered from the view helper. Otherwise
+    # you're gonna see unexpected #<Binding:0x007fee4302b078> in the
+    # templates.
+    nil
+  end
+end
+
+module ActionDispatch
+  class DebugExceptions
+    def render_exception_with_web_console(request, exception)
+      render_exception_without_web_console(request, exception).tap do
+        backtrace_cleaner = request.get_header('action_dispatch.backtrace_cleaner')
+        error = ExceptionWrapper.new(backtrace_cleaner, exception).exception
+
+        # Get the original exception if ExceptionWrapper decides to follow it.
+        Thread.current[:__web_console_exception] = error
+
+        # ActionView::Template::Error bypass ExceptionWrapper original
+        # exception following. The backtrace in the view is generated from
+        # reaching out to original_exception in the view.
+        if error.is_a?(ActionView::Template::Error)
+          Thread.current[:__web_console_exception] = error.cause
+        end
       end
     end
-  end
 
-  alias_method :render_exception_without_web_console, :render_exception
-  alias_method :render_exception, :render_exception_with_web_console
+    alias_method :render_exception_without_web_console, :render_exception
+    alias_method :render_exception, :render_exception_with_web_console
+  end
 end

data/lib/web_console/integration/cruby.rb

@@ -1,40 +1,23 @@
-class Exception
-  begin
-    # We share the same exception binding extraction mechanism as better_errors,
-    # so try to use it if it is already available. It also solves problems like
-    # charliesome/better_errors#272, caused by an infinite recursion.
-    require 'better_errors'
+require 'debug_inspector'
 
-    # The bindings in which the exception originated in.
-    def bindings
-      @bindings || __better_errors_bindings_stack
-    end
-  rescue LoadError
-    # The bindings in which the exception originated in.
-    def bindings
-      @bindings || []
-    end
-
-    # CRuby calls #set_backtrace every time it raises an exception. Overriding
-    # it to assign the #bindings.
-    def set_backtrace_with_binding_of_caller(*args)
-      # Thanks to @charliesome who wrote this bit for better_errors.
-      unless Thread.current[:__web_console_exception_lock]
-        Thread.current[:__web_console_exception_lock] = true
-        begin
-          # Raising an exception here will cause all of the rubies to go into a
-          # stack overflow. Some rubies may even segfault. See
-          # https://bugs.ruby-lang.org/issues/10164 for details.
-          @bindings = binding.callers.drop(1)
-        ensure
-          Thread.current[:__web_console_exception_lock] = false
-        end
-      end
+def WebConsole.caller_bindings
+  bindings = RubyVM::DebugInspector.open do |context|
+    context.backtrace_locations.each_index.map { |i| context.frame_binding(i) }
+  end
 
-      set_backtrace_without_binding_of_caller(*args)
-    end
+  # For C functions, we can't extract a binding. In this case,
+  # DebugInspector#frame_binding would have returned us nil. That's why we need
+  # to compact the bindings.
+  #
+  # Dropping two bindings, removes the current Ruby one in this exact method,
+  # and the one in the caller method. The caller method binding can be obtained
+  # by Kernel#binding, if needed.
+  bindings.compact.drop(2)
+end
 
-    alias_method :set_backtrace_without_binding_of_caller, :set_backtrace
-    alias_method :set_backtrace, :set_backtrace_with_binding_of_caller
+TracePoint.trace(:raise) do |context|
+  exc = context.raised_exception
+  if exc.bindings.empty?
+    exc.instance_variable_set(:@bindings, WebConsole.caller_bindings)
   end
 end

data/lib/web_console/integration/rubinius.rb

@@ -1,62 +1,34 @@
-module WebConsole
-  module Rubinius
-    # Filters internal Rubinius locations.
-    #
-    # There are a couple of reasons why we wanna filter out the locations.
-    #
-    # * ::Kernel.raise, is implemented in Ruby for Rubinius. We don't wanna
-    #   have the frame for it to align with the CRuby and JRuby implementations.
-    #
-    # * For internal methods location variables can be nil. We can't create a
-    #   bindings for them.
-    #
-    # * Bindings from the current file are considered internal and ignored.
-    #
-    # We do that all that so we can align the bindings with the backtraces
-    # entries.
-    class InternalLocationFilter
-      def initialize(locations)
-        @locations = locations
-      end
+def WebConsole.caller_bindings
+  locations = ::Rubinius::VM.backtrace(1, true)
 
-      def filter
-        @locations.reject do |location|
-          location.file.start_with?('kernel/delta/kernel.rb') ||
-            location.file == __FILE__ ||
-            location.variables.nil?
-        end
-      end
-    end
-
-    # Gets the current bindings for all available Ruby frames.
-    #
-    # Filters the internal Rubinius and WebConsole frames.
-    def self.current_bindings
-      locations = ::Rubinius::VM.backtrace(1, true)
-
-      InternalLocationFilter.new(locations).filter.map do |location|
-        Binding.setup(
-          location.variables,
-          location.variables.method,
-          location.constant_scope,
-          location.variables.self,
-          location
-        )
-      end
-    end
+  # Kernel.raise, is implemented in Ruby for Rubinius. We don't wanna have
+  # the frame for it to align with the CRuby and JRuby implementations.
+  #
+  # For internal methods location variables can be nil. We can't create a
+  # bindings for them.
+  locations.reject! do |location|
+    location.file.start_with?('kernel/delta/kernel.rb') || location.variables.nil?
   end
-end
 
-::Exception.class_eval do
-  def bindings
-    @bindings || []
+  bindings = locations.map do |location|
+    Binding.setup(
+      location.variables,
+      location.variables.method,
+      location.constant_scope,
+      location.variables.self,
+      location
+    )
   end
+
+  # Drop the binding of the direct caller. That one can be created by
+  # Kernel#binding.
+  bindings.drop(1)
 end
 
 ::Rubinius.singleton_class.class_eval do
   def raise_exception_with_current_bindings(exc)
     if exc.bindings.empty?
-      exc.instance_variable_set(:@bindings, WebConsole::Rubinius.current_bindings)
+      exc.instance_variable_set(:@bindings, WebConsole.caller_bindings)
     end
 
     raise_exception_without_current_bindings(exc)

data/lib/web_console/integration.rb

@@ -1,8 +1,33 @@
+class Exception
+  # Returns an array of the exception backtrace locations bindings.
+  #
+  # The list won't map to the traces in #backtrace 1 to 1, because we can't
+  # build bindings for every trace (C functions, for example).
+  #
+  # Every integration should set the instance variable.
+  def bindings
+    defined?(@bindings) ? @bindings : []
+  end
+end
+
 case RUBY_ENGINE
 when 'rbx'
   require 'web_console/integration/rubinius'
-when 'jruby'
-  require 'web_console/integration/jruby'
 when 'ruby'
   require 'web_console/integration/cruby'
+else
+  # Prevent a `method redefined; discarding old caller_bindings` warning.
+
+  module WebConsole
+    # Returns the Ruby bindings of Kernel#callers locations.
+    #
+    # The list of bindings here doesn't map 1 to 1 with Kernel#callers, as we
+    # can't build Ruby bindings for C functions or the equivalent native
+    # implementations in JRuby and Rubinius.
+    #
+    # This method needs to be overridden by every integration.
+    def self.caller_bindings
+      raise NotImplementedError
+    end
+  end
 end

data/lib/web_console/middleware.rb

@@ -17,7 +17,7 @@ module WebConsole
     def call(env)
       app_exception = catch :app_exception do
         request = create_regular_or_whiny_request(env)
-        return @app.call(env) unless request.from_whitelited_ip?
+        return call_app(env) unless request.from_whitelisted_ip?
 
         if id = id_for_repl_session_update(request)
           return update_repl_session(id, request)
@@ -25,15 +25,9 @@ module WebConsole
           return change_stack_trace(id, request)
         end
 
-        status, headers, body = @app.call(env)
+        status, headers, body = call_app(env)
 
-        if exception = env['web_console.exception']
-          session = Session.from_exception(exception)
-        elsif binding = env['web_console.binding']
-          session = Session.from_binding(binding)
-        end
-
-        if session && acceptable_content_type?(headers)
+        if session = Session.from(Thread.current) and acceptable_content_type?(headers)
           response = Response.new(body, status, headers)
           template = Template.new(env, session)
 
@@ -49,13 +43,18 @@ module WebConsole
       WebConsole.logger.error("\n#{e.class}: #{e}\n\tfrom #{e.backtrace.join("\n\tfrom ")}")
       raise e
     ensure
+      # Clean up the fiber locals after the session creation. Object#console
+      # uses those to communicate the current binding or exception to the middleware.
+      Thread.current[:__web_console_exception] = nil
+      Thread.current[:__web_console_binding] = nil
+
       raise app_exception if Exception === app_exception
     end
 
     private
 
       def acceptable_content_type?(headers)
-        Mime::Type.parse(headers['Content-Type']).first == Mime::HTML
+        Mime::Type.parse(headers['Content-Type']).first == Mime[:html]
       end
 
       def json_response(opts = {})

data/lib/web_console/railtie.rb

@@ -6,21 +6,18 @@ module WebConsole
     config.web_console.whitelisted_ips = %w( 127.0.0.1 ::1 )
 
     initializer 'web_console.initialize' do
+      require 'web_console/integration'
       require 'web_console/extensions'
 
-      ActiveSupport.on_load(:action_view) do
-        ActionView::Base.send(:include, Helper)
-      end
-
-      ActiveSupport.on_load(:action_controller) do
-        ActionController::Base.send(:include, Helper)
+      if logger = ::Rails.logger
+        WebConsole.logger = logger
       end
     end
 
     initializer 'web_console.development_only' do
       unless (config.web_console.development_only == false) || Rails.env.development?
         abort <<-END.strip_heredoc
-          Web Console is activated in the #{Rails.env} environment, which is
+          Web Console is activated in the #{Rails.env} environment. This is
           usually a mistake. To ensure it's only activated in development
           mode, move it to the development group of your Gemfile:
 

data/lib/web_console/request.rb

@@ -5,14 +5,14 @@ module WebConsole
     cattr_accessor :whitelisted_ips
     @@whitelisted_ips = Whitelist.new
 
-    # Define a vendor MIME type. We can call it using Mime::WEB_CONSOLE_V2 constant.
+    # Define a vendor MIME type. We can call it using Mime[:web_console_v2].
     Mime::Type.register 'application/vnd.web-console.v2', :web_console_v2
 
     # Returns whether a request came from a whitelisted IP.
     #
     # For a request to hit Web Console features, it needs to come from a white
     # listed IP.
-    def from_whitelited_ip?
+    def from_whitelisted_ip?
       whitelisted_ips.include?(strict_remote_ip)
     end
 
@@ -23,7 +23,7 @@ module WebConsole
 
     # Returns whether the request is acceptable.
     def acceptable?
-      xhr? && accepts.any? { |mime| Mime::WEB_CONSOLE_V2 == mime }
+      xhr? && accepts.any? { |mime| Mime[:web_console_v2] == mime }
     end
 
     private

data/lib/web_console/session.rb

@@ -1,9 +1,9 @@
 module WebConsole
-  # A session lets you persist wrap an +Evaluator+ instance in memory
-  # associated with multiple bindings.
+  # A session lets you persist an +Evaluator+ instance in memory associated
+  # with multiple bindings.
   #
   # Each newly created session is persisted into memory and you can find it
-  # later its +id+.
+  # later by its +id+.
   #
   # A session may be associated with multiple bindings. This is used by the
   # error pages only, as currently, this is the only client that needs to do
@@ -21,14 +21,19 @@ module WebConsole
         inmemory_storage[id]
       end
 
-      # Create a Session from an exception.
-      def from_exception(exc)
-        new(exc.bindings)
-      end
-
-      # Create a Session from a single binding.
-      def from_binding(binding)
-        new(binding)
+      # Create a Session from an binding or exception in a storage.
+      #
+      # The storage is expected to respond to #[]. The binding is expected in
+      # :__web_console_binding and the exception in :__web_console_exception.
+      #
+      # Can return nil, if no binding or exception have been preserved in the
+      # storage.
+      def from(storage)
+        if exc = storage[:__web_console_exception]
+          new(ExceptionMapper.new(exc))
+        elsif binding = storage[:__web_console_binding]
+          new([binding])
+        end
       end
     end
 
@@ -37,8 +42,8 @@ module WebConsole
 
     def initialize(bindings)
       @id = SecureRandom.hex(16)
-      @bindings = Array(bindings)
-      @evaluator = Evaluator.new(@bindings[0])
+      @bindings = bindings
+      @evaluator = Evaluator.new(bindings.first)
 
       store_into_memory
     end

data/lib/web_console/templates/console.js.erb

@@ -488,7 +488,7 @@ REPLConsole.request = function request(method, url, params, callback) {
   xhr.open(method, url, true);
   xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
   xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
-  xhr.setRequestHeader("Accept", "<%= Mime::WEB_CONSOLE_V2 %>");
+  xhr.setRequestHeader("Accept", "<%= Mime[:web_console_v2] %>");
   xhr.send(params);
 
   xhr.onreadystatechange = function() {

data/lib/web_console/templates/layouts/javascript.erb

@@ -1,4 +1,4 @@
-<script type="text/javascript">
+<script type="text/javascript" data-template="<%= @template %>">
 (function() {
   <%= yield %>
 }).call(this);

data/lib/web_console/testing/fake_middleware.rb

@@ -1,11 +1,7 @@
 require 'action_view'
-require 'action_dispatch'
-require 'active_support/core_ext/string/access'
-require 'json'
-require 'web_console/whitelist'
-require 'web_console/request'
-require 'web_console/view'
+require 'web_console'
 require 'web_console/testing/helper'
+Mime = { web_console_v2: 'fake' }
 
 module WebConsole
   module Testing

data/lib/web_console/version.rb

@@ -1,3 +1,3 @@
 module WebConsole
-  VERSION = '2.3.0'
+  VERSION = '3.3.1'
 end

data/lib/web_console/view.rb

@@ -5,7 +5,7 @@ module WebConsole
     # The error pages are special, because they are the only pages that
     # currently require multiple bindings. We get those from exceptions.
     def only_on_error_page(*args)
-      yield if @env['web_console.exception'].present?
+      yield if Thread.current[:__web_console_exception].present?
     end
 
     # Render JavaScript inside a script tag and a closure.
@@ -14,6 +14,7 @@ module WebConsole
     # script tag and enclosed in a closure, so you don't have to worry for
     # leaking globals, unless you explicitly want to.
     def render_javascript(template)
+      assign(template: template)
       render(template: template, layout: 'layouts/javascript')
     end
 
@@ -25,6 +26,14 @@ module WebConsole
       render(template: template, layout: 'layouts/inlined_string')
     end
 
+    # Custom ActionView::Base#render wrapper which silences all the log
+    # printings.
+    #
+    # Helps to keep the Rails logs clean during errors.
+    def render(*)
+      WebConsole.logger.silence { super }
+    end
+
     # Override method for ActionView::Helpers::TranslationHelper#t.
     #
     # This method escapes the original return value for JavaScript, since the

data/lib/web_console/whiny_request.rb

@@ -4,9 +4,9 @@ module WebConsole
   # If any calls to +from_whitelisted_ip?+ and +acceptable_content_type?+
   # return false, an info log message will be displayed in users' logs.
   class WhinyRequest < SimpleDelegator
-    def from_whitelited_ip?
-      whine_unless request.from_whitelited_ip? do
-        "Cannot render console from #{request.remote_ip}! " \
+    def from_whitelisted_ip?
+      whine_unless request.from_whitelisted_ip? do
+        "Cannot render console from #{request.strict_remote_ip}! " \
           "Allowed networks: #{request.whitelisted_ips}"
       end
     end

data/lib/web_console.rb

@@ -1,25 +1,30 @@
-require 'binding_of_caller'
-
+require 'active_support/dependencies/autoload'
 require 'active_support/lazy_load_hooks'
 require 'active_support/logger'
 
-require 'web_console/integration'
-require 'web_console/railtie'
-require 'web_console/errors'
-require 'web_console/helper'
-require 'web_console/evaluator'
-require 'web_console/session'
-require 'web_console/template'
-require 'web_console/middleware'
-require 'web_console/whitelist'
-require 'web_console/request'
-require 'web_console/response'
-require 'web_console/view'
-require 'web_console/whiny_request'
-
 module WebConsole
+  extend ActiveSupport::Autoload
+
+  autoload :View
+  autoload :Evaluator
+  autoload :ExceptionMapper
+  autoload :Session
+  autoload :Response
+  autoload :Request
+  autoload :WhinyRequest
+  autoload :Whitelist
+  autoload :Template
+  autoload :Middleware
+
+  autoload_at 'web_console/errors' do
+    autoload :Error
+    autoload :DoubleRenderError
+  end
+
   mattr_accessor :logger
   @@logger = ActiveSupport::Logger.new($stderr)
 
   ActiveSupport.run_load_hooks(:web_console, self)
 end
+
+require 'web_console/railtie'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web-console
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Charlie Somerville
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-27 00:00:00.000000000 Z
+date: 2016-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -19,90 +19,56 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: sprockets-rails
+  name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: binding_of_caller
+  name: debug_inspector
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.2
-- !ruby/object:Gem::Dependency
-  name: actionmailer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
 description: 
 email:
 - charlie@charliesomerville.com
@@ -121,11 +87,10 @@ 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/helper.rb
 - lib/web_console/integration.rb
 - lib/web_console/integration/cruby.rb
-- lib/web_console/integration/jruby.rb
 - lib/web_console/integration/rubinius.rb
 - lib/web_console/locales/en.yml
 - lib/web_console/middleware.rb
@@ -165,7 +130,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/web_console/helper.rb

@@ -1,22 +0,0 @@
-module WebConsole
-  module Helper
-    # Communicates with the middleware to render a console in a +binding+.
-    #
-    # If +bidning+ isn't explicitly given, Binding#of_caller will be used to
-    # get the binding of the previous frame. E.g. the one that invoked
-    # +console+.
-    #
-    # Raises DoubleRenderError if a double +console+ invocation per request is
-    # detected.
-    def console(binding = nil)
-      raise DoubleRenderError if request.env['web_console.binding']
-
-      request.env['web_console.binding'] = binding || ::Kernel.binding.of_caller(1)
-
-      # Make sure nothing is rendered from the view helper. Otherwise
-      # you're gonna see unexpected #<Binding:0x007fee4302b078> in the
-      # templates.
-      nil
-    end
-  end
-end

data/lib/web_console/integration/jruby.rb

@@ -1,111 +0,0 @@
-require 'English'
-require 'active_support/core_ext/string/strip'
-
-java_import org.jruby.RubyInstanceConfig
-
-module WebConsole
-  module JRuby
-    class << self
-      # Returns whether JRuby is ran in interpreted mode.
-      def interpreted_mode?
-        compile_mode     = ::JRuby.runtime.instance_config.compile_mode
-        interpreted_mode = RubyInstanceConfig::CompileMode::OFF
-
-        compile_mode == interpreted_mode
-      end
-
-      # A proc to be used in Kernel#set_trace_func.
-      #
-      # It sets Exception#bindings for an error with all the bindings the
-      # current ThreadContext contains.
-      def set_exception_bindings_trace_func
-        proc do |event, file, line, id, binding, classname|
-          case event
-          when 'raise'
-            if $ERROR_INFO.bindings.empty?
-              # binding_of_caller will generate an improperly built binding at
-              # caller[1]. Every call to a non existent method, constant or a
-              # local variable will result in a Java NullPointerException.
-              #
-              # The binding that Kernel#set_trace_func is giving us is properly
-              # built, so we can use in place of the broken one.
-              bindings = ::Kernel.binding.callers.drop(2).unshift(binding)
-              $ERROR_INFO.instance_variable_set(:@bindings, bindings)
-            end
-          end
-        end
-      end
-    end
-
-    # A fake binding for JRuby in non interpreted mode.
-    #
-    # It won't actually evaluate any code, rather it will tell the user how to
-    # enable interpreted mode.
-    class FakeJRubyBinding
-      TURN_ON_INTERPRETED_MODE_TEXT = <<-END.strip_heredoc
-        JRuby needs to run in interpreted mode for introspection support.
-
-        To turn on interpreted mode, put -J-Djruby.compile.mode=OFF in the
-        JRUBY_OPTS environment variable.
-      END
-
-      def TURN_ON_INTERPRETED_MODE_TEXT.inspect
-        self
-      end
-
-      TURN_ON_INTERPRETED_MODE_TEXT.freeze
-
-      def eval(*)
-        TURN_ON_INTERPRETED_MODE_TEXT
-      end
-    end
-
-    # A fake array of FakeJRubyBinding objects.
-    #
-    # It is used in Exception#bindings to make sure that when users switch
-    # bindings on the UI, they get a FakeJRubyBinding notifying them what to do
-    # if they want introspection.
-    class FakeJRubyBindingsArray < Array
-      def [](*)
-        FakeJRubyBinding.new
-      end
-
-      # For Kernel#Array and other implicit conversion API. JRuby expects it to
-      # return an object that is_a? an Array. This is the reasoning of
-      # FakeJRubyBindingsArray being a subclass of Array.
-      def to_ary
-        self
-      end
-    end
-  end
-end
-
-if WebConsole::JRuby.interpreted_mode?
-  ::Exception.class_eval do
-    def bindings
-      @bindings || []
-    end
-  end
-
-  # Kernel#set_trace_func will complain about not being able to capture all the
-  # events without the JRuby --debug flag.
-  silence_warnings do
-    set_trace_func WebConsole::JRuby.set_exception_bindings_trace_func
-  end
-else
-  ::Exception.class_eval do
-    def bindings
-      WebConsole::JRuby::FakeJRubyBindingsArray.new
-    end
-  end
-
-  ::Binding.class_eval do
-    def of_caller(*)
-      WebConsole::JRuby::FakeJRubyBinding.new
-    end
-
-    def callers
-      WebConsole::JRuby::FakeJRubyBindingsArray.new
-    end
-  end
-end