actiontext 6.0.0.beta1 → 6.0.1.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9eb946145656ee7d27e4ee9ce733a3e0f55e1b63ab16e4cea8741fecaac697f6
-  data.tar.gz: 658a5373916fd11abfdbd569746f1f4ed23fb71cc52294d513d063de47a148ab
+  metadata.gz: e027d8fcc05b12d8c897d7445f540e3f5df0e7ca3f992c4c409c95cd6b2475b9
+  data.tar.gz: 4c19e71d52d6920814b6d78f902329166ad261e96132f975d91a965b1ee5e174
 SHA512:
-  metadata.gz: 8418aebfa611943071b773ec51544e039f4f3e8220a594c4a66bfced904754da4f2ee1fc7d0472e7d6e0e207f4aad70f8828509fd0f6a95df5db1557e42f34cb
-  data.tar.gz: 427541191977534c0d36bf0b4cfb0615a5525e0ef645a939b31e066dac689ec0288bc7b6dca919523c8adae6ffee56888bc0d0cb232cd592c51bd8f06daee357
+  metadata.gz: f9889a9d71eeea85e8edf10f08cd36549991cfc620d29f323a2ebed84ccd0aa622c94015a240a51dbc84bf5528dd83bb9b9e2c95efff111f7eae7fe6f234446d
+  data.tar.gz: fc5f807c6eb51a74507909d784abf574a2d7cf227ae1913cbd93b01356553e3d1dfec6b3cc9a6eb5215a6d40926b36c95add9ddc0d3e25067477ad2a271f7e9c

data/CHANGELOG.md

@@ -1,3 +1,33 @@
+## Rails 6.0.1.rc1 (October 31, 2019) ##
+
+*   No changes.
+
+
+## Rails 6.0.0 (August 16, 2019) ##
+
+*   No changes.
+
+
+## Rails 6.0.0.rc2 (July 22, 2019) ##
+
+*   No changes.
+
+
+## Rails 6.0.0.rc1 (April 24, 2019) ##
+
+*   No changes.
+
+
+## Rails 6.0.0.beta3 (March 11, 2019) ##
+
+*   No changes.
+
+
+## Rails 6.0.0.beta2 (February 25, 2019) ##
+
+*   No changes.
+
+
 ## Rails 6.0.0.beta1 (January 18, 2019) ##
 
 *   Added to Rails.

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.safe_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/app/helpers/action_text/tag_helper.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
+require "action_view/helpers/tags/placeholderable"
+
 module ActionText
   module TagHelper
     cattr_accessor(:id, instance_accessor: false) { 0 }
 
-    # Returns a `trix-editor` tag that instantiates the Trix JavaScript editor as well as a hidden field
+    # Returns a +trix-editor+ tag that instantiates the Trix JavaScript editor as well as a hidden field
     # that Trix will write to on changes, so the content will be sent on form submissions.
     #
     # ==== Options
@@ -35,6 +37,8 @@ end
 
 module ActionView::Helpers
   class Tags::ActionText < Tags::Base
+    include Tags::Placeholderable
+
     delegate :dom_id, to: ActionView::RecordIdentifier
 
     def render
@@ -50,7 +54,7 @@ module ActionView::Helpers
   end
 
   module FormHelper
-    # Returns a `trix-editor` tag that instantiates the Trix JavaScript editor as well as a hidden field
+    # Returns a +trix-editor+ tag that instantiates the Trix JavaScript editor as well as a hidden field
     # that Trix will write to on changes, so the content will be sent on form submissions.
     #
     # ==== Options

data/app/models/action_text/rich_text.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 module ActionText
-  # The RichText record holds the content produced by the Trix editor in a serialized `body` attribute.
+  # The RichText record holds the content produced by the Trix editor in a serialized +body+ attribute.
   # It also holds all the references to the embedded files, which are stored using Active Storage.
   # This record is then associated with the Active Record model the application desires to have
-  # rich text content using the `has_rich_text` class method.
+  # rich text content using the +has_rich_text+ class method.
   class RichText < ActiveRecord::Base
     self.table_name = "action_text_rich_texts"
 
@@ -15,7 +15,7 @@ module ActionText
     has_many_attached :embeds
 
     before_save do
-      self.embeds = body.attachments.map(&:attachable) if body.present?
+      self.embeds = body.attachables.grep(ActiveStorage::Blob).uniq if body.present?
     end
 
     def to_plain_text

data/app/views/active_storage/blobs/_blob.html.erb

@@ -1,6 +1,6 @@
 <figure class="attachment attachment--<%= blob.representable? ? "preview" : "file" %> attachment--<%= blob.filename.extension %>">
   <% if blob.representable? %>
-    <%= image_tag blob.representation(resize_to_fit: local_assigns[:in_gallery] ? [ 800, 600 ] : [ 1024, 768 ]) %>
+    <%= image_tag blob.representation(resize_to_limit: local_assigns[:in_gallery] ? [ 800, 600 ] : [ 1024, 768 ]) %>
   <% end %>
 
   <figcaption class="attachment__caption">

data/db/migrate/{201805281641_create_action_text_tables.rb → 20180528164100_create_action_text_tables.rb}

@@ -2,11 +2,10 @@ class CreateActionTextTables < ActiveRecord::Migration[6.0]
   def change
     create_table :action_text_rich_texts do |t|
       t.string     :name, null: false
-      t.text       :body, limit: 16777215
+      t.text       :body, size: :long
       t.references :record, null: false, polymorphic: true, index: false
 
-      t.datetime :created_at, null: false
-      t.datetime :updated_at, null: false
+      t.timestamps
 
       t.index [ :record_type, :record_id, :name ], name: "index_action_text_rich_texts_uniqueness", unique: true
     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/engine.rb

@@ -25,6 +25,10 @@ module ActionText
         def previewable_attachable?
           representable?
         end
+
+        def attachable_plain_text_representation(caption = nil)
+          "[#{caption || filename}]"
+        end
       end
     end
 

data/lib/action_text/gem_version.rb

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

data/lib/templates/installer.rb

@@ -26,7 +26,20 @@ if APPLICATION_PACK_PATH.exist?
     line = %[require("#{name}")]
     unless APPLICATION_PACK_PATH.read.include? line
       say "Adding #{name} to #{APPLICATION_PACK_PATH}"
-      append_to_file APPLICATION_PACK_PATH, "#{line}\n"
+      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-beta1",
+  "version": "6.0.1-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.beta1
+  version: 6.0.1.rc1
 platform: ruby
 authors:
 - Javan Makhmali
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-18 00:00:00.000000000 Z
+date: 2019-10-31 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.beta1
+        version: 6.0.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta1
+        version: 6.0.1.rc1
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta1
+        version: 6.0.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta1
+        version: 6.0.1.rc1
 - !ruby/object:Gem::Dependency
   name: activestorage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta1
+        version: 6.0.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta1
+        version: 6.0.1.rc1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta1
+        version: 6.0.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta1
+        version: 6.0.1.rc1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -104,7 +104,7 @@ files:
 - app/views/action_text/attachment_galleries/_attachment_gallery.html.erb
 - app/views/action_text/content/_layout.html.erb
 - app/views/active_storage/blobs/_blob.html.erb
-- db/migrate/201805281641_create_action_text_tables.rb
+- db/migrate/20180528164100_create_action_text_tables.rb
 - lib/action_text.rb
 - lib/action_text/attachable.rb
 - lib/action_text/attachables/content_attachment.rb
@@ -134,8 +134,11 @@ homepage: https://rubyonrails.org
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/rails/rails/tree/v6.0.0.beta1/actiontext
-  changelog_uri: https://github.com/rails/rails/blob/v6.0.0.beta1/actiontext/CHANGELOG.md
+  bug_tracker_uri: https://github.com/rails/rails/issues
+  changelog_uri: https://github.com/rails/rails/blob/v6.0.1.rc1/actiontext/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.0.1.rc1/
+  mailing_list_uri: https://groups.google.com/forum/#!forum/rubyonrails-talk
+  source_code_uri: https://github.com/rails/rails/tree/v6.0.1.rc1/actiontext
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -151,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Rich text framework.