actiontext 8.0.3 → 8.1.0.rc1

data/app/models/action_text/rich_text.rb

@@ -48,10 +48,13 @@ module ActionText
     ##
     # :method: embeds
     #
-    # Returns the ActiveStorage::Blob records of the embedded files.
+    # Returns the ActiveStorage::Attachment records from the embedded files.
+    #
+    # Attached ActiveStorage::Blob records are extracted from the `body`
+    # in a {before_validation}[rdoc-ref:ActiveModel::Validations::Callbacks::ClassMethods#before_validation] callback.
     has_many_attached :embeds
 
-    before_save do
+    before_validation do
       self.embeds = body.attachables.grep(ActiveStorage::Blob).uniq if body.present?
     end
 

data/lib/action_text/content.rb

@@ -123,10 +123,11 @@ module ActionText
     #     content.to_plain_text # => "safeunsafe"
     #
     # NOTE: that the returned string is not HTML safe and should not be rendered in
-    # browsers.
+    # browsers without additional sanitization.
     #
     #     content = ActionText::Content.new("<script>alert()</script>")
     #     content.to_plain_text # => "<script>alert()</script>"
+    #     ActionText::ContentHelper.sanitizer.sanitize(content.to_plain_text) # => ""
     def to_plain_text
       render_attachments(with_full_attributes: false, &:to_plain_text).fragment.to_plain_text
     end

data/lib/action_text/engine.rb

@@ -8,6 +8,7 @@ require "active_record/railtie"
 require "active_storage/engine"
 
 require "action_text"
+require "action_text/trix"
 
 module ActionText
   class Engine < Rails::Engine
@@ -34,7 +35,7 @@ module ActionText
 
     initializer "action_text.asset" do
       if Rails.application.config.respond_to?(:assets)
-        Rails.application.config.assets.precompile += %w( actiontext.js actiontext.esm.js trix.js trix.css )
+        Rails.application.config.assets.precompile += %w( actiontext.js actiontext.esm.js )
       end
     end
 

data/lib/action_text/fixture_set.rb

@@ -62,7 +62,7 @@ module ActionText
       signed_global_id = ActiveRecord::FixtureSet.signed_global_id fixture_set_name, label,
         column_type: column_type, for: ActionText::Attachable::LOCATOR_NAME
 
-      %(<action-text-attachment sgid="#{signed_global_id}"></action-text-attachment>)
+      %(<#{Attachment.tag_name} sgid="#{signed_global_id}"></#{Attachment.tag_name}>)
     end
   end
 end

data/lib/action_text/gem_version.rb

@@ -10,9 +10,9 @@ module ActionText
 
   module VERSION
     MAJOR = 8
-    MINOR = 0
-    TINY  = 3
-    PRE   = nil
+    MINOR = 1
+    TINY  = 0
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/action_text/plain_text_conversion.rb

@@ -7,64 +7,70 @@ module ActionText
     extend self
 
     def node_to_plain_text(node)
-      remove_trailing_newlines(plain_text_for_node(node))
+      BottomUpReducer.new(node).reduce do |n, child_values|
+        plain_text_for_node(n, child_values)
+      end.then(&method(:remove_trailing_newlines))
     end
 
     private
-      def plain_text_for_node(node, index = 0)
+      def plain_text_for_node(node, child_values)
         if respond_to?(plain_text_method_for_node(node), true)
-          send(plain_text_method_for_node(node), node, index)
+          send(plain_text_method_for_node(node), node, child_values)
         else
-          plain_text_for_node_children(node)
+          plain_text_for_child_values(child_values)
         end
       end
 
-      def plain_text_for_node_children(node)
-        texts = []
-        node.children.each_with_index do |child, index|
-          texts << plain_text_for_node(child, index)
-        end
-        texts.join
-      end
-
       def plain_text_method_for_node(node)
         :"plain_text_for_#{node.name}_node"
       end
 
-      def plain_text_for_block(node, index = 0)
-        "#{remove_trailing_newlines(plain_text_for_node_children(node))}\n\n"
+      def plain_text_for_child_values(child_values)
+        child_values.join
+      end
+
+      def plain_text_for_unsupported_node(node, _child_values)
+        ""
+      end
+
+      %i[ script style].each do |element|
+        alias_method :"plain_text_for_#{element}_node", :plain_text_for_unsupported_node
+      end
+
+      def plain_text_for_block(node, child_values)
+        "#{remove_trailing_newlines(plain_text_for_child_values(child_values))}\n\n"
       end
 
       %i[ h1 p ].each do |element|
         alias_method :"plain_text_for_#{element}_node", :plain_text_for_block
       end
 
-      def plain_text_for_list(node, index)
-        "#{break_if_nested_list(node, plain_text_for_block(node))}"
+      def plain_text_for_list(node, child_values)
+        "#{break_if_nested_list(node, plain_text_for_block(node, child_values))}"
       end
 
       %i[ ul ol ].each do |element|
         alias_method :"plain_text_for_#{element}_node", :plain_text_for_list
       end
 
-      def plain_text_for_br_node(node, index)
+      def plain_text_for_br_node(node, _child_values)
         "\n"
       end
 
-      def plain_text_for_text_node(node, index)
+      def plain_text_for_text_node(node, _child_values)
         remove_trailing_newlines(node.text)
       end
 
-      def plain_text_for_div_node(node, index)
-        "#{remove_trailing_newlines(plain_text_for_node_children(node))}\n"
+      def plain_text_for_div_node(node, child_values)
+        "#{remove_trailing_newlines(plain_text_for_child_values(child_values))}\n"
       end
 
-      def plain_text_for_figcaption_node(node, index)
-        "[#{remove_trailing_newlines(plain_text_for_node_children(node))}]"
+      def plain_text_for_figcaption_node(node, child_values)
+        "[#{remove_trailing_newlines(plain_text_for_child_values(child_values))}]"
       end
 
-      def plain_text_for_blockquote_node(node, index)
-        text = plain_text_for_block(node)
+      def plain_text_for_blockquote_node(node, child_values)
+        text = plain_text_for_block(node, child_values)
         return "“”" if text.blank?
 
         text = text.dup
@@ -73,9 +79,9 @@ module ActionText
         text
       end
 
-      def plain_text_for_li_node(node, index)
-        bullet = bullet_for_li_node(node, index)
-        text = remove_trailing_newlines(plain_text_for_node_children(node))
+      def plain_text_for_li_node(node, child_values)
+        bullet = bullet_for_li_node(node)
+        text = remove_trailing_newlines(plain_text_for_child_values(child_values))
         indentation = indentation_for_li_node(node)
 
         "#{indentation}#{bullet} #{text}\n"
@@ -85,8 +91,9 @@ module ActionText
         text.chomp("")
       end
 
-      def bullet_for_li_node(node, index)
+      def bullet_for_li_node(node)
         if list_node_name_for_li_node(node) == "ol"
+          index = node.parent.elements.index(node)
           "#{index + 1}."
         else
           "•"
@@ -115,5 +122,33 @@ module ActionText
           text
         end
       end
+
+      class BottomUpReducer # :nodoc:
+        def initialize(node)
+          @node = node
+          @values = {}
+        end
+
+        def reduce(&block)
+          traverse_bottom_up(@node) do |n|
+            child_values = @values.values_at(*n.children)
+            @values[n] = block.call(n, child_values)
+          end
+          @values[@node]
+        end
+
+        private
+          def traverse_bottom_up(node, &block)
+            call_stack, processing_stack = [ node ], []
+
+            until call_stack.empty?
+              node = call_stack.pop
+              processing_stack.push(node)
+              call_stack.concat node.children
+            end
+
+            processing_stack.reverse_each(&block)
+          end
+      end
   end
 end

data/lib/action_text/rendering.rb

@@ -2,7 +2,6 @@
 
 # :markup: markdown
 
-require "active_support/concern"
 require "active_support/core_ext/module/attribute_accessors_per_thread"
 
 module ActionText

data/lib/action_text/system_test_helper.rb

@@ -7,12 +7,14 @@ module ActionText
     # 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
     #
+    # Additional options are forwarded to Capybara as filters
     #
     # Examples:
     #
@@ -32,8 +34,14 @@ module ActionText
     #     # <input id="trix_input_1" name="message[content]" type="hidden">
     #     # <trix-editor input="trix_input_1"></trix-editor>
     #     fill_in_rich_textarea "message[content]", with: "Hello <em>world!</em>"
-    def fill_in_rich_textarea(locator = nil, with:)
-      find(:rich_textarea, locator).execute_script("this.editor.loadHTML(arguments[0])", with.to_s)
+    def fill_in_rich_textarea(locator = nil, with:, **)
+      find(:rich_textarea, locator, **).execute_script(<<~JS, with.to_s)
+        if ("value" in this) {
+          this.value = arguments[0]
+        } else {
+          this.editor.loadHTML(arguments[0])
+        }
+      JS
     end
     alias_method :fill_in_rich_text_area, :fill_in_rich_textarea
   end
@@ -43,13 +51,18 @@ end
   Capybara.add_selector rich_textarea do
     label "rich-text area"
     xpath do |locator|
+      xpath = XPath.descendant[[
+        XPath.attribute(:role) == "textbox",
+        (XPath.attribute(:contenteditable) == "") | (XPath.attribute(:contenteditable) == "true")
+      ].reduce(:&)]
+
       if locator.nil?
-        XPath.descendant(:"trix-editor")
+        xpath
       else
         input_located_by_name = XPath.anywhere(:input).where(XPath.attr(:name) == locator).attr(:id)
         input_located_by_label = XPath.anywhere(:label).where(XPath.string.n.is(locator)).attr(:for)
 
-        XPath.descendant(:"trix-editor").where \
+        xpath.where \
           XPath.attr(:id).equals(locator) |
           XPath.attr(:placeholder).equals(locator) |
           XPath.attr(:"aria-label").equals(locator) |

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

@@ -47,18 +47,6 @@ module ActionText
           "app/views/layouts/action_text/contents/_content.html.erb"
       end
 
-      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!)"
-          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
-
       def create_migrations
         rails_command "railties:install:migrations FROM=active_storage,action_text", inline: true
       end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rails/actiontext",
-  "version": "8.0.300",
+  "version": "8.1.0-rc1",
   "description": "Edit and display rich text in Rails applications",
   "module": "app/assets/javascripts/actiontext.esm.js",
   "main": "app/assets/javascripts/actiontext.js",
@@ -22,7 +22,7 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@rails/activestorage": ">= 8.0.0-alpha"
+    "@rails/activestorage": ">= 8.1.0-alpha"
   },
   "peerDependencies": {
     "trix": "^2.0.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actiontext
 version: !ruby/object:Gem::Version
-  version: 8.0.3
+  version: 8.1.0.rc1
 platform: ruby
 authors:
 - Javan Makhmali
@@ -17,56 +17,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.0.3
+        version: 8.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.0.3
+        version: 8.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.0.3
+        version: 8.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.0.3
+        version: 8.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: activestorage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.0.3
+        version: 8.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.0.3
+        version: 8.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.0.3
+        version: 8.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.0.3
+        version: 8.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -95,6 +95,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: action_text-trix
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.15
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.15
 description: Edit and display rich text in Rails applications.
 email:
 - javan@javan.us
@@ -109,8 +123,6 @@ files:
 - README.md
 - app/assets/javascripts/actiontext.esm.js
 - app/assets/javascripts/actiontext.js
-- app/assets/javascripts/trix.js
-- app/assets/stylesheets/trix.css
 - app/helpers/action_text/content_helper.rb
 - app/helpers/action_text/tag_helper.rb
 - app/javascript/actiontext/attachment_upload.js
@@ -162,10 +174,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v8.0.3/actiontext/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v8.0.3/
+  changelog_uri: https://github.com/rails/rails/blob/v8.1.0.rc1/actiontext/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v8.1.0.rc1/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v8.0.3/actiontext
+  source_code_uri: https://github.com/rails/rails/tree/v8.1.0.rc1/actiontext
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths: