actiontext 6.0.4.7 → 6.0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b77160fe2c6cd4f56f7974a7bd19e4121e2d161d85feae75a8011b76b8e9f3a
-  data.tar.gz: 0c390b181065ef476d0f5753fb78acd8c3e3f4aff31884c068dbbb3aca0648b7
+  metadata.gz: 6791bd84b8baa3e269b4aca66489a6692f50244821685e8622e5edc56506f698
+  data.tar.gz: 69d0f14f83ef82b937dac0e3254a4e61a2cf73a0d0b8abc0d5bc8bd59b0a5af0
 SHA512:
-  metadata.gz: 32e4b779d2988ebd70dd2d50f10dd2b470e45dd92495a13570431a92e85b24c9d111806f601187bdcc67a645c76482e950781ffa7f56cc412fae8d2c181c5b12
-  data.tar.gz: 820e9ea5d1b17cf1eeb75c14d77034f5fe099a4efb9e3fdc81119e25534735d36913acc63cad30a320964d52ab53e4401fa9f441336ec9d6de4243c20391a64f
+  metadata.gz: 89be14985618d343e8894e1077214bc3c2ec73dfeb28e997f0da0a2531f6bbb07a76d2ba515d577c1d98f2d3c4964fd06ab574de912893e055b135cae5d164b4
+  data.tar.gz: 66355ac968eea08bce46c1c91e5ab86f2b6db65c929c60320ebc4af8e726dc2c532c36626979df3cc1c3bd97b6e4bb0a3b6e9c0008b4b6db2c89d839d579166d

data/CHANGELOG.md

@@ -1,3 +1,26 @@
+## Rails 6.0.5.1 (July 12, 2022) ##
+
+*   No changes.
+
+
+## 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.
+
+
 ## Rails 6.0.4.7 (March 08, 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   = "7"
+    TINY  = 5
+    PRE   = "1"
 
     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-7",
+  "version": "6.0.5-1",
   "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.7
+  version: 6.0.5.1
 platform: ruby
 authors:
 - Javan Makhmali
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-08 00:00:00.000000000 Z
+date: 2022-07-12 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.7
+        version: 6.0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.4.7
+        version: 6.0.5.1
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.4.7
+        version: 6.0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.4.7
+        version: 6.0.5.1
 - !ruby/object:Gem::Dependency
   name: activestorage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.4.7
+        version: 6.0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.4.7
+        version: 6.0.5.1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.4.7
+        version: 6.0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.4.7
+        version: 6.0.5.1
 - !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.7/actiontext/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v6.0.4.7/
+  changelog_uri: https://github.com/rails/rails/blob/v6.0.5.1/actiontext/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.0.5.1/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v6.0.4.7/actiontext
+  source_code_uri: https://github.com/rails/rails/tree/v6.0.5.1/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.3
 signing_key:
 specification_version: 4
 summary: Rich text framework.