valkyrie-shrine 0.5.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5d7dc948b6f87906f3d62207c2d9a3642ee52b34ddabebdefbe5dcde3eb47f4
-  data.tar.gz: acc1806a446bfd8e8c4e1f16a9b2e9a475ab3309296f8ba44a0cb6e3b255494c
+  metadata.gz: a7a482b7fc9181f9af0f7a9b9f4fa4d7cc131c9b30489414799b7a0cc16d2c26
+  data.tar.gz: f20feb6e99e26a0c7e4af2bd39b19f2ad5a90d369b142d699abedbaa23829d64
 SHA512:
-  metadata.gz: 9cf334edc64829d8ae960e8e35037cdce590edcfc08b6f29fcbb0464337571bd015b938d38a7d0e0b7f77d7f2474a695a2f829c22884c91362ecba3be583bff7
-  data.tar.gz: 96b16e3d76a6d670fbe1bd46393b8ba6ad0bdd6b79678c6100f305c5b5347c2a91a02679d21ebe22914e1e3d992094512d7821e142b3d539c78b439719036f98
+  metadata.gz: 547028b04de7538b83d9bb1685e3424722691be427c40a3c33545b646c5df99cb1ff01ea7b899c175bb330c0163c4359c5d437e6bda81063ae17e4efcbf03273
+  data.tar.gz: 824399812e4df139b35c13c0d45c0adcf35d5c41528ebd235b8d95ecd8d07d7a0b4ae0bb409bec0d7cefdc288dfae8522c1e6c79a39f36842b2ea6e7e6074623

data/lib/valkyrie/shrine/version.rb

@@ -2,6 +2,6 @@
 
 module Valkyrie
   module Shrine
-    VERSION = "0.5.0"
+    VERSION = "1.0.0"
   end
 end

data/lib/valkyrie/storage/shrine.rb

@@ -2,6 +2,7 @@
 
 require 'shrine'
 require 'digest/md5'
+require 'securerandom'
 
 module Valkyrie
   module Storage
@@ -11,12 +12,20 @@ module Valkyrie
       attr_reader :shrine, :verifier, :path_generator, :identifier_prefix
 
       class IDPathGenerator
-        def initialize(base_path: nil)
-          @base_path = base_path
-        end
+        def initialize(base_path: nil); end
 
+        # @return [String]
         def generate(resource:, file:, original_filename:)
-          resource.id.to_s
+          # Because Valkyrie has to maintain compatibility with ActiveFedora via
+          # the wings adapter, the file passed to #upload has to be saved before
+          # its associated FileMetadata; this means that the resource provided
+          # here is the parent FileSet rather than the FileMetadata object.  As
+          # a result, when we upload derivatives (like thumbnails) we have to
+          # pass the same resource as for the original file.  If we relied on
+          # the resource.id to generate the ID for the StreamFile here, that
+          # would result in derivative uploads overwriting their originals.
+          # Thus we use a UUID, prefixed by the resource ID.
+          "#{resource.id}/#{SecureRandom.uuid}"
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valkyrie-shrine
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Brendan Quinn
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-20 00:00:00.000000000 Z
+date: 2022-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3