actiontext 6.0.0.beta3 → 6.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 524a09225f5111a58ec1950764ed38a5095d73d264c1f7d54f6dcd12e0a90120
-  data.tar.gz: 326d6cb09c3c55611f91b337996ca359aa0d5c7882a6ffedfa9247741690a770
+  metadata.gz: dbf2331abf6f5c5afd25499c2ef99c95e09c1030ba5e5c228bb10b0a1b38b38d
+  data.tar.gz: d275794dde9187e578303f1993307da788faf98ce8055f5512dbb197c2d2d748
 SHA512:
-  metadata.gz: db5749a95ab19520bf7e5ffaf33912719d6a571bba4599de9d743fe6d8e2d23e2c682907f8624b536c96ad54f98c40ffe5b04cba113bb4b33c75d25633a583dd
-  data.tar.gz: e6ffc8c4b1455e3b86a29c108b1c2bb90cbde43bc231268fcb0392d5a3a4f8ee796f04ef215cdc319c59652d6913cf29fc567b15567a68886a4c896e791f5c6a
+  metadata.gz: bf2cf3e7c6f2868ed749e81ea51981d58753635e57b3a1cedba941e98b8fc22787ffc8d023f5c095f07993b1edc75ef454aad556586561f305bbb5069f52292f
+  data.tar.gz: f8747d2ca2eed60dcc99734b86a984018153a0c1cac1b05e4da8e2f820c40154351096ac655e7d527dc5c2111b7ce8072a58ae7a757271a3e6a3816f39447a6f

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Rails 6.0.0.rc1 (April 24, 2019) ##
+
+*   No changes.
+
+
 ## Rails 6.0.0.beta3 (March 11, 2019) ##
 
 *   No changes.

data/app/helpers/action_text/content_helper.rb

@@ -1,21 +1,30 @@
 # frozen_string_literal: true
 
+require "rails-html-sanitizer"
+
 module ActionText
   module ContentHelper
-    SANITIZER          = Rails::Html::Sanitizer.white_list_sanitizer
-    ALLOWED_TAGS       = SANITIZER.allowed_tags + [ ActionText::Attachment::TAG_NAME, "figure", "figcaption" ]
-    ALLOWED_ATTRIBUTES = SANITIZER.allowed_attributes + ActionText::Attachment::ATTRIBUTES
+    mattr_accessor(:sanitizer) { Rails::Html::Sanitizer.white_list_sanitizer.new }
+    mattr_accessor(:allowed_tags) { sanitizer.class.allowed_tags + [ ActionText::Attachment::TAG_NAME, "figure", "figcaption" ] }
+    mattr_accessor(:allowed_attributes) { sanitizer.class.allowed_attributes + ActionText::Attachment::ATTRIBUTES }
+    mattr_accessor(:scrubber)
 
     def render_action_text_content(content)
-      content = content.render_attachments do |attachment|
+      sanitize_action_text_content(render_action_text_attachments(content))
+    end
+
+    def sanitize_action_text_content(content)
+      sanitizer.sanitize(content.to_html, tags: allowed_tags, attributes: allowed_attributes, scrubber: scrubber).html_safe
+    end
+
+    def render_action_text_attachments(content)
+      content.render_attachments do |attachment|
         unless attachment.in?(content.gallery_attachments)
           attachment.node.tap do |node|
             node.inner_html = render(attachment, in_gallery: false).chomp
           end
         end
-      end
-
-      content = content.render_attachment_galleries do |attachment_gallery|
+      end.render_attachment_galleries do |attachment_gallery|
         render(layout: attachment_gallery, object: attachment_gallery) do
           attachment_gallery.attachments.map do |attachment|
             attachment.node.inner_html = render(attachment, in_gallery: true).chomp
@@ -23,8 +32,6 @@ module ActionText
           end.join("").html_safe
         end.chomp
       end
-
-      sanitize content.to_html, tags: ALLOWED_TAGS, attributes: ALLOWED_ATTRIBUTES
     end
   end
 end

data/lib/action_text/attachable.rb

@@ -67,6 +67,10 @@ module ActionText
       super.merge(attachable_sgid: attachable_sgid)
     end
 
+    def to_trix_content_attachment_partial_path
+      to_partial_path
+    end
+
     def to_rich_text_attributes(attributes = {})
       attributes.dup.tap do |attrs|
         attrs[:sgid] = attachable_sgid

data/lib/action_text/attribute.rb

@@ -26,7 +26,7 @@ module ActionText
       def has_rich_text(name)
         class_eval <<-CODE, __FILE__, __LINE__ + 1
           def #{name}
-            self.rich_text_#{name} ||= ActionText::RichText.new(name: "#{name}", record: self)
+            rich_text_#{name} || build_rich_text_#{name}
           end
 
           def #{name}=(body)
@@ -34,14 +34,11 @@ module ActionText
           end
         CODE
 
-        has_one :"rich_text_#{name}", -> { where(name: name) }, class_name: "ActionText::RichText", as: :record, inverse_of: :record, dependent: :destroy
+        has_one :"rich_text_#{name}", -> { where(name: name) },
+          class_name: "ActionText::RichText", as: :record, inverse_of: :record, autosave: true, dependent: :destroy
 
         scope :"with_rich_text_#{name}", -> { includes("rich_text_#{name}") }
         scope :"with_rich_text_#{name}_and_embeds", -> { includes("rich_text_#{name}": { embeds_attachments: :blob }) }
-
-        after_save do
-          public_send(name).save if public_send(name).changed?
-        end
       end
     end
   end

data/lib/action_text/gem_version.rb

@@ -10,7 +10,7 @@ module ActionText
     MAJOR = 6
     MINOR = 0
     TINY  = 0
-    PRE   = "beta3"
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/templates/installer.rb

@@ -29,4 +29,17 @@ if APPLICATION_PACK_PATH.exist?
       append_to_file APPLICATION_PACK_PATH, "\n#{line}"
     end
   end
+else
+  warn <<~WARNING
+    WARNING: Action Text can't locate your JavaScript bundle to add its package dependencies.
+
+    Add these lines to any bundles:
+
+    require("trix")
+    require("@rails/actiontext")
+
+    Alternatively, install and setup the webpacker gem then rerun `bin/rails action_text:install`
+    to have these dependencies added automatically.
+
+  WARNING
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rails/actiontext",
-  "version": "6.0.0-beta3",
+  "version": "6.0.0-rc1",
   "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.0.beta3
+  version: 6.0.0.rc1
 platform: ruby
 authors:
 - Javan Makhmali
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-13 00:00:00.000000000 Z
+date: 2019-04-24 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.0.beta3
+        version: 6.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta3
+        version: 6.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta3
+        version: 6.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta3
+        version: 6.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: activestorage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta3
+        version: 6.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta3
+        version: 6.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta3
+        version: 6.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta3
+        version: 6.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -134,8 +134,8 @@ homepage: https://rubyonrails.org
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/rails/rails/tree/v6.0.0.beta3/actiontext
-  changelog_uri: https://github.com/rails/rails/blob/v6.0.0.beta3/actiontext/CHANGELOG.md
+  source_code_uri: https://github.com/rails/rails/tree/v6.0.0.rc1/actiontext
+  changelog_uri: https://github.com/rails/rails/blob/v6.0.0.rc1/actiontext/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths: