From 9da891e3870c391bd7b07e4c4f6b67c7c70e87a4 Mon Sep 17 00:00:00 2001 From: "Mark J. Hoy" Date: Wed, 27 Aug 2025 17:39:36 -0400 Subject: [PATCH 1/4] update for ActiveSupport 7+ --- lib/fortitude/rails/railtie.rb | 2 +- lib/fortitude/version.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/fortitude/rails/railtie.rb b/lib/fortitude/rails/railtie.rb index 7c46198..9b83c57 100644 --- a/lib/fortitude/rails/railtie.rb +++ b/lib/fortitude/rails/railtie.rb @@ -257,7 +257,7 @@ def search_for_file_uniwith_fortitude(original_method, path_suffix) ::Fortitude::MethodOverriding.override_methods( ::ActiveSupport::Dependencies, ActiveSupportDependenciesOverrides::Common, :fortitude, - [ :search_for_file, :autoloadable_module?, :autoload_paths ]) + [ :autoloadable_module?, :autoload_paths ]) eigenclass = ::ActiveSupport::Dependencies.module_eval "class << self; self; end" ::Fortitude::MethodOverriding.override_methods( diff --git a/lib/fortitude/version.rb b/lib/fortitude/version.rb index 2bfe8c3..24db443 100644 --- a/lib/fortitude/version.rb +++ b/lib/fortitude/version.rb @@ -1,3 +1,3 @@ module Fortitude - VERSION = "0.9.6.swiftype04" + VERSION = "0.9.6.swiftype05" end From 47fff941919bb678a8e8860843663be6fb4ca1a6 Mon Sep 17 00:00:00 2001 From: "Mark J. Hoy" Date: Wed, 27 Aug 2025 17:46:08 -0400 Subject: [PATCH 2/4] autoloadable_module is also not supported rails 7+ --- lib/fortitude/rails/railtie.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fortitude/rails/railtie.rb b/lib/fortitude/rails/railtie.rb index 9b83c57..c1459ff 100644 --- a/lib/fortitude/rails/railtie.rb +++ b/lib/fortitude/rails/railtie.rb @@ -257,7 +257,7 @@ def search_for_file_uniwith_fortitude(original_method, path_suffix) ::Fortitude::MethodOverriding.override_methods( ::ActiveSupport::Dependencies, ActiveSupportDependenciesOverrides::Common, :fortitude, - [ :autoloadable_module?, :autoload_paths ]) + [ :autoload_paths ]) eigenclass = ::ActiveSupport::Dependencies.module_eval "class << self; self; end" ::Fortitude::MethodOverriding.override_methods( From 467101895570e8a2ce54fa048b5710a36f168e92 Mon Sep 17 00:00:00 2001 From: "Mark J. Hoy" Date: Wed, 27 Aug 2025 17:50:12 -0400 Subject: [PATCH 3/4] remove all method overriding for ActiveSupport --- lib/fortitude/rails/railtie.rb | 9 --------- 1 file changed, 9 deletions(-) diff --git a/lib/fortitude/rails/railtie.rb b/lib/fortitude/rails/railtie.rb index c1459ff..6f86ec1 100644 --- a/lib/fortitude/rails/railtie.rb +++ b/lib/fortitude/rails/railtie.rb @@ -255,15 +255,6 @@ def search_for_file_uniwith_fortitude(original_method, path_suffix) end end - ::Fortitude::MethodOverriding.override_methods( - ::ActiveSupport::Dependencies, ActiveSupportDependenciesOverrides::Common, :fortitude, - [ :autoload_paths ]) - - eigenclass = ::ActiveSupport::Dependencies.module_eval "class << self; self; end" - ::Fortitude::MethodOverriding.override_methods( - eigenclass, ActiveSupportDependenciesOverrides::Common, :fortitude, - [ :autoload_paths ]) - module RailsEngineOverrides # Two important comments here: # From 5cffd2aefdecd2c265efaf03d916d3a155d1b7c1 Mon Sep 17 00:00:00 2001 From: "Mark J. Hoy" Date: Wed, 27 Aug 2025 18:03:44 -0400 Subject: [PATCH 4/4] remove PathResolver override --- lib/fortitude/rails/railtie.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/fortitude/rails/railtie.rb b/lib/fortitude/rails/railtie.rb index 6f86ec1..980fe32 100644 --- a/lib/fortitude/rails/railtie.rb +++ b/lib/fortitude/rails/railtie.rb @@ -330,9 +330,6 @@ def find_templates_uniwith_fortitude(original_method, name, prefix, partial, det end end - ::Fortitude::MethodOverriding.override_methods( - ::ActionView::PathResolver, ActionViewPathResolverOverrides, :fortitude, [ :find_templates ]) - require "fortitude/rails/template_handler" require "fortitude/rails/rendering_methods"