actiontext 7.2.1.1 → 8.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dff22ea29340985c645f24023a493f071bb20b46bf7219adce5116af1cb2ce09
-  data.tar.gz: e8d8db93776bf73f40814736dc238d5643b62434b85ddcffe1c0d9d096d1c940
+  metadata.gz: 6b8e0bf08fc3ee2fc3232ae60d94ba99fd2a74bf10256a882b2aa22949a74b1f
+  data.tar.gz: 8408cf6c03443c952ea086c12efc4126d059c746ce95921e2c203af9a129aa33
 SHA512:
-  metadata.gz: 3e6e30b5e160f1f7a3475653fd2cafca61e1ddf94320a5937cb8afe2d58feaca027885a37260f2fe96840433428a4b77f8a69435481d24eec27c3b0e9e82e407
-  data.tar.gz: 827a4e32168d54371c23143c469674421217b6411bedb180e7c639e643b500f44236afbf47996a82d7f5b09559838c032aaa1c296b4444265a979b15b7fcb7be
+  metadata.gz: 275f4aa614386fdb27f5addeeb62f2c200599434214364d5179e73c97dc23a97858a48a5031050e81da40dbb705c56575ecdcf8d2b88a5879bdaedcf5f85434d
+  data.tar.gz: b23c2dec4fa69d970efc554a08c962745f051c7a645a4273c28ee38e476b2565f9815d5871b7fb058d6dc47c2ca3e258acdd7ae86896bce4678692341f7641fe

data/CHANGELOG.md

@@ -1,66 +1,49 @@
-## Rails 7.2.1.1 (October 15, 2024) ##
+## Rails 8.0.0.rc1 (October 19, 2024) ##
 
-*   Avoid backtracing in plain_text_for_blockquote_node
+*   No changes.
 
-    [CVE-2024-47888]
 
-## Rails 7.2.1 (August 22, 2024) ##
+## Rails 8.0.0.beta1 (September 26, 2024) ##
 
-*   Strip `content` attribute if the key is present but the value is empty
-
-    *Jeremy Green*
-
-
-## Rails 7.2.0 (August 09, 2024) ##
-*   Only sanitize `content` attribute when present in attachments.
+*   Dispatch direct-upload events on attachment uploads
 
-    *Petrik de Heus*
+    When using Action Text's rich textarea,  it's possible to attach files to the
+    editor. Previously, that action didn't dispatch any events, which made it hard
+    to react to the file uploads. For instance, if an upload failed, there was no
+    way to notify the user about it, or remove the attachment from the editor.
 
-*   Sanitize ActionText HTML ContentAttachment in Trix edit view
-    [CVE-2024-32464]
+    This commits adds new events - `direct-upload:start`, `direct-upload:progress`,
+    and `direct-upload:end` - similar to how Active Storage's direct uploads work.
 
-    *Aaron Patterson*, *Zack Deveau*
+    *Matheus Richard*, *Brad Rees*
 
-*   Use `includes` instead of `eager_load` for `with_all_rich_text`.
+*   Add `store_if_blank` option to `has_rich_text`
 
-    *Petrik de Heus*
-
-*   Delegate `ActionText::Content#deconstruct` to `Nokogiri::XML::DocumentFragment#elements`.
+    Pass `store_if_blank: false` to not create `ActionText::RichText` records when saving with a blank attribute, such as from an optional form parameter.
 
     ```ruby
-    content = ActionText::Content.new <<~HTML
-      <h1>Hello, world</h1>
-
-      <div>The body</div>
-    HTML
+    class Message
+      has_rich_text :content, store_if_blank: false
+    end
 
-    content => [h1, div]
-
-    assert_pattern { h1 => { content: "Hello, world" } }
-    assert_pattern { div => { content: "The body" } }
+    Message.create(content: "hi") # creates an ActionText::RichText
+    Message.create(content: "") # does not create an ActionText::RichText
     ```
 
-    *Sean Doyle*
-
-*   Fix all Action Text database related models to respect
-    `ActiveRecord::Base.table_name_prefix` configuration.
-
-    *Chedli Bourguiba*
-
-*   Compile ESM package that can be used directly in the browser as actiontext.esm.js
+    *Alex Ghiculescu*
 
-    *Matias Grunberg*
+*   Strip `content` attribute if the key is present but the value is empty
 
-*   Fix using actiontext.js with Sprockets.
+    *Jeremy Green*
 
-    *Matias Grunberg*
+*   Rename `rich_text_area` methods into `rich_textarea`
 
-*   Upgrade Trix to 2.0.7
+    Old names are still available as aliases.
 
-    *Hartley McGuire*
+    *Sean Doyle*
 
-*   Fix using Trix with Sprockets.
+*   Only sanitize `content` attribute when present in attachments.
 
-    *Hartley McGuire*
+    *Petrik de Heus*
 
-Please check [7-1-stable](https://github.com/rails/rails/blob/7-1-stable/actiontext/CHANGELOG.md) for previous changes.
+Please check [7-2-stable](https://github.com/rails/rails/blob/7-2-stable/actiontext/CHANGELOG.md) for previous changes.

data/app/assets/javascripts/actiontext.esm.js

@@ -853,25 +853,47 @@ class AttachmentUpload {
   }
   start() {
     this.directUpload.create(this.directUploadDidComplete.bind(this));
+    this.dispatch("start");
   }
   directUploadWillStoreFileWithXHR(xhr) {
     xhr.upload.addEventListener("progress", (event => {
       const progress = event.loaded / event.total * 100;
       this.attachment.setUploadProgress(progress);
+      if (progress) {
+        this.dispatch("progress", {
+          progress: progress
+        });
+      }
     }));
   }
   directUploadDidComplete(error, attributes) {
     if (error) {
-      throw new Error(`Direct upload failed: ${error}`);
+      this.dispatchError(error);
+    } else {
+      this.attachment.setAttributes({
+        sgid: attributes.attachable_sgid,
+        url: this.createBlobUrl(attributes.signed_id, attributes.filename)
+      });
+      this.dispatch("end");
     }
-    this.attachment.setAttributes({
-      sgid: attributes.attachable_sgid,
-      url: this.createBlobUrl(attributes.signed_id, attributes.filename)
-    });
   }
   createBlobUrl(signedId, filename) {
     return this.blobUrlTemplate.replace(":signed_id", signedId).replace(":filename", encodeURIComponent(filename));
   }
+  dispatch(name, detail = {}) {
+    detail.attachment = this.attachment;
+    return dispatchEvent(this.element, `direct-upload:${name}`, {
+      detail: detail
+    });
+  }
+  dispatchError(error) {
+    const event = this.dispatch("error", {
+      error: error
+    });
+    if (!event.defaultPrevented) {
+      alert(error);
+    }
+  }
   get directUploadUrl() {
     return this.element.dataset.directUploadUrl;
   }

data/app/assets/javascripts/actiontext.js

@@ -826,25 +826,47 @@
     }
     start() {
       this.directUpload.create(this.directUploadDidComplete.bind(this));
+      this.dispatch("start");
     }
     directUploadWillStoreFileWithXHR(xhr) {
       xhr.upload.addEventListener("progress", (event => {
         const progress = event.loaded / event.total * 100;
         this.attachment.setUploadProgress(progress);
+        if (progress) {
+          this.dispatch("progress", {
+            progress: progress
+          });
+        }
       }));
     }
     directUploadDidComplete(error, attributes) {
       if (error) {
-        throw new Error(`Direct upload failed: ${error}`);
+        this.dispatchError(error);
+      } else {
+        this.attachment.setAttributes({
+          sgid: attributes.attachable_sgid,
+          url: this.createBlobUrl(attributes.signed_id, attributes.filename)
+        });
+        this.dispatch("end");
       }
-      this.attachment.setAttributes({
-        sgid: attributes.attachable_sgid,
-        url: this.createBlobUrl(attributes.signed_id, attributes.filename)
-      });
     }
     createBlobUrl(signedId, filename) {
       return this.blobUrlTemplate.replace(":signed_id", signedId).replace(":filename", encodeURIComponent(filename));
     }
+    dispatch(name, detail = {}) {
+      detail.attachment = this.attachment;
+      return dispatchEvent(this.element, `direct-upload:${name}`, {
+        detail: detail
+      });
+    }
+    dispatchError(error) {
+      const event = this.dispatch("error", {
+        error: error
+      });
+      if (!event.defaultPrevented) {
+        alert(error);
+      }
+    }
     get directUploadUrl() {
       return this.element.dataset.directUploadUrl;
     }