tessa 6.0.0.rc2 → 6.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20d746d445cccc01d998f1d8bead8b92b8e0083e1858cd40ed2151785c1f4830
-  data.tar.gz: aa0432076ee14f238af2bf5cffdc83a0f37055246a1524ae2a05cb48e5bb3ed4
+  metadata.gz: a8e21c3d74e92f753a5d6ae6b0e78adf670a512a029b4044c35b82a06f02b6b4
+  data.tar.gz: a653d63a20d3433b3c983b5b552d739dd2a75b77bb272f1f066ca06f07122f6b
 SHA512:
-  metadata.gz: 386f143532a9e1a17b7149488d6d50d2affa444a3fc029653c5dca2218eef980df1963982cc64020b7aca85c7fbd7063e19a23fa0355cdebc4a0881230715585
-  data.tar.gz: f504a6ae2e98ee85478bb5d89ddb950533c80aa5a881f7accb336dfd36049eea8b1336c5a9f602ff6b51a4085826d76104475e3af9fdb8e17fdb0b7160a177f6
+  metadata.gz: c1b13ee45b792918c844b31d23c888309be682e3df4b40533c5ac9ca51f9b8b39b2d96c836c19cd0d89776e697aa2b698db5d74d6496962c07b19da98d9aa13a
+  data.tar.gz: 81fbd95c45021c449ed445c6d9831c824095279d26dc249b475b2a3aca9acc238af86634a12efac47f9e057180fa5aad1d45a6cb4ece929273ab284ce11da355

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}", value: nil)
+      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.rc2"
+  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.rc2
+  version: 6.0.0.rc3
 platform: ruby
 authors:
 - Justin Powell