web-console 3.4.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 963c13addc1eda302c2fb5e217334b403e0f6a09
-  data.tar.gz: e8768504bc586024d0061ba82b0b275c65d93442
+  metadata.gz: 5b2ea6288a1823356b457a11ad5746b84b4788aa
+  data.tar.gz: 4ce3d79517c3aee34c9841d8c9d9d697329a7b44
 SHA512:
-  metadata.gz: 00d6e18111d7d37a870015012dd2e590e2e4e392490a9301e883e450a95f7b87b81c767dc3cf90829496d2efecd65ffe07599ac4f09dd50d1014ea35ccb6586a
-  data.tar.gz: 7be81b47f363fb912e2df95c6f44a493235fed6f72aae1f0ea11006919e593668b11d4473434480d448676ef1cfa5962f7e4cd5ada857636cec518357207254f
+  metadata.gz: 51316ba9e0ef5be8be874d5a77a15a54907ea73fd0d4cab8c15ae3b02ea1f5b4cdd42fb71636892f68c74f8c89c3866bd8eb9c69c92fde0ffd9f2944826922e7
+  data.tar.gz: d61663a8957c915c8f90efb54893874e5a8c6003241928336f9a54041b241e30c898b109a7994fc852e699b3d150f44753f226792b37a6f1234353df19df697b

data/CHANGELOG.markdown

@@ -2,6 +2,12 @@
 
 ## master (unreleased)
 
+## 3.5.0
+
+* [237](https://github.com/rails/web-console/pull/237) Bindex integration for JRuby 9k support ([@gsamokovarov])
+* [236](https://github.com/rails/web-console/pull/236) Remove unused Active Support lazy load hook ([@betesh])
+* [230](https://github.com/rails/web-console/pull/230) Handle invalid remote addresses ([@akirakoyasu])
+
 ## 3.4.0
 
 * [#205](https://github.com/rails/web-console/pull/205) Introduce autocompletion ([@sh19910711])
@@ -96,3 +102,5 @@ go to 3.1.0 instead.
 [@frenesim]: https://github.com/frenesim
 [@herminiotorres]: https://github.com/herminiotorres
 [@schneems]: https://github.com/schneems
+[@betesh]: https://github.com/betesh
+[@akirakoyasu]: https://github.com/akirakoyasu

data/README.markdown

@@ -10,10 +10,6 @@
 _Web Console_ is a debugging tool for your Ruby on Rails applications.
 
 - [Installation](#installation)
-- [Runtime](#runtime)
-  - [CRuby](#cruby)
-  - [JRuby](#jruby)
-  - [Rubinius](#rubinius)
 - [Configuration](#configuration)
 - [Usage](#usage)
 - [FAQ](#faq)
@@ -33,16 +29,6 @@ end
 After you save the `Gemfile` changes, make sure to run `bundle install` and
 restart your server for the _Web Console_ to kick in.
 
-## Runtime
-
-### CRuby
-
-CRuby 2.2 and above is required.
-
-### Rubinius
-
-Internal errors like `ZeroDevisionError` aren't caught.
-
 ## Usage
 
 The web console allows you to create an interactive Ruby session in your
@@ -162,7 +148,6 @@ All of _Web Console_ sessions are stored in memory. If you happen to run on a
 multi-process server (like Unicorn) you may get unavailable session errors
 while the server is still running. This is because a request may hit a
 different worker (process) that doesn't have the desired session in memory.
-
 To avoid that, if you use such servers in development, configure them so they
 server requests only out of one process.
 
@@ -190,12 +175,13 @@ Make sure your configuration lives in `config/environments/development.rb`.
 ## Credits
 
 * Shoutout to [Charlie Somerville] for [better_errors].
-* Kudos to [John Mair] for [debug_inspector].
+* Kudos to [John Mair] for [binding_of_caller] and [debug_inspector].
 * Thanks to [Charles Oliver Nutter] for all the _JRuby_ feedback.
 * Hugs and kisses to all of our [contributors]!
 
 [better_errors]: https://github.com/charliesome/better_errors
 [debug_inspector]: https://github.com/banister/debug_inspector
+[binding_of_caller]: https://github.com/banister/binding_of_caller
 [Charlie Somerville]: https://github.com/charliesome
 [John Mair]: https://github.com/banister
 [Charles Oliver Nutter]: https://github.com/headius

data/lib/web_console.rb

@@ -1,5 +1,4 @@
 require 'active_support/dependencies/autoload'
-require 'active_support/lazy_load_hooks'
 require 'active_support/logger'
 
 module WebConsole
@@ -24,8 +23,6 @@ module WebConsole
 
   mattr_accessor :logger
   @@logger = ActiveSupport::Logger.new($stderr)
-
-  ActiveSupport.run_load_hooks(:web_console, self)
 end
 
 require 'web_console/railtie'

data/lib/web_console/extensions.rb

@@ -3,12 +3,12 @@ module Kernel
 
   # 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
+  # If +binding+ 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)
+  def console(binding = Bindex.current_bindings.second)
     raise WebConsole::DoubleRenderError if Thread.current[:__web_console_binding]
 
     Thread.current[:__web_console_binding] = binding
@@ -20,12 +20,12 @@ module Kernel
   end
 end
 
-module ActionDispatch
-  class DebugExceptions
-    def render_exception_with_web_console(request, exception)
-      render_exception_without_web_console(request, exception).tap do
+module WebConsole
+  module DebugExceptionsExt
+    def render_exception(request, exception)
+      super(request, exception).tap do
         backtrace_cleaner = request.get_header('action_dispatch.backtrace_cleaner')
-        error = ExceptionWrapper.new(backtrace_cleaner, exception).exception
+        error = ActionDispatch::ExceptionWrapper.new(backtrace_cleaner, exception).exception
 
         # Get the original exception if ExceptionWrapper decides to follow it.
         Thread.current[:__web_console_exception] = error
@@ -38,8 +38,7 @@ module ActionDispatch
         end
       end
     end
-
-    alias_method :render_exception_without_web_console, :render_exception
-    alias_method :render_exception, :render_exception_with_web_console
   end
 end
+
+ActionDispatch::DebugExceptions.prepend(WebConsole::DebugExceptionsExt)

data/lib/web_console/middleware.rb

@@ -54,7 +54,7 @@ module WebConsole
     private
 
       def acceptable_content_type?(headers)
-        Mime::Type.parse(headers['Content-Type']).first == Mime[:html]
+        Mime::Type.parse(headers['Content-Type'].to_s).first == Mime[:html]
       end
 
       def json_response(opts = {})

data/lib/web_console/railtie.rb

@@ -6,7 +6,7 @@ module WebConsole
     config.web_console.whitelisted_ips = %w( 127.0.0.1 ::1 )
 
     initializer 'web_console.initialize' do
-      require 'web_console/integration'
+      require 'bindex'
       require 'web_console/extensions'
 
       if logger = ::Rails.logger
@@ -23,7 +23,7 @@ module WebConsole
 
               gem 'web-console', group: :development
 
-          If you still want to run it the #{Rails.env} environment (and know
+          If you still want to run it in the #{Rails.env} environment (and know
           what you are doing), put this in your Rails application
           configuration:
 
@@ -40,6 +40,7 @@ module WebConsole
       if mount_point = config.web_console.mount_point
         Middleware.mount_point = mount_point.chomp('/')
       end
+
       if root = Rails.application.config.relative_url_root
         Middleware.mount_point = File.join(root, Middleware.mount_point)
       end

data/lib/web_console/version.rb

@@ -1,3 +1,3 @@
 module WebConsole
-  VERSION = '3.4.0'
+  VERSION = '3.5.0'
 end

data/lib/web_console/whitelist.rb

@@ -15,6 +15,8 @@ module WebConsole
 
     def include?(network)
       @networks.any? { |whitelist| whitelist.include?(network.to_s) }
+    rescue IPAddr::InvalidAddressError
+      false
     end
 
     def to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web-console
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.5.0
 platform: ruby
 authors:
 - Charlie Somerville
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-29 00:00:00.000000000 Z
+date: 2017-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -56,19 +56,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: debug_inspector
+  name: bindex
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
 description: 
 email:
 - charlie@charliesomerville.com
@@ -90,9 +90,6 @@ files:
 - 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/middleware.rb
 - lib/web_console/railtie.rb
@@ -139,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A debugging tool for your Ruby on Rails applications.

data/lib/web_console/integration.rb

@@ -1,33 +0,0 @@
-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 '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/integration/cruby.rb

@@ -1,23 +0,0 @@
-require 'debug_inspector'
-
-def WebConsole.caller_bindings
-  bindings = RubyVM::DebugInspector.open do |context|
-    context.backtrace_locations.each_index.map { |i| context.frame_binding(i) }
-  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
-
-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,39 +0,0 @@
-def WebConsole.caller_bindings
-  locations = ::Rubinius::VM.backtrace(1, true)
-
-  # 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
-
-  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.caller_bindings)
-    end
-
-    raise_exception_without_current_bindings(exc)
-  end
-
-  alias_method :raise_exception_without_current_bindings, :raise_exception
-  alias_method :raise_exception, :raise_exception_with_current_bindings
-end