web-console 4.2.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a491428cda19f89cf20ad5ef83558e948feecb7acb7f46b453c5644ad419131b
-  data.tar.gz: 3e3d2902466fc03684b00591b294df2c19af06db31e43f58f1f9e8de14cb731f
+  metadata.gz: ed1dcd754f3147bcefa20043ba34ea374d9acac479d68e3eae7b89b3ee68994d
+  data.tar.gz: 7556b35cf5abd8d6438931b7d4cce3dd082483617cfeca28545d7a1bb5c83d06
 SHA512:
-  metadata.gz: d949e602f1056bda92b2e7e13e030a78bd856befeb52ccd89c57c27a5341bab30830e27969f3fd9bf8e3d5e4467de381cb788cd9d5809ad6f5d662b2a00b3993
-  data.tar.gz: a17229c83c77f2fdc2b06ca4d25674391e9318490da932de015d0d8ebc59bf652ccb010577eea9d95c357fcd703ba6b5fb8f2afc8343ad79306e80834f52d77d
+  metadata.gz: 757a0810bb51d57678f588d7f70ac3734c0a32740aa357acab67edc880701588bf703ca6e90e0e228b3ea8a6d009bd32b8b5e0d3cfb7f0569d784c69028d2c08
+  data.tar.gz: 7ffb4ff41a124ca94852bc043dc4e745ee43e112c4e986e83ad9296f2d97cad17f83ce05b3f9917c5b68f74741aa674ec0bd052e97b588cd822cfbdd2a315e7b

data/CHANGELOG.markdown

@@ -1,11 +1,16 @@
 # CHANGELOG
 
-## master (unreleased)
+## main (unreleased)
+
+# 4.2.1
+
+* Support to Rails 7.1
+* Support to Rack 3.0
 
 ## 4.2.0
 
 * [#308](https://github.com/rails/web-console/pull/308) Fix web-console inline templates rendering ([@voxik])
-* [#306](https://github.com/rails/web-console/pull/306) Support Ruby 3.0 and above ([@ruanwood])
+* [#306](https://github.com/rails/web-console/pull/306) Support Ruby 3.0 and above ([@ryanwood])
 
 ## 4.1.0
 

data/README.markdown

@@ -1,11 +1,11 @@
 <p align=right>
-  <strong>Current version: 4.1.0</strong> | Documentation for:
+  <strong>Current version: 4.2.1</strong> | 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.7.0>v3.7.0</a>
 </p>
 
-# Web Console [![Build Status](https://travis-ci.org/rails/web-console.svg?branch=master)](https://travis-ci.org/rails/web-console)
+# Web Console [![CI](https://github.com/rails/web-console/actions/workflows/ci.yml/badge.svg)](https://github.com/rails/web-console/actions/workflows/ci.yml)
 
 _Web Console_ is a debugging tool for your Ruby on Rails applications.
 
@@ -186,7 +186,7 @@ Make sure your configuration lives in `config/environments/development.rb`.
 [Hailey Somerville]: https://github.com/haileys
 [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
+[templates]: https://github.com/rails/web-console/tree/main/lib/web_console/templates
 [rvt]: https://github.com/gsamokovarov/rvt
 [contributors]: https://github.com/rails/web-console/graphs/contributors
 [Passenger on Nginx]: https://www.phusionpassenger.com/library/config/nginx/reference/#passengerstickysessions

data/lib/web_console/injector.rb

@@ -13,10 +13,10 @@ module WebConsole
     end
 
     def inject(content)
-      # Set Content-Length header to the size of the current body
+      # Set content-length header to the size of the current body
       # + the extra content. Otherwise the response will be truncated.
-      if @headers["Content-Length"]
-        @headers["Content-Length"] = (@body.bytesize + content.bytesize).to_s
+      if @headers[Rack::CONTENT_LENGTH]
+        @headers[Rack::CONTENT_LENGTH] = (@body.bytesize + content.bytesize).to_s
       end
 
       [

data/lib/web_console/interceptor.rb

@@ -1,8 +1,7 @@
 module WebConsole
   module Interceptor
-    def self.call(request, exception)
+    def self.call(request, error)
       backtrace_cleaner = request.get_header("action_dispatch.backtrace_cleaner")
-      error = ActionDispatch::ExceptionWrapper.new(backtrace_cleaner, exception).exception
 
       # Get the original exception if ExceptionWrapper decides to follow it.
       Thread.current[:__web_console_exception] = error

data/lib/web_console/middleware.rb

@@ -28,8 +28,8 @@ module WebConsole
         status, headers, body = call_app(env)
 
         if (session = Session.from(Thread.current)) && acceptable_content_type?(headers)
-          headers["X-Web-Console-Session-Id"] = session.id
-          headers["X-Web-Console-Mount-Point"] = mount_point
+          headers["x-web-console-session-id"] = session.id
+          headers["x-web-console-mount-point"] = mount_point
 
           template = Template.new(env, session)
           body, headers = Injector.new(body, headers).inject(template.render("index"))
@@ -52,12 +52,12 @@ module WebConsole
     private
 
       def acceptable_content_type?(headers)
-        headers["Content-Type"].to_s.include?("html")
+        headers[Rack::CONTENT_TYPE].to_s.include?("html")
       end
 
       def json_response(opts = {})
         status  = opts.fetch(:status, 200)
-        headers = { "Content-Type" => "application/json; charset = utf-8" }
+        headers = { Rack::CONTENT_TYPE => "application/json; charset = utf-8" }
         body    = yield.to_json
 
         [ status, headers, [ body ] ]

data/lib/web_console/railtie.rb

@@ -51,6 +51,10 @@ module WebConsole
       end
     end
 
+    initializer "web_console.deprecator" do |app|
+      app.deprecators[:web_console] = WebConsole.deprecator if app.respond_to?(:deprecators)
+    end
+
     initializer "web_console.permissions" do
       permissions = web_console_permissions
       Request.permissions = Permissions.new(permissions)
@@ -63,7 +67,7 @@ module WebConsole
       when config.web_console.allowed_ips
         config.web_console.allowed_ips
       when config.web_console.whitelisted_ips
-        ActiveSupport::Deprecation.warn(<<-MSG.squish)
+        WebConsole.deprecator.warn(<<-MSG.squish)
           The config.web_console.whitelisted_ips is deprecated and will be ignored in future release of web_console.
           Please use config.web_console.allowed_ips instead.
         MSG

data/lib/web_console/source_location.rb

@@ -1,15 +1,17 @@
 # frozen_string_literal: true
 
-class SourceLocation
-  def initialize(binding)
-    @binding = binding
-  end
+module WebConsole
+  class SourceLocation
+    def initialize(binding)
+      @binding = binding
+    end
 
-  if RUBY_VERSION >= "2.6"
-    def path() @binding.source_location.first end
-    def lineno() @binding.source_location.last end
-  else
-    def path() @binding.eval("__FILE__") end
-    def lineno() @binding.eval("__LINE__") end
+    if RUBY_VERSION >= "2.6"
+      def path() @binding.source_location.first end
+      def lineno() @binding.source_location.last end
+    else
+      def path() @binding.eval("__FILE__") end
+      def lineno() @binding.eval("__LINE__") end
+    end
   end
 end

data/lib/web_console/tasks/templates.rake

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "net/http"
+
 namespace :templates do
   desc "Run tests for templates"
   task test: [ :daemonize, :npm, :rackup, :wait, :mocha, :kill, :exit ]
@@ -10,7 +12,6 @@ namespace :templates do
   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"
 
   def need_to_wait?(uri)
     Net::HTTP.start(uri.host, uri.port) { |http| http.get(uri.path) }
@@ -22,17 +23,10 @@ namespace :templates do
     rackup += " -D --pid #{pid}"
   end
 
-  task npm: [ :phantomjs ] do
+  task :npm do
     Dir.chdir(workdir) { system "npm install --silent" }
   end
 
-  task :phantomjs do
-    unless system("which #{browser} >/dev/null")
-      browser = "./node_modules/.bin/phantomjs"
-      Dir.chdir(workdir) { system("test -f #{browser} || npm install --silent phantomjs-prebuilt") }
-    end
-  end
-
   task :rackup do
     Dir.chdir(workdir) { system rackup }
   end
@@ -43,7 +37,7 @@ namespace :templates do
   end
 
   task :mocha do
-    Dir.chdir(workdir) { result = system("#{browser} ./node_modules/mocha-phantomjs-core/mocha-phantomjs-core.js #{runner} dot") }
+    Dir.chdir(workdir) { result = system("npx mocha-headless-chrome -f #{runner} -r dot") }
   end
 
   task :kill do

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

@@ -935,8 +935,8 @@ REPLConsole.request = function request(method, url, params, callback) {
   var xhr = new REPLConsole.XMLHttpRequest();
 
   xhr.open(method, url, true);
-  xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
-  xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+  xhr.setRequestHeader("content-type", "application/x-www-form-urlencoded");
+  xhr.setRequestHeader("x-requested-with", "XMLHttpRequest");
   xhr.send(params);
 
   xhr.onreadystatechange = function() {

data/lib/web_console/testing/fake_middleware.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "action_view"
+require "action_dispatch" # This is needed to use Mime::Type
 require "web_console"
 require "web_console/testing/helper"
 
@@ -9,7 +10,7 @@ module WebConsole
     class FakeMiddleware
       I18n.load_path.concat(Dir[Helper.gem_root.join("lib/web_console/locales/*.yml")])
 
-      DEFAULT_HEADERS = { "Content-Type" => "application/javascript" }
+      DEFAULT_HEADERS = { Rack::CONTENT_TYPE => "application/javascript" }
 
       def initialize(opts)
         @headers        = opts.fetch(:headers, DEFAULT_HEADERS)
@@ -18,18 +19,21 @@ module WebConsole
       end
 
       def call(env)
-        [ 200, @headers, [ render(req_path(env)) ] ]
+        body = render(req_path(env))
+        @headers[Rack::CONTENT_LENGTH] = body.bytesize.to_s
+
+        [ 200, @headers, [ body ] ]
       end
 
       def view
-        @view = View.new(@view_path)
+        @view = View.with_empty_template_cache.with_view_paths(@view_path)
       end
 
       private
 
         # extract target path from REQUEST_PATH
         def req_path(env)
-          env["REQUEST_PATH"].match(@req_path_regex)[1]
+          File.basename(env["REQUEST_PATH"].match(@req_path_regex)[1], ".*")
         end
 
         def render(template)

data/lib/web_console/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WebConsole
-  VERSION = "4.2.0"
+  VERSION = "4.2.1"
 end

data/lib/web_console.rb

@@ -26,7 +26,11 @@ module WebConsole
   end
 
   def self.logger
-    Rails.logger || (@logger ||= ActiveSupport::Logger.new($stderr))
+    (defined?(Rails.logger) && Rails.logger) || (@logger ||= ActiveSupport::Logger.new($stderr))
+  end
+
+  def self.deprecator
+    @deprecator ||= ActiveSupport::Deprecation.new("5.0", "WebConsole")
   end
 end
 

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: web-console
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.1
 platform: ruby
 authors:
 - Hailey Somerville
 - Genadi Samokovarov
 - Guillermo Iguaran
 - Ryan Dao
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-17 00:00:00.000000000 Z
+date: 2023-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -69,7 +69,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.0
-description:
+description: 
 email:
 - hailey@hailey.lol
 - gsamokovarov@gmail.com
@@ -123,7 +123,7 @@ homepage: https://github.com/rails/web-console
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -138,8 +138,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.4.10
+signing_key: 
 specification_version: 4
 summary: A debugging tool for your Ruby on Rails applications.
 test_files: []