tessa 6.0.0.rc1 → 6.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 033f87d750a6bb05ca27e653b62c4b0f5abe9a13a30226e0e874173a90091d22
-  data.tar.gz: b299e641d1c47faf81d70a9f11b74627015b50776a9c16ed26a6012c23a99048
+  metadata.gz: a8e21c3d74e92f753a5d6ae6b0e78adf670a512a029b4044c35b82a06f02b6b4
+  data.tar.gz: a653d63a20d3433b3c983b5b552d739dd2a75b77bb272f1f066ca06f07122f6b
 SHA512:
-  metadata.gz: fa737da8ef768d7091b81fc5175edd746e4ed8eac5c8453157d6d0621920f90f6005a29ae40c98d2ce03e732ac79c5dc83eba8fd90233804d65b14b701599dd4
-  data.tar.gz: bf534fec4385f7e6ab38e333cfabde983268b6d501a8beea638021b88310a973f3cdef499818eee046e0061d198d158f31221453afd2612e2892c5b614a20800
+  metadata.gz: c1b13ee45b792918c844b31d23c888309be682e3df4b40533c5ac9ca51f9b8b39b2d96c836c19cd0d89776e697aa2b698db5d74d6496962c07b19da98d9aa13a
+  data.tar.gz: 81fbd95c45021c449ed445c6d9831c824095279d26dc249b475b2a3aca9acc238af86634a12efac47f9e057180fa5aad1d45a6cb4ece929273ab284ce11da355

data/README.md

@@ -23,6 +23,12 @@ When that migration is completed, v2.x of this gem will remove all code that acc
 will transition to being simply a convenience wrapper around ActiveStorage, so that we don't have to re-write as much
 of our code in our frontend apps.
 
+v6.x of this gem is compatible with ActiveStorage v6 and above.  Since v6, ActiveStorage now does everything that this
+gem used to do, with the exception of Dropzone integration.  Therefore, tessa-client v6 only contains the following
+two modules:
+1. A set of Javascript utilities to integrate Dropzone.js with ActiveStorage direct uploads
+2. A SimpleForm helper to write out the hidden input fields for an ActiveStorage `has_one_attached`.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -61,17 +67,7 @@ from the user's browser.
 
 To get all this working, follow these steps:
 
-1. Mount the engine
-in your `config/routes.rb`, `mount Tessa::Engine, at: '/'`.  It's important that it is mounted at root.
-
-You can use Authentication around the engine to prevent unauthorized uploads.  With devise it's as simple as:
-```rb
-  authenticated :user do
-    mount Tessa::Engine, at: '/'
-  end
-```
-
-2. In your application.js, require the js libraries:
+1. In your application.js, require the js libraries:
 ```js
 //= require dropzone
 //= require tessa
@@ -79,16 +75,14 @@ You can use Authentication around the engine to prevent unauthorized uploads.  W
 Note that this only works if you are using Sprockets.
 If you are using another bundler, we don't support that yet.
 
-3. Ensure you configure your model with ActiveStorage
+2. use ActiveStorage to add an attached asset
 
 ```rb
 class Model < ApplicationRecord
-    include Tessa::Model
-
   has_one_attached :image
 ```
 
-4. When rendering your form, use the SimpleForm helper to render the dropzone div:
+3. When rendering your form, use the SimpleForm helper to render the dropzone div:
 
 ```erb
 <%= f.input :image,
@@ -97,7 +91,7 @@ class Model < ApplicationRecord
     hint: "Use an image that is 1440 x 288 in size (5:1 aspect ratio)" %>
 ```
 
-5. Configure your ActiveStorage service to accept direct uploads.
+4. Configure your ActiveStorage service to accept direct uploads.
     The disk service does this automatically.  The S3 service requires additional CORS configuration.
 
 ## Contributing

data/lib/tessa/simple_form/asset_input.rb

@@ -17,27 +17,51 @@ module Tessa
 
     def hidden_fields_for(attribute_name)
       asset = object.public_send(attribute_name)
-      unless asset&.key.present?
-        return @builder.hidden_field("#{attribute_name}")
+      if asset&.is_a?(String)
+        # This happens if the controller rejects the change with errors and re-renders the form.
+        # In this case our field value would be the signed upload ID.
+        return hidden_fileds_for_signed_id(attribute_name, asset)
       end
 
-      @builder.hidden_field("#{attribute_name}",
-        value: asset.key,
-        data: {
-          # These get read by the JS to populate the preview in Dropzone
-          meta: meta_for_asset(asset)
+      if asset&.key.present?
+        @builder.hidden_field("#{attribute_name}", {
+          value: asset.key,
+          data: {
+            meta: meta_for_blob(asset).merge({
+              # this allows us to find the hidden HTML input to remove it if we remove the asset
+              "signedID" => blob.key,
+            })
+          }
         })
+      end
+
+      return @builder.hidden_field("#{attribute_name}", value: nil)
+    end
+
+    def hidden_fileds_for_signed_id(attribute_name, signed_id)
+      if blob = ActiveStorage::Blob.find_signed(signed_id)
+        return @builder.hidden_field("#{attribute_name}", {
+          value: signed_id,
+          data: {
+            meta: meta_for_blob(blob).merge({
+              'signedID' => signed_id
+            })
+          }
+        })
+      end
+
+      # The form post sent some other string which was not a signed ID
+      return @builder.hidden_field("#{attribute_name}", value: nil)
     end
 
-    def meta_for_asset(asset)
+    # These get read by the JS to populate the preview in Dropzone
+    def meta_for_blob(blob)
       {
-        # this allows us to find the hidden HTML input to remove it if we remove the asset
-        "signedID" => asset.key,
-        "name" => asset.filename,
-        "size" => asset.byte_size,
-        "mimeType" => asset.content_type,
-        "url" => asset.service_url(disposition: :inline, expires_in: 1.hour),
-      }.to_json
+        "name" => blob.filename,
+        "size" => blob.byte_size,
+        "mimeType" => blob.content_type,
+        "url" => blob.service_url(disposition: :inline, expires_in: 1.hour),
+      }.as_json
     end
   end
 end

data/lib/tessa/version.rb

@@ -1,3 +1,3 @@
 module Tessa
-  VERSION = "6.0.0.rc1"
+  VERSION = "6.0.0.rc3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tessa
 version: !ruby/object:Gem::Version
-  version: 6.0.0.rc1
+  version: 6.0.0.rc3
 platform: ruby
 authors:
 - Justin Powell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-17 00:00:00.000000000 Z
+date: 2023-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake