actiontext 7.0.8.7 → 7.2.2.1

data/lib/action_text/fixture_set.rb

@@ -1,60 +1,62 @@
 # frozen_string_literal: true
 
+# :markup: markdown
+
 module ActionText
-  # Fixtures are a way of organizing data that you want to test against; in
-  # short, sample data.
+  # # Action Text FixtureSet
+  #
+  # Fixtures are a way of organizing data that you want to test against; in short,
+  # sample data.
   #
   # To learn more about fixtures, read the ActiveRecord::FixtureSet documentation.
   #
-  # === YAML
+  # ### YAML
   #
   # Like other Active Record-backed models, ActionText::RichText records inherit
-  # from ActiveRecord::Base instances and can therefore be populated by
-  # fixtures.
+  # from ActiveRecord::Base instances and can therefore be populated by fixtures.
   #
-  # Consider an <tt>Article</tt> class:
+  # Consider an `Article` class:
   #
-  #   class Article < ApplicationRecord
-  #     has_rich_text :content
-  #   end
+  #     class Article < ApplicationRecord
+  #       has_rich_text :content
+  #     end
   #
-  # To declare fixture data for the related <tt>content</tt>, first declare fixture
-  # data for <tt>Article</tt> instances in <tt>test/fixtures/articles.yml</tt>:
+  # To declare fixture data for the related `content`, first declare fixture data
+  # for `Article` instances in `test/fixtures/articles.yml`:
   #
-  #   first:
-  #     title: An Article
+  #     first:
+  #       title: An Article
   #
   # Then declare the ActionText::RichText fixture data in
-  # <tt>test/fixtures/action_text/rich_texts.yml</tt>, making sure to declare
-  # each entry's <tt>record:</tt> key as a polymorphic relationship:
+  # `test/fixtures/action_text/rich_texts.yml`, making sure to declare each
+  # entry's `record:` key as a polymorphic relationship:
   #
-  #   first:
-  #     record: first (Article)
-  #     name: content
-  #     body: <div>Hello, world.</div>
+  #     first:
+  #       record: first (Article)
+  #       name: content
+  #       body: <div>Hello, world.</div>
   #
   # When processed, Active Record will insert database records for each fixture
   # entry and will ensure the Action Text relationship is intact.
   class FixtureSet
-    # Fixtures support Action Text attachments as part of their <tt>body</tt>
-    # HTML.
+    # Fixtures support Action Text attachments as part of their `body` HTML.
     #
-    # === Examples
+    # ### Examples
     #
-    # For example, consider a second <tt>Article</tt> fixture declared in
-    # <tt>test/fixtures/articles.yml</tt>:
+    # For example, consider a second `Article` fixture declared in
+    # `test/fixtures/articles.yml`:
     #
-    #   second:
-    #     title: Another Article
+    #     second:
+    #       title: Another Article
     #
-    # You can attach a mention of <tt>articles(:first)</tt> to <tt>second</tt>'s
-    # <tt>content</tt> by embedding a call to <tt>ActionText::FixtureSet.attachment</tt>
-    # in the <tt>body:</tt> value in <tt>test/fixtures/action_text/rich_texts.yml</tt>:
+    # You can attach a mention of `articles(:first)` to `second`'s `content` by
+    # embedding a call to `ActionText::FixtureSet.attachment` in the `body:` value
+    # in `test/fixtures/action_text/rich_texts.yml`:
     #
-    #   second:
-    #     record: second (Article)
-    #     name: content
-    #     body: <div>Hello, <%= ActionText::FixtureSet.attachment("articles", :first) %></div>
+    #     second:
+    #       record: second (Article)
+    #       name: content
+    #       body: <div>Hello, <%= ActionText::FixtureSet.attachment("articles", :first) %></div>
     #
     def self.attachment(fixture_set_name, label, column_type: :integer)
       signed_global_id = ActiveRecord::FixtureSet.signed_global_id fixture_set_name, label,

data/lib/action_text/fragment.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# :markup: markdown
+
 module ActionText
   class Fragment
     class << self
@@ -7,7 +9,7 @@ module ActionText
         case fragment_or_html
         when self
           fragment_or_html
-        when Nokogiri::HTML::DocumentFragment
+        when Nokogiri::XML::DocumentFragment # base class for all fragments
           new(fragment_or_html)
         else
           from_html(fragment_or_html)
@@ -21,6 +23,8 @@ module ActionText
 
     attr_reader :source
 
+    delegate :deconstruct, to: "source.elements"
+
     def initialize(source)
       @source = source
     end
@@ -30,14 +34,15 @@ module ActionText
     end
 
     def update
-      yield source = self.source.clone
+      yield source = self.source.dup
       self.class.new(source)
     end
 
     def replace(selector)
       update do |source|
         source.css(selector).each do |node|
-          node.replace(yield(node).to_s)
+          replacement_node = yield(node)
+          node.replace(replacement_node.to_s) if node != replacement_node
         end
       end
     end

data/lib/action_text/gem_version.rb

@@ -1,16 +1,18 @@
 # frozen_string_literal: true
 
+# :markup: markdown
+
 module ActionText
-  # Returns the currently loaded version of Action Text as a <tt>Gem::Version</tt>.
+  # Returns the currently loaded version of Action Text as a `Gem::Version`.
   def self.gem_version
     Gem::Version.new VERSION::STRING
   end
 
   module VERSION
     MAJOR = 7
-    MINOR = 0
-    TINY  = 8
-    PRE   = "7"
+    MINOR = 2
+    TINY  = 2
+    PRE   = "1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/action_text/html_conversion.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# :markup: markdown
+
 module ActionText
   module HtmlConversion
     extend self
@@ -18,7 +20,7 @@ module ActionText
 
     private
       def document
-        Nokogiri::HTML::Document.new.tap { |doc| doc.encoding = "UTF-8" }
+        ActionText.html_document_class.new.tap { |doc| doc.encoding = "UTF-8" }
       end
   end
 end

data/lib/action_text/plain_text_conversion.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# :markup: markdown
+
 module ActionText
   module PlainTextConversion
     extend self

data/lib/action_text/rendering.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# :markup: markdown
+
 require "active_support/concern"
 require "active_support/core_ext/module/attribute_accessors_per_thread"
 
@@ -8,12 +10,15 @@ module ActionText
     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 +28,7 @@ module ActionText
       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

data/lib/action_text/serialization.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# :markup: markdown
+
 module ActionText
   module Serialization
     extend ActiveSupport::Concern

data/lib/action_text/system_test_helper.rb

@@ -1,34 +1,37 @@
 # frozen_string_literal: true
 
+# :markup: markdown
+
 module ActionText
   module SystemTestHelper
     # Locates a Trix editor and fills it in with the given HTML.
     #
     # The editor can be found by:
-    # * its +id+
-    # * its +placeholder+
-    # * the text from its +label+ element
-    # * its +aria-label+
-    # * the +name+ of its input
+    # *   its `id`
+    # *   its `placeholder`
+    # *   the text from its `label` element
+    # *   its `aria-label`
+    # *   the `name` of its input
+    #
     #
     # Examples:
     #
-    #   # <trix-editor id="message_content" ...></trix-editor>
-    #   fill_in_rich_text_area "message_content", with: "Hello <em>world!</em>"
+    #     # <trix-editor id="message_content" ...></trix-editor>
+    #     fill_in_rich_text_area "message_content", with: "Hello <em>world!</em>"
     #
-    #   # <trix-editor placeholder="Your message here" ...></trix-editor>
-    #   fill_in_rich_text_area "Your message here", with: "Hello <em>world!</em>"
+    #     # <trix-editor placeholder="Your message here" ...></trix-editor>
+    #     fill_in_rich_text_area "Your message here", with: "Hello <em>world!</em>"
     #
-    #   # <label for="message_content">Message content</label>
-    #   # <trix-editor id="message_content" ...></trix-editor>
-    #   fill_in_rich_text_area "Message content", with: "Hello <em>world!</em>"
+    #     # <label for="message_content">Message content</label>
+    #     # <trix-editor id="message_content" ...></trix-editor>
+    #     fill_in_rich_text_area "Message content", with: "Hello <em>world!</em>"
     #
-    #   # <trix-editor aria-label="Message content" ...></trix-editor>
-    #   fill_in_rich_text_area "Message content", with: "Hello <em>world!</em>"
+    #     # <trix-editor aria-label="Message content" ...></trix-editor>
+    #     fill_in_rich_text_area "Message content", with: "Hello <em>world!</em>"
     #
-    #   # <input id="trix_input_1" name="message[content]" type="hidden">
-    #   # <trix-editor input="trix_input_1"></trix-editor>
-    #   fill_in_rich_text_area "message[content]", with: "Hello <em>world!</em>"
+    #     # <input id="trix_input_1" name="message[content]" type="hidden">
+    #     # <trix-editor input="trix_input_1"></trix-editor>
+    #     fill_in_rich_text_area "message[content]", with: "Hello <em>world!</em>"
     def fill_in_rich_text_area(locator = nil, with:)
       find(:rich_text_area, locator).execute_script("this.editor.loadHTML(arguments[0])", with.to_s)
     end

data/lib/action_text/trix_attachment.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# :markup: markdown
+
 module ActionText
   class TrixAttachment
     TAG_NAME = "figure"
@@ -39,10 +41,10 @@ module ActionText
         end
 
         def typecast_attribute_values(attributes)
-          attributes.map do |key, value|
+          attributes.to_h do |key, value|
             typecast = ATTRIBUTE_TYPES[key] || ATTRIBUTE_TYPES[:default]
             [key, typecast.call(value)]
-          end.to_h
+          end
         end
     end
 

data/lib/action_text/version.rb

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
+# :markup: markdown
+
 require_relative "gem_version"
 
 module ActionText
-  # Returns the currently loaded version of Action Text as a <tt>Gem::Version</tt>.
+  # Returns the currently loaded version of Action Text as a `Gem::Version`.
   def self.version
     gem_version
   end

data/lib/action_text.rb

@@ -3,8 +3,13 @@
 require "active_support"
 require "active_support/rails"
 
+require "action_text/version"
+require "action_text/deprecator"
+
 require "nokogiri"
 
+# :markup: markdown
+# :include: ../README.md
 module ActionText
   extend ActiveSupport::Autoload
 
@@ -37,4 +42,18 @@ module ActionText
     autoload :Minification
     autoload :TrixConversion
   end
+
+  class << self
+    def html_document_class
+      return @html_document_class if defined?(@html_document_class)
+      @html_document_class =
+        defined?(Nokogiri::HTML5) ? Nokogiri::HTML5::Document : Nokogiri::HTML4::Document
+    end
+
+    def html_document_fragment_class
+      return @html_document_fragment_class if defined?(@html_document_fragment_class)
+      @html_document_fragment_class =
+        defined?(Nokogiri::HTML5) ? Nokogiri::HTML5::DocumentFragment : Nokogiri::HTML4::DocumentFragment
+    end
+  end
 end

data/lib/generators/action_text/install/install_generator.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# :markup: markdown
+
 require "pathname"
 require "json"
 
@@ -9,8 +11,10 @@ module ActionText
       source_root File.expand_path("templates", __dir__)
 
       def install_javascript_dependencies
-        if Pathname(destination_root).join("package.json").exist?
-          say "Installing JavaScript dependencies", :green
+        say "Installing JavaScript dependencies", :green
+        if using_bun?
+          run "bun add @rails/actiontext trix"
+        elsif using_node?
           run "yarn add @rails/actiontext trix"
         end
       end
@@ -19,7 +23,7 @@ module ActionText
         destination = Pathname(destination_root)
 
         if (application_javascript_path = destination.join("app/javascript/application.js")).exist?
-          insert_into_file application_javascript_path.to_s, %(import "trix"\nimport "@rails/actiontext"\n)
+          insert_into_file application_javascript_path.to_s, %(\nimport "trix"\nimport "@rails/actiontext"\n)
         else
           say <<~INSTRUCTIONS, :green
             You must import the @rails/actiontext and trix JavaScript modules in your application entrypoint.
@@ -27,7 +31,7 @@ module ActionText
         end
 
         if (importmap_path = destination.join("config/importmap.rb")).exist?
-          append_to_file importmap_path.to_s, %(pin "trix"\npin "@rails/actiontext", to: "actiontext.js"\n)
+          append_to_file importmap_path.to_s, %(pin "trix"\npin "@rails/actiontext", to: "actiontext.esm.js"\n)
         end
       end
 
@@ -58,7 +62,12 @@ module ActionText
       def enable_image_processing_gem
         if (gemfile_path = Pathname(destination_root).join("Gemfile")).exist?
           say "Ensure image_processing gem has been enabled so image uploads will work (remember to bundle!)"
-          uncomment_lines gemfile_path, /gem "image_processing"/
+          image_processing_regex = /gem ["']image_processing["']/
+          if File.readlines(gemfile_path).grep(image_processing_regex).any?
+            uncomment_lines gemfile_path, image_processing_regex
+          else
+            run "bundle add --skip-install image_processing"
+          end
         end
       end
 
@@ -66,6 +75,21 @@ module ActionText
         rails_command "railties:install:migrations FROM=active_storage,action_text", inline: true
       end
 
+      def using_js_runtime?
+        @using_js_runtime ||= Pathname(destination_root).join("package.json").exist?
+      end
+
+      def using_bun?
+        # Cannot assume yarn.lock has been generated yet so we look for a file known to
+        # be generated by the jsbundling-rails gem
+        @using_bun ||= using_js_runtime? && Pathname(destination_root).join("bun.config.js").exist?
+      end
+
+      def using_node?
+        # Bun is the only runtime that _isn't_ node.
+        @using_node ||= using_js_runtime? && !Pathname(destination_root).join("bun.config.js").exist?
+      end
+
       hook_for :test_framework
     end
   end

data/lib/generators/action_text/install/templates/actiontext.css

@@ -3,11 +3,7 @@
  * the trix-editor content (whether displayed or under editing). Feel free to incorporate this
  * inclusion directly in any other asset bundle and remove this file.
  *
-<%- if defined?(Webpacker::Engine) -%>
- *= require trix/dist/trix
-<%- else -%>
  *= require trix
-<% end -%>
 */
 
 /*

data/lib/rails/generators/test_unit/install_generator.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# :markup: markdown
+
 module TestUnit
   module Generators
     class InstallGenerator < ::Rails::Generators::Base

data/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@rails/actiontext",
-  "version": "7.0.807",
+  "version": "7.2.201",
   "description": "Edit and display rich text in Rails applications",
+  "module": "app/assets/javascripts/actiontext.esm.js",
   "main": "app/assets/javascripts/actiontext.js",
-  "type": "module",
   "files": [
     "app/assets/javascripts/*.js"
   ],
@@ -15,23 +15,23 @@
   "bugs": {
     "url": "https://github.com/rails/rails/issues"
   },
-  "author": "Basecamp, LLC",
+  "author": "37signals LLC",
   "contributors": [
     "Javan Makhmali <javan@javan.us>",
     "Sam Stephenson <sstephenson@gmail.com>"
   ],
   "license": "MIT",
   "dependencies": {
-    "@rails/activestorage": ">= 7.0.0-alpha1"
+    "@rails/activestorage": ">= 7.2.0-alpha"
   },
   "peerDependencies": {
-    "trix": "^1.3.1"
+    "trix": "^2.0.0"
   },
   "devDependencies": {
-    "@rollup/plugin-node-resolve": "^11.0.1",
     "@rollup/plugin-commonjs": "^19.0.1",
+    "@rollup/plugin-node-resolve": "^11.0.1",
     "rollup": "^2.35.1",
-    "trix": "^1.3.1"
+    "trix": "^2.0.0"
   },
   "scripts": {
     "build": "rollup --config rollup.config.js"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actiontext
 version: !ruby/object:Gem::Version
-  version: 7.0.8.7
+  version: 7.2.2.1
 platform: ruby
 authors:
 - Javan Makhmali
@@ -18,56 +18,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.8.7
+        version: 7.2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.8.7
+        version: 7.2.2.1
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.8.7
+        version: 7.2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.8.7
+        version: 7.2.2.1
 - !ruby/object:Gem::Dependency
   name: activestorage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.8.7
+        version: 7.2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.8.7
+        version: 7.2.2.1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.8.7
+        version: 7.2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.8.7
+        version: 7.2.2.1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,7 @@ files:
 - CHANGELOG.md
 - MIT-LICENSE
 - README.md
+- app/assets/javascripts/actiontext.esm.js
 - app/assets/javascripts/actiontext.js
 - app/assets/javascripts/trix.js
 - app/assets/stylesheets/trix.css
@@ -118,6 +119,7 @@ files:
 - app/models/action_text/encrypted_rich_text.rb
 - app/models/action_text/record.rb
 - app/models/action_text/rich_text.rb
+- app/views/action_text/attachables/_content_attachment.html.erb
 - app/views/action_text/attachables/_missing_attachable.html.erb
 - app/views/action_text/attachables/_remote_image.html.erb
 - app/views/action_text/attachment_galleries/_attachment_gallery.html.erb
@@ -137,6 +139,7 @@ files:
 - lib/action_text/attachments/trix_conversion.rb
 - lib/action_text/attribute.rb
 - lib/action_text/content.rb
+- lib/action_text/deprecator.rb
 - lib/action_text/encryption.rb
 - lib/action_text/engine.rb
 - lib/action_text/fixture_set.rb
@@ -160,10 +163,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v7.0.8.7/actiontext/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v7.0.8.7/
+  changelog_uri: https://github.com/rails/rails/blob/v7.2.2.1/actiontext/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.2.2.1/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v7.0.8.7/actiontext
+  source_code_uri: https://github.com/rails/rails/tree/v7.2.2.1/actiontext
   rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
@@ -173,7 +176,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="