web-console 3.5.1 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8a1cf82ab4c1380c5d85d7cdbda8b48d8ef0d7e4
-  data.tar.gz: 15b623e433d5101d376444ad1122b00282fc3fa6
+SHA256:
+  metadata.gz: bb1461a9213387e0c8158f62623d63b0ecff23c0cc6ccd91433ab203eec3eb8b
+  data.tar.gz: 45336b5c06bff19cd02d1b651d5917934434367d0efcb546ec55afd9b0b66804
 SHA512:
-  metadata.gz: 7e02abfa3203653103218c7a187c5cc4337b252f5a383ad5c3cfd06eee7d0a93f42f08230131bab0bc9481d7ba78cc8296230a78af7e393fa08bc1a08f8c4b76
-  data.tar.gz: fae466a396dfdff3c5c2397c002ca6c5ca9d1e9b82d59a71d71f4c39b3752f2a3b41101675b9f8c1c9ec40edb71ab0784e007839cc53c2622660131a05883351
+  metadata.gz: 638a0796f7049de3544b8d342d72545d72c06a56e0ecc82dbc2974fd16b2e81ab91a56ff9615e61ef34bfded1dda8f29187b4792db3d2bd757fed7e27dcf5d27
+  data.tar.gz: b52c4650487ec31ef5ba20ec4fdf180016f730ddffe2a8bf9909a32db39c362a4ae2ae60a59441fe1c0fc1a177933d4e09e634a5af3b4f51b23b4b51dfe13321

data/CHANGELOG.markdown

@@ -2,15 +2,24 @@
 
 ## master (unreleased)
 
+## 3.6.0
+
+* [#254](https://github.com/rails/web-console/pull/254) Rescue ActionDispatch::RemoteIp::IpSpoofAttackError ([@wjordan])
+* [#250](https://github.com/rails/web-console/pull/250) Close original body to comply with Rack SPEC ([@wagenet])
+* [#249](https://github.com/rails/web-console/pull/249) Update for frozen-string-literal friendliness ([@pat])
+* [#248](https://github.com/rails/web-console/pull/248) Fix copy on Safari ([@ybart])
+* [#246](https://github.com/rails/web-console/pull/246) International keyboard special character input fixes ([@fl0l0u])
+* [#244](https://github.com/rails/web-console/pull/244) Let WebConsole.logger respect Rails.logger ([@gsamokovarov])
+
 ## 3.5.1
 
-* [239](https://github.com/rails/web-console/pull/239) Fix the ActionDispatch::DebugExceptions integration ([@gsamokovarov])
+* [#239](https://github.com/rails/web-console/pull/239) Fix the ActionDispatch::DebugExceptions integration ([@gsamokovarov])
 
 ## 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])
+* [#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
 
@@ -22,7 +31,7 @@ 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])
+* [#203](https://github.com/rails/web-console/pull/203) Map bindings to traces based on the trace __FILE__ and __LINE__ ([@gsamokovarov])
 
 ## 3.2.1
 
@@ -55,8 +64,8 @@ Drop support for Rails `4.2.0`.
 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)
+* [#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
 
@@ -108,3 +117,8 @@ go to 3.1.0 instead.
 [@schneems]: https://github.com/schneems
 [@betesh]: https://github.com/betesh
 [@akirakoyasu]: https://github.com/akirakoyasu
+[@wagenet]: https://github.com/wagenet
+[@wjordan]: https://github.com/wjordan
+[@pat]: https://github.com/pat
+[@ybart]: https://github.com/ybart
+[@fl0l0u]: https://github.com/fl0l0u

data/README.markdown

@@ -2,7 +2,6 @@
   Documentation for:
   <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)
@@ -17,8 +16,7 @@ _Web Console_ is a debugging tool for your Ruby on Rails applications.
 
 ## Installation
 
-_Web Console_ is meant to work as a Rails plugin. To install it in your current
-application, add the following to your `Gemfile`.
+Add the following to your `Gemfile`.
 
 ```ruby
 group :development do
@@ -26,13 +24,10 @@ group :development do
 end
 ```
 
-After you save the `Gemfile` changes, make sure to run `bundle install` and
-restart your server for the _Web Console_ to kick in.
-
 ## Usage
 
 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
+browser. Those sessions are launched automatically in case of an error, but
 they can also be launched manually in any page.
 
 For example, calling `console` in a view will display a console in the current
@@ -56,8 +51,8 @@ end
 
 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.
+Only one `console` invocation per request is allowed. If you happen to
+have multiple ones, `WebConsole::DoubleRenderError` will be raised.
 
 ## Configuration
 

data/Rakefile

@@ -1,26 +1,28 @@
+# frozen_string_literal: true
+
 begin
-  require 'bundler/setup'
+  require "bundler/setup"
 rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+  puts "You must `gem install bundler` and `bundle install` to run rake tasks"
 end
 
-require 'socket'
-require 'rake/testtask'
-require 'tmpdir'
-require 'securerandom'
-require 'json'
-require 'web_console/testing/erb_precompiler'
+require "socket"
+require "rake/testtask"
+require "tmpdir"
+require "securerandom"
+require "json"
+require "web_console/testing/erb_precompiler"
 
 EXPANDED_CWD = File.expand_path(File.dirname(__FILE__))
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
+  t.libs << "lib"
+  t.libs << "test"
+  t.pattern = "test/**/*_test.rb"
   t.verbose = false
 end
 
-Dir['lib/web_console/tasks/**/*.rake'].each { |task| load task  }
+Dir["lib/web_console/tasks/**/*.rake"].each { |task| load task  }
 
 Bundler::GemHelper.install_tasks
 

data/lib/web-console.rb

@@ -1 +1,3 @@
-require 'web_console'
+# frozen_string_literal: true
+
+require "web_console"

data/lib/web_console.rb

@@ -1,5 +1,7 @@
-require 'active_support/dependencies/autoload'
-require 'active_support/logger'
+# frozen_string_literal: true
+
+require "active_support/dependencies/autoload"
+require "active_support/logger"
 
 module WebConsole
   extend ActiveSupport::Autoload
@@ -16,13 +18,14 @@ module WebConsole
   autoload :Middleware
   autoload :Context
 
-  autoload_at 'web_console/errors' do
+  autoload_at "web_console/errors" do
     autoload :Error
     autoload :DoubleRenderError
   end
 
-  mattr_accessor :logger
-  @@logger = ActiveSupport::Logger.new($stderr)
+  def self.logger
+    Rails.logger || (@logger ||= ActiveSupport::Logger.new($stderr))
+  end
 end
 
-require 'web_console/railtie'
+require "web_console/railtie"

data/lib/web_console/context.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WebConsole
   # A context lets you get object names related to the current session binding.
   class Context
@@ -17,12 +19,12 @@ module WebConsole
     private
 
       GLOBAL_OBJECTS = [
-        'instance_variables',
-        'local_variables',
-        'methods',
-        'class_variables',
-        'Object.constants',
-        'global_variables'
+        "instance_variables",
+        "local_variables",
+        "methods",
+        "class_variables",
+        "Object.constants",
+        "global_variables"
       ]
 
       def global

data/lib/web_console/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WebConsole
   # The base class for every Web Console related error.
   Error = Class.new(StandardError)

data/lib/web_console/evaluator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WebConsole
   # Simple Ruby code evaluator.
   #
@@ -8,7 +10,7 @@ module WebConsole
     # Cleanses exceptions raised inside #eval.
     cattr_reader :cleaner
     @@cleaner = ActiveSupport::BacktraceCleaner.new
-    @@cleaner.add_silencer { |line| line.start_with?(File.expand_path('..', __FILE__)) }
+    @@cleaner.add_silencer { |line| line.start_with?(File.expand_path("..", __FILE__)) }
 
     def initialize(binding = TOPLEVEL_BINDING)
       @binding = binding
@@ -25,7 +27,7 @@ module WebConsole
       def format_exception(exc)
         backtrace = cleaner.clean(Array(exc.backtrace) - caller)
 
-        format = "#{exc.class.name}: #{exc}\n"
+        format = "#{exc.class.name}: #{exc}\n".dup
         format << backtrace.map { |trace| "\tfrom #{trace}\n" }.join
         format
       end

data/lib/web_console/exception_mapper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WebConsole
   class ExceptionMapper
     def initialize(exception)
@@ -15,19 +17,19 @@ module WebConsole
 
     private
 
-    def guess_binding_for_index(index)
-      file, line = @backtrace[index].to_s.split(':')
-      line = line.to_i
+      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
+        @bindings.find do |binding|
+          binding.eval("__FILE__") == file && binding.eval("__LINE__") == line
+        end
       end
-    end
 
-    def guess_the_first_application_binding
-      @bindings.find do |binding|
-        binding.eval('__FILE__').to_s.start_with?(Rails.root.to_s)
+      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
 end

data/lib/web_console/extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Kernel
   module_function
 
@@ -24,7 +26,7 @@ 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')
+        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.

data/lib/web_console/middleware.rb

@@ -1,11 +1,13 @@
-require 'active_support/core_ext/string/strip'
+# frozen_string_literal: true
+
+require "active_support/core_ext/string/strip"
 
 module WebConsole
   class Middleware
-    TEMPLATES_PATH = File.expand_path('../templates', __FILE__)
+    TEMPLATES_PATH = File.expand_path("../templates", __FILE__)
 
     cattr_accessor :mount_point
-    @@mount_point = '/__web_console'
+    @@mount_point = "/__web_console"
 
     cattr_accessor :whiny_requests
     @@whiny_requests = true
@@ -27,13 +29,13 @@ module WebConsole
 
         status, headers, body = call_app(env)
 
-        if session = Session.from(Thread.current) and acceptable_content_type?(headers)
+        if (session = Session.from(Thread.current)) && acceptable_content_type?(headers)
           response = Response.new(body, status, headers)
           template = Template.new(env, session)
 
           response.headers["X-Web-Console-Session-Id"] = session.id
           response.headers["X-Web-Console-Mount-Point"] = mount_point
-          response.write(template.render('index'))
+          response.write(template.render("index"))
           response.finish
         else
           [ status, headers, body ]
@@ -54,12 +56,12 @@ module WebConsole
     private
 
       def acceptable_content_type?(headers)
-        Mime::Type.parse(headers['Content-Type'].to_s).first == Mime[:html]
+        Mime::Type.parse(headers["Content-Type"].to_s).first == Mime[:html]
       end
 
       def json_response(opts = {})
         status  = opts.fetch(:status, 200)
-        headers = { 'Content-Type' => 'application/json; charset = utf-8' }
+        headers = { "Content-Type" => "application/json; charset = utf-8" }
         body    = yield.to_json
 
         Rack::Response.new(body, status, headers).finish
@@ -121,13 +123,13 @@ module WebConsole
 
       def respond_with_unavailable_session(id)
         json_response(status: 404) do
-          { output: format(I18n.t('errors.unavailable_session'), id: id)}
+          { output: format(I18n.t("errors.unavailable_session"), id: id) }
         end
       end
 
       def respond_with_unacceptable_request
         json_response(status: 406) do
-          { output: I18n.t('errors.unacceptable_request') }
+          { output: I18n.t("errors.unacceptable_request") }
         end
       end
 

data/lib/web_console/railtie.rb

@@ -1,20 +1,18 @@
-require 'rails/railtie'
+# frozen_string_literal: true
+
+require "rails/railtie"
 
 module WebConsole
   class Railtie < ::Rails::Railtie
     config.web_console = ActiveSupport::OrderedOptions.new
     config.web_console.whitelisted_ips = %w( 127.0.0.1 ::1 )
 
-    initializer 'web_console.initialize' do
-      require 'bindex'
-      require 'web_console/extensions'
-
-      if logger = ::Rails.logger
-        WebConsole.logger = logger
-      end
+    initializer "web_console.initialize" do
+      require "bindex"
+      require "web_console/extensions"
     end
 
-    initializer 'web_console.development_only' do
+    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. This is
@@ -32,13 +30,13 @@ module WebConsole
       end
     end
 
-    initializer 'web_console.insert_middleware' do |app|
+    initializer "web_console.insert_middleware" do |app|
       app.middleware.insert_before ActionDispatch::DebugExceptions, Middleware
     end
 
-    initializer 'web_console.mount_point' do
+    initializer "web_console.mount_point" do
       if mount_point = config.web_console.mount_point
-        Middleware.mount_point = mount_point.chomp('/')
+        Middleware.mount_point = mount_point.chomp("/")
       end
 
       if root = Rails.application.config.relative_url_root
@@ -46,26 +44,26 @@ module WebConsole
       end
     end
 
-    initializer 'web_console.template_paths' do
+    initializer "web_console.template_paths" do
       if template_paths = config.web_console.template_paths
         Template.template_paths.unshift(*Array(template_paths))
       end
     end
 
-    initializer 'web_console.whitelisted_ips' do
+    initializer "web_console.whitelisted_ips" do
       if whitelisted_ips = config.web_console.whitelisted_ips
         Request.whitelisted_ips = Whitelist.new(whitelisted_ips)
       end
     end
 
-    initializer 'web_console.whiny_requests' do
+    initializer "web_console.whiny_requests" do
       if config.web_console.key?(:whiny_requests)
         Middleware.whiny_requests = config.web_console.whiny_requests
       end
     end
 
-    initializer 'i18n.load_path' do
-      config.i18n.load_path.concat(Dir[File.expand_path('../locales/*.yml', __FILE__)])
+    initializer "i18n.load_path" do
+      config.i18n.load_path.concat(Dir[File.expand_path("../locales/*.yml", __FILE__)])
     end
   end
 end

data/lib/web_console/request.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WebConsole
   # Web Console tailored request object.
   class Request < ActionDispatch::Request
@@ -6,7 +8,7 @@ module WebConsole
     @@whitelisted_ips = Whitelist.new
 
     # 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
+    Mime::Type.register "application/vnd.web-console.v2", :web_console_v2
 
     # Returns whether a request came from a whitelisted IP.
     #
@@ -19,6 +21,8 @@ module WebConsole
     # Determines the remote IP using our much stricter whitelist.
     def strict_remote_ip
       GetSecureIp.new(self, whitelisted_ips).to_s
+    rescue ActionDispatch::RemoteIp::IpSpoofAttackError
+      "[Spoofed]"
     end
 
     # Returns whether the request is acceptable.

data/lib/web_console/response.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WebConsole
   # A response object that writes content before the closing </body> tag, if
   # possible.
@@ -7,13 +9,15 @@ module WebConsole
     def write(content)
       raw_body = Array(body).first.to_s
 
-      if position = raw_body.rindex('</body>')
-        raw_body.insert(position, content)
-      else
-        raw_body << content
-      end
+      # We're done with the original body object, so make sure to close it to comply with the Rack SPEC
+      body.close if body.respond_to?(:close)
 
-      self.body = raw_body
+      self.body =
+        if position = raw_body.rindex("</body>")
+          raw_body.dup.insert(position, content)
+        else
+          raw_body.dup << content
+        end
     end
 
     def finish

data/lib/web_console/session.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WebConsole
   # A session lets you persist an +Evaluator+ instance in memory associated
   # with multiple bindings.

data/lib/web_console/tasks/extensions.rake

@@ -1,23 +1,25 @@
+# frozen_string_literal: true
+
 namespace :ext do
-  rootdir = Pathname('extensions')
+  rootdir = Pathname("extensions")
 
-  desc 'Build Chrome Extension'
-  task chrome: 'chrome:build'
+  desc "Build Chrome Extension"
+  task chrome: "chrome:build"
 
   namespace :chrome do
-    dist   = Pathname('dist/crx')
+    dist   = Pathname("dist/crx")
     extdir = rootdir.join(dist)
-    manifest_json = rootdir.join('chrome/manifest.json')
+    manifest_json = rootdir.join("chrome/manifest.json")
 
     directory extdir
 
-    task build: [ extdir, 'lib:templates' ] do
+    task build: [ extdir, "lib:templates" ] do
       cd rootdir do
-        cp_r [ 'img/', 'tmp/lib/' ], dist
+        cp_r [ "img/", "tmp/lib/" ], dist
         `cd chrome && git ls-files`.split("\n").each do |src|
           dest = dist.join(src)
           mkdir_p dest.dirname
-          cp Pathname('chrome').join(src), dest
+          cp Pathname("chrome").join(src), dest
         end
       end
     end
@@ -34,7 +36,7 @@ namespace :ext do
       cd(extdir) { sh "zip -r ../crx-web-console-#{version}.zip ./" }
     end
 
-    desc 'Launch a browser with the chrome extension.'
+    desc "Launch a browser with the chrome extension."
     task run: [ :build ] do
       cd(rootdir) { sh "sh ./script/run_chrome.sh --load-extension=#{dist}" }
     end
@@ -45,15 +47,15 @@ namespace :ext do
   end
 
   namespace :lib do
-    templates = Pathname('lib/web_console/templates')
-    tmplib    = rootdir.join('tmp/lib/')
-    js_erb    = FileList.new(templates.join('**/*.js.erb'))
+    templates = Pathname("lib/web_console/templates")
+    tmplib    = rootdir.join("tmp/lib/")
+    js_erb    = FileList.new(templates.join("**/*.js.erb"))
     dirs      = js_erb.pathmap("%{^#{templates},#{tmplib}}d")
 
     task templates: dirs + js_erb.pathmap("%{^#{templates},#{tmplib}}X")
 
     dirs.each { |d| directory d }
-    rule '.js' => [ "%{^#{tmplib},#{templates}}X.js.erb" ] do |t|
+    rule ".js" => [ "%{^#{tmplib},#{templates}}X.js.erb" ] do |t|
       File.write(t.name, WebConsole::Testing::ERBPrecompiler.new(t.source).build)
     end
   end

data/lib/web_console/tasks/templates.rake

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 namespace :templates do
-  desc 'Run tests for templates'
+  desc "Run tests for templates"
   task test: [ :daemonize, :npm, :rackup, :wait, :mocha, :kill, :exit ]
   task serve: [ :npm, :rackup ]
 
-  workdir = Pathname(EXPANDED_CWD).join('test/templates')
+  workdir = Pathname(EXPANDED_CWD).join("test/templates")
   pid     = Pathname(Dir.tmpdir).join("web_console_test.pid")
   runner  = URI.parse("http://#{ENV['IP'] || '127.0.0.1'}:#{ENV['PORT'] || 29292}/html/test_runner.html")
   rackup  = "rackup --host #{runner.host} --port #{runner.port}"
   result  = nil
-  browser = 'phantomjs'
+  browser = "phantomjs"
 
   def need_to_wait?(uri)
     Net::HTTP.start(uri.host, uri.port) { |http| http.get(uri.path) }
@@ -20,13 +22,13 @@ namespace :templates do
     rackup += " -D --pid #{pid}"
   end
 
-  task :npm => [ :phantomjs ] do
-    Dir.chdir(workdir) { system 'npm install --silent' }
+  task npm: [ :phantomjs ] do
+    Dir.chdir(workdir) { system "npm install --silent" }
   end
 
   task :phantomjs do
     unless system("which #{browser} >/dev/null")
-      browser = './node_modules/.bin/phantomjs'
+      browser = "./node_modules/.bin/phantomjs"
       Dir.chdir(workdir) { system("test -f #{browser} || npm install --silent phantomjs-prebuilt") }
     end
   end

data/lib/web_console/template.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WebConsole
   # A facade that handles template rendering and composition.
   #
@@ -6,7 +8,7 @@ module WebConsole
   class Template
     # Lets you customize the default templates folder location.
     cattr_accessor :template_paths
-    @@template_paths = [ File.expand_path('../templates', __FILE__) ]
+    @@template_paths = [ File.expand_path("../templates", __FILE__) ]
 
     def initialize(env, session)
       @env = env

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

@@ -494,7 +494,7 @@ REPLConsole.prototype.getSuggestion = function(keyword) {
     hint.className = 'console-hint';
     hint.dataset.keyword = found;
     hint.innerText = found.substr(self.suggestKeyword.length);
-    // clear hinting information after timeout in a few time 
+    // clear hinting information after timeout in a few time
     if (self.suggestTimeout) clearTimeout(self.suggestTimeout);
     self.suggestTimeout = setTimeout(function() { self.renderInput() }, self.suggestWait);
   }
@@ -710,9 +710,10 @@ REPLConsole.prototype.onKeyDown = function(ev) {
   }
 
   if (ev.ctrlKey || ev.metaKey) {
-    // Set focus to our clipboard in case they hit the "v" key
-    this.clipboard.focus();
     if (ev.keyCode == 86) {
+      // Set focus to our clipboard when they hit the "v" key
+      this.clipboard.focus();
+
       // Pasting to clipboard doesn't happen immediately,
       // so we have to wait for a while to get the pasted text.
       var _this = this;
@@ -732,7 +733,7 @@ REPLConsole.prototype.onKeyDown = function(ev) {
  */
 REPLConsole.prototype.onKeyPress = function(ev) {
   // Only write to the console if it's a single key press.
-  if (ev.ctrlKey || ev.metaKey) { return; }
+  if (ev.ctrlKey && !ev.altKey || ev.metaKey) { return; }
   var keyCode = ev.keyCode || ev.which;
   this.insertAtCurrent(String.fromCharCode(keyCode));
   ev.stopPropagation();

data/lib/web_console/testing/erb_precompiler.rb

@@ -1,5 +1,7 @@
-require 'web_console/testing/helper'
-require 'web_console/testing/fake_middleware'
+# frozen_string_literal: true
+
+require "web_console/testing/helper"
+require "web_console/testing/fake_middleware"
 
 module WebConsole
   module Testing
@@ -8,7 +10,7 @@ module WebConsole
       def initialize(path)
         @erb  = ERB.new(File.read(path))
         @view = FakeMiddleware.new(
-          view_path: Helper.gem_root.join('lib/web_console/templates'),
+          view_path: Helper.gem_root.join("lib/web_console/templates"),
         ).view
       end
 

data/lib/web_console/testing/fake_middleware.rb

@@ -1,12 +1,14 @@
-require 'action_view'
-require 'web_console'
-require 'web_console/testing/helper'
-Mime = { web_console_v2: 'fake' }
+# frozen_string_literal: true
+
+require "action_view"
+require "web_console"
+require "web_console/testing/helper"
+Mime = { web_console_v2: "fake" }
 
 module WebConsole
   module Testing
     class FakeMiddleware
-      I18n.load_path.concat(Dir[Helper.gem_root.join('lib/web_console/locales/*.yml')])
+      I18n.load_path.concat(Dir[Helper.gem_root.join("lib/web_console/locales/*.yml")])
 
       DEFAULT_HEADERS = { "Content-Type" => "application/javascript" }
 

data/lib/web_console/testing/helper.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module WebConsole
   module Testing
     module Helper
       def self.gem_root
-        Pathname(File.expand_path('../../../../', __FILE__))
+        Pathname(File.expand_path("../../../../", __FILE__))
       end
     end
   end

data/lib/web_console/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WebConsole
-  VERSION = '3.5.1'
+  VERSION = "3.6.0"
 end

data/lib/web_console/view.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WebConsole
   class View < ActionView::Base
     # Execute a block only on error pages.
@@ -15,7 +17,7 @@ module WebConsole
     # leaking globals, unless you explicitly want to.
     def render_javascript(template)
       assign(template: template)
-      render(template: template, layout: 'layouts/javascript')
+      render(template: template, layout: "layouts/javascript")
     end
 
     # Render inlined string to be used inside of JavaScript code.
@@ -23,7 +25,7 @@ module WebConsole
     # The inlined string is returned as an actual JavaScript string. You
     # don't need to wrap the result yourself.
     def render_inlined_string(template)
-      render(template: template, layout: 'layouts/inlined_string')
+      render(template: template, layout: "layouts/inlined_string")
     end
 
     # Custom ActionView::Base#render wrapper which silences all the log
@@ -31,7 +33,7 @@ module WebConsole
     #
     # Helps to keep the Rails logs clean during errors.
     def render(*)
-      if logger = WebConsole.logger and logger.respond_to?(:silence)
+      if (logger = WebConsole.logger) && logger.respond_to?(:silence)
         WebConsole.logger.silence { super }
       else
         super

data/lib/web_console/whiny_request.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WebConsole
   # Noisy wrapper around +Request+.
   #
@@ -21,7 +23,7 @@ module WebConsole
       end
 
       def logger
-        env['action_dispatch.logger'] || WebConsole.logger
+        env["action_dispatch.logger"] || WebConsole.logger
       end
 
       def request

data/lib/web_console/whitelist.rb

@@ -1,4 +1,6 @@
-require 'ipaddr'
+# frozen_string_literal: true
+
+require "ipaddr"
 
 module WebConsole
   # Whitelist of allowed networks that can access Web Console.
@@ -20,7 +22,7 @@ module WebConsole
     end
 
     def to_s
-      @networks.map(&method(:human_readable_ipaddr)).join(', ')
+      @networks.map(&method(:human_readable_ipaddr)).join(", ")
     end
 
     private
@@ -38,7 +40,7 @@ module WebConsole
       end
 
       def human_readable_ipaddr(ipaddr)
-        ipaddr.to_range.to_s.split('..').uniq.join('/')
+        ipaddr.to_range.to_s.split("..").uniq.join("/")
       end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web-console
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.6.0
 platform: ruby
 authors:
 - Charlie Somerville
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2018-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A debugging tool for your Ruby on Rails applications.