actiontext 7.0.1 → 7.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf4bd77285fd2b59a3896c75588bd2d85b451b0e149c392bf8fc9b81cb577fd8
-  data.tar.gz: 508163fd41adbf3e3055ca462045e4a23f0496b6dc5f283c968fe4296593d9b1
+  metadata.gz: 8f56744d9d099b5b762e63296c602589aaf59a8a2dba676c15d6e36da0fb0aa2
+  data.tar.gz: ef34b150c59b4d0f7ad9e13eacf41f949fd10cd40d12e9a0ea2aecb4f7ef561e
 SHA512:
-  metadata.gz: f1874b4e5135f3729d96c354e0a08bc3b4aee5ff97332bcb086352db68782e7095745daa6304aed64bdbf68cdd4aac3cde448273e35912c66f73fd32d70495f1
-  data.tar.gz: 1de1d1e3ef4feb540c075176a8e0d83d4dcd7bf1653e048c4a19db7781cf3c5bf3da1c5aebd054f695a54a0d2adfeaac5c31dc44f3b53b4bb6f125e74e386acf
+  metadata.gz: 14573ba5cac1acb537ce33dfc61894ce918948000ffe455b46abbf862d5e6b6f490a33469db2e68c9e1f2b7af72e05a467ef17e777fd38c77d480a7395e3264b
+  data.tar.gz: f536a90a0a0877510b1d2c825cf55a21e73c8da02afc78b819c619fe32dc095656cef188ba46c6122b330bdf7e0f8889b75deb65c81847bb818ad6b467379258

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Rails 7.0.2 (February 08, 2022) ##
+
+*   No changes.
+
+
 ## Rails 7.0.1 (January 06, 2022) ##
 
 *   No changes.

data/app/assets/javascripts/actiontext.js

@@ -506,16 +506,14 @@ var activestorage = {exports: {}};
     }
   }
   class BlobRecord {
-    constructor(file, checksum, url, directUploadToken, attachmentName) {
+    constructor(file, checksum, url) {
       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";
@@ -543,9 +541,7 @@ var activestorage = {exports: {}};
     create(callback) {
       this.callback = callback;
       this.xhr.send(JSON.stringify({
-        blob: this.attributes,
-        direct_upload_token: this.directUploadToken,
-        attachment_name: this.attachmentName
+        blob: this.attributes
       }));
     }
     requestDidLoad(event) {
@@ -603,12 +599,10 @@ var activestorage = {exports: {}};
   }
   let id = 0;
   class DirectUpload {
-    constructor(file, url, directUploadToken, attachmentName, delegate) {
+    constructor(file, url, delegate) {
       this.id = ++id;
       this.file = file;
       this.url = url;
-      this.directUploadToken = directUploadToken;
-      this.attachmentName = attachmentName;
       this.delegate = delegate;
     }
     create(callback) {
@@ -617,7 +611,7 @@ var activestorage = {exports: {}};
           callback(error);
           return;
         }
-        const blob = new BlobRecord(this.file, checksum, this.url, this.directUploadToken, this.attachmentName);
+        const blob = new BlobRecord(this.file, checksum, this.url);
         notify(this.delegate, "directUploadWillCreateBlobWithXHR", blob.xhr);
         blob.create((error => {
           if (error) {
@@ -646,7 +640,7 @@ var activestorage = {exports: {}};
     constructor(input, file) {
       this.input = input;
       this.file = file;
-      this.directUpload = new DirectUpload(this.file, this.url, this.directUploadToken, this.attachmentName, this);
+      this.directUpload = new DirectUpload(this.file, this.url, this);
       this.dispatch("initialize");
     }
     start(callback) {
@@ -677,12 +671,6 @@ 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;
@@ -842,7 +830,7 @@ class AttachmentUpload {
   constructor(attachment, element) {
     this.attachment = attachment;
     this.element = element;
-    this.directUpload = new activestorage.exports.DirectUpload(attachment.file, this.directUploadUrl, this.directUploadToken, this.directUploadAttachmentName, this);
+    this.directUpload = new activestorage.exports.DirectUpload(attachment.file, this.directUploadUrl, this);
   }
 
   start() {
@@ -877,14 +865,6 @@ 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

@@ -32,14 +32,6 @@ module ActionText
       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)
 

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.directUploadToken, this.attachmentName, this)
+    this.directUpload = new DirectUpload(attachment.file, this.directUploadUrl, this)
   }
 
   start() {
@@ -42,11 +42,4 @@ 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/gem_version.rb

@@ -9,7 +9,7 @@ module ActionText
   module VERSION
     MAJOR = 7
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rails/actiontext",
-  "version": "7.0.1",
+  "version": "7.0.2",
   "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.1
+  version: 7.0.2
 platform: ruby
 authors:
 - Javan Makhmali
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-06 00:00:00.000000000 Z
+date: 2022-02-08 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.1
+        version: 7.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.1
+        version: 7.0.2
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.1
+        version: 7.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.1
+        version: 7.0.2
 - !ruby/object:Gem::Dependency
   name: activestorage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.1
+        version: 7.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.1
+        version: 7.0.2
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.1
+        version: 7.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.1
+        version: 7.0.2
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -160,10 +160,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v7.0.1/actiontext/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v7.0.1/
+  changelog_uri: https://github.com/rails/rails/blob/v7.0.2/actiontext/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.0.2/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v7.0.1/actiontext
+  source_code_uri: https://github.com/rails/rails/tree/v7.0.2/actiontext
   rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []