actiontext 6.0.4.8 → 6.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fb3dbccbbe86edfad8d61aa2599dbcd0969e51c629add231fc737f1caac542c
-  data.tar.gz: bc9b8ed354e689ff6d22fb2ab2eb8fe0f2ac3467d93d1af548e3e22412cee88a
+  metadata.gz: 4475a564fddc94eab3c96d86f66a3190b5859647e0c8023857e743aaa684a117
+  data.tar.gz: bbd377f44089938f0112534f70a492ec5db8fe1c15ceee5caeb729198e34c5bb
 SHA512:
-  metadata.gz: 47c4bc3bc7ea6dc52842b8784dd7eed9f05532dc96329648cde789754f4f56d06b4f3f03c207caca5e79034d6bce27b22704171099b69216c0e92e71231e8871
-  data.tar.gz: ada97b11cf94365024ffabcb02cd1a7016bcfdc05df8f13e8cd646ccd7737a1f05dc95e6ff7327fd5489fed76dbe8374e80a32c6b9b826b8d43706f6ad583b5d
+  metadata.gz: 859c99be184e2d2c9dd782ad388170045a6d1ee72b267fa5e5c2290c9f97781b059e1ad9d38ec50ed3d33f38307049fbdb740ada564f50329835b1bf7d444b7f
+  data.tar.gz: 9a51b912b87719543d378892b50548d265d5c96b2bed7d6d38e1e906d01947a3db90fea90382bdaea44a6d02b69085c0c5daaeef3a2d2f255553d79886736ad7

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## Rails 6.0.5 (May 09, 2022) ##
+
+*   Disentangle Action Text from ApplicationController
+
+    Allow Action Text to be used without having an ApplicationController
+    defined.
+    This makes sure:
+    * Action Text attachments render the correct URL host in mailers.
+    * an ActionController::Renderer isn't allocated per request.
+    * Sidekiq doesn't hang with the "classic" autoloader.
+
+    *Jonathan Hefner*
+
 ## Rails 6.0.4.8 (April 26, 2022) ##
 
 *   No changes.

data/app/helpers/action_text/content_helper.rb

@@ -10,6 +10,7 @@ module ActionText
     mattr_accessor(:scrubber)
 
     def render_action_text_content(content)
+      self.prefix_partial_path_with_controller_namespace = false
       sanitize_action_text_content(render_action_text_attachments(content))
     end
 

data/lib/action_text/attachments/trix_conversion.rb

@@ -26,7 +26,7 @@ module ActionText
       private
         def trix_attachment_content
           if partial_path = attachable.try(:to_trix_content_attachment_partial_path)
-            ActionText::Content.renderer.render(partial: partial_path, object: self, as: model_name.element)
+            ActionText::Content.render(partial: partial_path, object: self, as: model_name.element)
           end
         end
     end

data/lib/action_text/content.rb

@@ -1,12 +1,8 @@
 # frozen_string_literal: true
 
-require "active_support/core_ext/module/attribute_accessors_per_thread"
-
 module ActionText
   class Content
-    include Serialization
-
-    thread_cattr_accessor :renderer
+    include Rendering, Serialization
 
     attr_reader :fragment
 
@@ -88,7 +84,7 @@ module ActionText
     end
 
     def to_rendered_html_with_layout
-      renderer.render(partial: "action_text/content/layout", locals: { content: self })
+      render partial: "action_text/content/layout", locals: { content: self }
     end
 
     def to_s

data/lib/action_text/engine.rb

@@ -37,21 +37,24 @@ module ActionText
     end
 
     initializer "action_text.helper" do
-      ActiveSupport.on_load(:action_controller_base) do
-        helper ActionText::Engine.helpers
+      %i[action_controller_base action_mailer].each do |abstract_controller|
+        ActiveSupport.on_load(abstract_controller) do
+          helper ActionText::Engine.helpers
+        end
       end
     end
 
-    initializer "action_text.renderer" do |app|
-      app.executor.to_run      { ActionText::Content.renderer = ApplicationController.renderer }
-      app.executor.to_complete { ActionText::Content.renderer = ApplicationController.renderer }
-
+    initializer "action_text.renderer" do
       ActiveSupport.on_load(:action_text_content) do
-        self.renderer = ApplicationController.renderer
+        self.renderer = Class.new(ActionController::Base).renderer
       end
 
-      ActiveSupport.on_load(:action_controller_base) do
-        before_action { ActionText::Content.renderer = ApplicationController.renderer.new(request.env) }
+      %i[action_controller_base action_mailer].each do |abstract_controller|
+        ActiveSupport.on_load(abstract_controller) do
+          around_action do |controller, action|
+            ActionText::Content.with_renderer(controller, &action)
+          end
+        end
       end
     end
   end

data/lib/action_text/gem_version.rb

@@ -9,8 +9,8 @@ module ActionText
   module VERSION
     MAJOR = 6
     MINOR = 0
-    TINY  = 4
-    PRE   = "8"
+    TINY  = 5
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/action_text/rendering.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+require "active_support/core_ext/module/attribute_accessors_per_thread"
+
+module ActionText
+  module Rendering #:nodoc:
+    extend ActiveSupport::Concern
+
+    included do
+      thread_cattr_accessor :renderer, instance_accessor: false
+      delegate :render, to: :class
+    end
+
+    class_methods do
+      def with_renderer(renderer)
+        previous_renderer = self.renderer
+        self.renderer = renderer
+        yield
+      ensure
+        self.renderer = previous_renderer
+      end
+
+      def render(*args, &block)
+        renderer.render_to_string(*args, &block)
+      end
+    end
+  end
+end

data/lib/action_text.rb

@@ -16,6 +16,7 @@ module ActionText
   autoload :Fragment
   autoload :HtmlConversion
   autoload :PlainTextConversion
+  autoload :Rendering
   autoload :Serialization
   autoload :TrixAttachment
 

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rails/actiontext",
-  "version": "6.0.4-8",
+  "version": "6.0.5",
   "description": "Edit and display rich text in Rails applications",
   "main": "app/javascript/actiontext/index.js",
   "files": [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actiontext
 version: !ruby/object:Gem::Version
-  version: 6.0.4.8
+  version: 6.0.5
 platform: ruby
 authors:
 - Javan Makhmali
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-26 00:00:00.000000000 Z
+date: 2022-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -18,56 +18,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.4.8
+        version: 6.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.4.8
+        version: 6.0.5
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.4.8
+        version: 6.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.4.8
+        version: 6.0.5
 - !ruby/object:Gem::Dependency
   name: activestorage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.4.8
+        version: 6.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.4.8
+        version: 6.0.5
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.4.8
+        version: 6.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.4.8
+        version: 6.0.5
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,7 @@ files:
 - lib/action_text/gem_version.rb
 - lib/action_text/html_conversion.rb
 - lib/action_text/plain_text_conversion.rb
+- lib/action_text/rendering.rb
 - lib/action_text/serialization.rb
 - lib/action_text/trix_attachment.rb
 - lib/action_text/version.rb
@@ -135,10 +136,11 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v6.0.4.8/actiontext/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v6.0.4.8/
+  changelog_uri: https://github.com/rails/rails/blob/v6.0.5/actiontext/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.0.5/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v6.0.4.8/actiontext
+  source_code_uri: https://github.com/rails/rails/tree/v6.0.5/actiontext
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -154,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Rich text framework.