actiontext 7.0.0.rc3 → 7.0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2c66aac7b1ea1c36539ab957abb912869259919475431e061e6fdc6ed78c3aa
-  data.tar.gz: 3079059759accd5007aea3d712273a7a39f1fc62645244a6a5dad8affee700e4
+  metadata.gz: 933af844db7ed84866798cffd76980cb97fb6bb9b41caa22de82b6c5000f8bfb
+  data.tar.gz: 84adf4c4081c693987fb3fb5d875cd820499553360ba6b9bb2294ba134f147e7
 SHA512:
-  metadata.gz: 3e2bb9163a03021d5551144f8b631143e62dcbdf6c97e54a996f499ab8f9e3103049ea252fbfe531acf9382014502c8962448d9f1aeb728b587fc2584351d081
-  data.tar.gz: 7e29faedc27507dd79bcbccab77e7f3314f6d0b3633090a47dd9c65b665a412846a94193278894edf0ba3295f4fefb54d635816ade17f3c651265efd762d7934
+  metadata.gz: 2916fbbba410339715c5872fe92dcc02fb2de2d273ab0376614f22a62631549071bbfee7beb964831df6d09783d75bc09c04a51eb6921c8920d9b171bc4eee07
+  data.tar.gz: af22c9af3bf680742b30ab283fb8e8fd0f6641bed2839a48b2445287edca60c71a99dd632a06312639e84dca70822eb587f48e88633ea2f2e3f533a5f5c36242

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## Rails 7.0.2.1 (February 11, 2022) ##
+
+*   No changes.
+
+
+## Rails 7.0.2 (February 08, 2022) ##
+
+*   No changes.
+
+
+## Rails 7.0.1 (January 06, 2022) ##
+
+*   No changes.
+
+
+## Rails 7.0.0 (December 15, 2021) ##
+
+*   No changes.
+
+
 ## Rails 7.0.0.rc3 (December 14, 2021) ##
 
 *   No changes.
@@ -5,6 +25,10 @@
 
 ## Rails 7.0.0.rc2 (December 14, 2021) ##
 
+*   No changes.
+
+## Rails 7.0.0.rc1 (December 06, 2021) ##
+
 *   Fix an issue with how nested lists were displayed when converting to plain text
 
     *Matt Swanson*

data/MIT-LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2021 Basecamp, LLC
+Copyright (c) 2020-2022 Basecamp, LLC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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,8 +9,8 @@ module ActionText
   module VERSION
     MAJOR = 7
     MINOR = 0
-    TINY  = 0
-    PRE   = "rc3"
+    TINY  = 2
+    PRE   = "1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rails/actiontext",
-  "version": "7.0.0-rc3",
+  "version": "7.0.2-1",
   "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.rc3
+  version: 7.0.2.1
 platform: ruby
 authors:
 - Javan Makhmali
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-14 00:00:00.000000000 Z
+date: 2022-02-11 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.rc3
+        version: 7.0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0.rc3
+        version: 7.0.2.1
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0.rc3
+        version: 7.0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0.rc3
+        version: 7.0.2.1
 - !ruby/object:Gem::Dependency
   name: activestorage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0.rc3
+        version: 7.0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0.rc3
+        version: 7.0.2.1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0.rc3
+        version: 7.0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0.rc3
+        version: 7.0.2.1
 - !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.0.rc3/actiontext/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v7.0.0.rc3/
+  changelog_uri: https://github.com/rails/rails/blob/v7.0.2.1/actiontext/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.0.2.1/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v7.0.0.rc3/actiontext
+  source_code_uri: https://github.com/rails/rails/tree/v7.0.2.1/actiontext
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
@@ -176,11 +176,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Rich text framework.