actiontext 7.0.0.alpha2 → 7.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5994f598d86c9ad90a4fad9cf5668b031fd0e9ee604c4ac3a64e18562c39207
-  data.tar.gz: 11465640818df42007e65607c50f3dad3797871e61550a1b9f988b14fb6abc4e
+  metadata.gz: 39c49e2382be3b158f503ab091dfd137d7b70d8169f0a5d3bf0a15f563abedfd
+  data.tar.gz: 14a99fd63b659a235cc62f8359948ede8a71223bedfff6fc3a41f5871d9bc9b3
 SHA512:
-  metadata.gz: aed16d8731213a4ee9178433b0c78e08b4c733b78a973fe055dc5c506255d6827cbde50942083edabe576ea8915a2a866b25b65d05e95bef2f1eee5dcb630352
-  data.tar.gz: 23f2fb5faa7da62e86a2d22ea30827bb92d02cba067da9062c08d205521be6962ddd322878b1b71104fae2d787873f7e9deb899a270a1f5c2634cea4c6989346
+  metadata.gz: bf2e8b05f1232635c2754ae18606137abb012b3d00ec15f03eab1e8f416040aae2fedd5a5aa93f5b8ce20cccb56da9e269c7d2b10989cbe7873235fd265d626d
+  data.tar.gz: ffd63158c7e3b41aa602e767325a489b08f76580a4940b324296205f9fb938eb00511907e77e033c4eea19dcc90722f11b4d8d858d65f176a2deb9e821240f62

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+*   Fix an issue with how nested lists were displayed when converting to plain text
+
+    *Matt Swanson*
+
+*   Allow passing in a custom `direct_upload_url` or `blob_url_template` to `rich_text_area_tag`.
+
+    *Lucas Mansur*
+
+
 ## Rails 7.0.0.alpha2 (September 15, 2021) ##
 
 *   No changes.

data/app/assets/javascripts/actiontext.js

@@ -506,14 +506,16 @@ var activestorage = {exports: {}};
     }
   }
   class BlobRecord {
-    constructor(file, checksum, url) {
+    constructor(file, checksum, url, directUploadToken, attachmentName) {
       this.file = file;
       this.attributes = {
         filename: file.name,
         content_type: file.type || "application/octet-stream",
         byte_size: file.size,
-        checksum: checksum
+        checksum: checksum,
       };
+      this.directUploadToken = directUploadToken;
+      this.attachmentName = attachmentName;
       this.xhr = new XMLHttpRequest;
       this.xhr.open("POST", url, true);
       this.xhr.responseType = "json";
@@ -541,7 +543,9 @@ var activestorage = {exports: {}};
     create(callback) {
       this.callback = callback;
       this.xhr.send(JSON.stringify({
-        blob: this.attributes
+        blob: this.attributes,
+        direct_upload_token: this.directUploadToken,
+        attachment_name: this.attachmentName
       }));
     }
     requestDidLoad(event) {
@@ -599,10 +603,12 @@ var activestorage = {exports: {}};
   }
   let id = 0;
   class DirectUpload {
-    constructor(file, url, delegate) {
+    constructor(file, url, directUploadToken, attachmentName, delegate) {
       this.id = ++id;
       this.file = file;
       this.url = url;
+      this.directUploadToken = directUploadToken;
+      this.attachmentName = attachmentName;
       this.delegate = delegate;
     }
     create(callback) {
@@ -611,7 +617,7 @@ var activestorage = {exports: {}};
           callback(error);
           return;
         }
-        const blob = new BlobRecord(this.file, checksum, this.url);
+        const blob = new BlobRecord(this.file, checksum, this.url, this.directUploadToken, this.attachmentName);
         notify(this.delegate, "directUploadWillCreateBlobWithXHR", blob.xhr);
         blob.create((error => {
           if (error) {
@@ -640,7 +646,7 @@ var activestorage = {exports: {}};
     constructor(input, file) {
       this.input = input;
       this.file = file;
-      this.directUpload = new DirectUpload(this.file, this.url, this);
+      this.directUpload = new DirectUpload(this.file, this.url, this.directUploadToken, this.attachmentName, this);
       this.dispatch("initialize");
     }
     start(callback) {
@@ -671,6 +677,12 @@ var activestorage = {exports: {}};
     get url() {
       return this.input.getAttribute("data-direct-upload-url");
     }
+    get directUploadToken() {
+      return this.input.getAttribute("data-direct-upload-token");
+    }
+    get attachmentName() {
+      return this.input.getAttribute("data-direct-upload-attachment-name");
+    }
     dispatch(name, detail = {}) {
       detail.file = this.file;
       detail.id = this.directUpload.id;
@@ -830,7 +842,7 @@ class AttachmentUpload {
   constructor(attachment, element) {
     this.attachment = attachment;
     this.element = element;
-    this.directUpload = new activestorage.exports.DirectUpload(attachment.file, this.directUploadUrl, this);
+    this.directUpload = new activestorage.exports.DirectUpload(attachment.file, this.directUploadUrl, this.directUploadToken, this.directUploadAttachmentName, this);
   }
 
   start() {
@@ -865,6 +877,14 @@ class AttachmentUpload {
     return this.element.dataset.directUploadUrl
   }
 
+  get directUploadToken() {
+    return this.element.dataset.directUploadToken
+  }
+
+  get directUploadAttachmentName() {
+    return this.element.dataset.directUploadAttachmentName
+  }
+
   get blobUrlTemplate() {
     return this.element.dataset.blobUrlTemplate
   }

data/app/helpers/action_text/tag_helper.rb

@@ -13,6 +13,8 @@ module ActionText
     # ==== Options
     # * <tt>:class</tt> - Defaults to "trix-content" so that default styles will be applied.
     #   Setting this to a different value will prevent default styles from being applied.
+    # * <tt>[:data][:direct_upload_url]</tt> - Defaults to +rails_direct_uploads_url+.
+    # * <tt>[:data][:blob_url_template]</tt> - Defaults to <tt>rails_service_blob_url(":signed_id", ":filename")</tt>.
     #
     # ==== Example
     #
@@ -27,8 +29,16 @@ module ActionText
       options[:class] ||= "trix-content"
 
       options[:data] ||= {}
-      options[:data][:direct_upload_url] = main_app.rails_direct_uploads_url
-      options[:data][:blob_url_template] = main_app.rails_service_blob_url(":signed_id", ":filename")
+      options[:data][:direct_upload_url] ||= main_app.rails_direct_uploads_url
+      options[:data][:blob_url_template] ||= main_app.rails_service_blob_url(":signed_id", ":filename")
+
+      class_with_attachment = "ActionText::RichText#embeds"
+      options[:data][:direct_upload_attachment_name] ||= class_with_attachment
+      options[:data][:direct_upload_token] = ActiveStorage::DirectUploadToken.generate_direct_upload_token(
+        class_with_attachment,
+        ActiveStorage::Blob.service.name,
+        session
+      )
 
       editor_tag = content_tag("trix-editor", "", options)
       input_tag = hidden_field_tag(name, value.try(:to_trix_html) || value, id: options[:input], form: form)
@@ -59,6 +69,8 @@ module ActionView::Helpers
     # ==== Options
     # * <tt>:class</tt> - Defaults to "trix-content" which ensures default styling is applied.
     # * <tt>:value</tt> - Adds a default value to the HTML input tag.
+    # * <tt>[:data][:direct_upload_url]</tt> - Defaults to +rails_direct_uploads_url+.
+    # * <tt>[:data][:blob_url_template]</tt> - Defaults to +rails_service_blob_url(":signed_id", ":filename")+.
     #
     # ==== Example
     #   form_with(model: @message) do |form|

data/app/javascript/actiontext/attachment_upload.js

@@ -4,7 +4,7 @@ export class AttachmentUpload {
   constructor(attachment, element) {
     this.attachment = attachment
     this.element = element
-    this.directUpload = new DirectUpload(attachment.file, this.directUploadUrl, this)
+    this.directUpload = new DirectUpload(attachment.file, this.directUploadUrl, this.directUploadToken, this.attachmentName, this)
   }
 
   start() {
@@ -42,4 +42,11 @@ export class AttachmentUpload {
   get blobUrlTemplate() {
     return this.element.dataset.blobUrlTemplate
   }
+
+  get directUploadToken() {
+    return this.element.getAttribute("data-direct-upload-token");
+  }
+  get attachmentName() {
+    return this.element.getAttribute("data-direct-upload-attachment-name");
+  }
 }

data/lib/action_text/fixture_set.rb

@@ -10,23 +10,26 @@ module ActionText
   # === YAML
   #
   # Like other Active Record-backed models, ActionText::RichText records inherit
-  # from ActiveRecord::Base instances and therefore can be populated by
+  # from ActiveRecord::Base instances and can therefore be populated by
   # fixtures.
   #
-  # Consider a hypothetical <tt>Article</tt> model class, its related fixture
-  # data, as well as fixture data for related ActionText::RichText records:
+  # Consider an <tt>Article</tt> class:
   #
-  #   # app/models/article.rb
   #   class Article < ApplicationRecord
   #     has_rich_text :content
   #   end
   #
-  #   # tests/fixtures/articles.yml
+  # 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>:
+  #
   #   first:
   #     title: An Article
   #
-  #   # tests/fixtures/action_text/rich_texts.yml
-  #   first_content:
+  # Then declare the <tt>ActionText::RichText</tt> 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:
+  #
+  #   first:
   #     record: first (Article)
   #     name: content
   #     body: <div>Hello, world.</div>
@@ -39,18 +42,21 @@ module ActionText
     #
     # === Examples
     #
-    # For example, consider a second <tt>Article</tt> record that mentions the
-    # first as part of its <tt>content</tt> HTML:
+    # For example, consider a second <tt>Article</tt> fixture declared in
+    # <tt>test/fixtures/articles.yml</tt>:
     #
-    #   # tests/fixtures/articles.yml
     #   second:
     #     title: Another Article
     #
-    #   # tests/fixtures/action_text/rich_texts.yml
-    #   second_content:
+    # 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>:
+    #
+    #   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,
         column_type: column_type, for: ActionText::Attachable::LOCATOR_NAME

data/lib/action_text/gem_version.rb

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

data/lib/action_text/plain_text_conversion.rb

@@ -33,10 +33,18 @@ module ActionText
         "#{remove_trailing_newlines(plain_text_for_node_children(node))}\n\n"
       end
 
-      %i[ h1 p ul ol ].each do |element|
+      %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))}"
+      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)
         "\n"
       end
@@ -61,7 +69,9 @@ module ActionText
       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))
-        "#{bullet} #{text}\n"
+        indentation = indentation_for_li_node(node)
+
+        "#{indentation}#{bullet} #{text}\n"
       end
 
       def remove_trailing_newlines(text)
@@ -79,5 +89,24 @@ module ActionText
       def list_node_name_for_li_node(node)
         node.ancestors.lazy.map(&:name).grep(/^[uo]l$/).first
       end
+
+      def indentation_for_li_node(node)
+        depth = list_node_depth_for_node(node)
+        if depth > 1
+          "  " * (depth - 1)
+        end
+      end
+
+      def list_node_depth_for_node(node)
+        node.ancestors.map(&:name).grep(/^[uo]l$/).count
+      end
+
+      def break_if_nested_list(node, text)
+        if list_node_depth_for_node(node) > 0
+          "\n#{text}"
+        else
+          text
+        end
+      end
   end
 end

data/lib/action_text/serialization.rb

@@ -15,6 +15,8 @@ module ActionText
           nil
         when self
           content.to_html
+        when ActionText::RichText
+          content.body.to_html
         else
           new(content).to_html
         end

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

@@ -32,8 +32,20 @@ module ActionText
       end
 
       def create_actiontext_files
+        destination = Pathname(destination_root)
+
         template "actiontext.css", "app/assets/stylesheets/actiontext.css"
 
+        unless destination.join("app/assets/application.css").exist?
+          if (stylesheets = Dir.glob "#{destination_root}/app/assets/stylesheets/application.*.{scss,css}").length > 0
+            insert_into_file stylesheets.first.to_s, %(@import 'actiontext.css';)
+          else
+            say <<~INSTRUCTIONS, :green
+              To use the Trix editor, you must require 'app/assets/stylesheets/actiontext.css' in your base stylesheet.
+            INSTRUCTIONS
+          end
+        end
+
         gem_root = "#{__dir__}/../../../.."
 
         copy_file "#{gem_root}/app/views/active_storage/blobs/_blob.html.erb",

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rails/actiontext",
-  "version": "7.0.0-alpha2",
+  "version": "7.0.0-rc1",
   "description": "Edit and display rich text in Rails applications",
   "main": "app/javascript/actiontext/index.js",
   "type": "module",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actiontext
 version: !ruby/object:Gem::Version
-  version: 7.0.0.alpha2
+  version: 7.0.0.rc1
 platform: ruby
 authors:
 - Javan Makhmali
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-15 00:00:00.000000000 Z
+date: 2021-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -18,56 +18,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0.alpha2
+        version: 7.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0.alpha2
+        version: 7.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0.alpha2
+        version: 7.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0.alpha2
+        version: 7.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: activestorage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0.alpha2
+        version: 7.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0.alpha2
+        version: 7.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0.alpha2
+        version: 7.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0.alpha2
+        version: 7.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -82,6 +82,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.5
+- !ruby/object:Gem::Dependency
+  name: globalid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 description: Edit and display rich text in Rails applications.
 email:
 - javan@javan.us
@@ -146,10 +160,11 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v7.0.0.alpha2/actiontext/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v7.0.0.alpha2/
+  changelog_uri: https://github.com/rails/rails/blob/v7.0.0.rc1/actiontext/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.0.0.rc1/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v7.0.0.alpha2/actiontext
+  source_code_uri: https://github.com/rails/rails/tree/v7.0.0.rc1/actiontext
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -165,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Rich text framework.