From 11efc5782d2db0dec9812db03407e9255e32314e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Wed, 2 Aug 2023 21:10:42 +0000 Subject: [PATCH] Only adds the deprecator in the app if Rails supports it Fixes #329. --- lib/web_console.rb | 4 ++++ lib/web_console/railtie.rb | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/web_console.rb b/lib/web_console.rb index 38526094..d201fab6 100644 --- a/lib/web_console.rb +++ b/lib/web_console.rb @@ -28,6 +28,10 @@ module WebConsole def self.logger (defined?(Rails.logger) && Rails.logger) || (@logger ||= ActiveSupport::Logger.new($stderr)) end + + def self.deprecator + @deprecator ||= ActiveSupport::Deprecation.new("5.0", "WebConsole") + end end require "web_console/railtie" diff --git a/lib/web_console/railtie.rb b/lib/web_console/railtie.rb index 0981cb75..9bc8fdc6 100644 --- a/lib/web_console/railtie.rb +++ b/lib/web_console/railtie.rb @@ -52,7 +52,7 @@ class Railtie < ::Rails::Railtie end initializer "web_console.deprecator" do |app| - app.deprecators[:web_console] = ActiveSupport::Deprecation.new("5.0", "WebConsole") + app.deprecators[:web_console] = WebConsole.deprecator if app.respond_to?(:deprecators) end initializer "web_console.permissions" do @@ -67,7 +67,7 @@ def web_console_permissions when config.web_console.allowed_ips config.web_console.allowed_ips when config.web_console.whitelisted_ips - Rails.application.deprecators[:web_console].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