Merge pull request rails#46119 from jonathanhefner/action_text-renderer-always-fall-back-to-action_controller

Always provide a fallback renderer for Action Text

Author: jonathanhefner

actiontext/lib/action_text/engine.rb

@@ -59,12 +59,6 @@ def to_trix_content_attachment_partial_path
     end
 
     initializer "action_text.renderer" do
-      ActiveSupport.on_load(:action_controller_base) do
-        ActiveSupport.on_load(:action_text_content) do
-          self.default_renderer = Class.new(ActionController::Base).renderer
-        end
-      end
-
       %i[action_controller_base action_mailer].each do |base|
         ActiveSupport.on_load(base) do
           around_action do |controller, action|

actiontext/lib/action_text/rendering.rb

@@ -8,12 +8,15 @@ module Rendering # :nodoc:
     extend ActiveSupport::Concern
 
     included do
-      cattr_accessor :default_renderer, instance_accessor: false
       thread_cattr_accessor :renderer, instance_accessor: false
       delegate :render, to: :class
     end
 
     class_methods do
+      def action_controller_renderer
+        @action_controller_renderer ||= Class.new(ActionController::Base).renderer
+      end
+
       def with_renderer(renderer)
         previous_renderer = self.renderer
         self.renderer = renderer
@@ -23,7 +26,7 @@ def with_renderer(renderer)
       end
 
       def render(*args, &block)
-        (renderer || default_renderer).render_to_string(*args, &block)
+        (renderer || action_controller_renderer).render_to_string(*args, &block)
       end
     end
   end