valkyrie-shrine 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aef24fabeacf6da3dce1036b01bbc5738921e79f205b38c067d67d5d62d623f4
-  data.tar.gz: 53e0b0ffd66e766c808c0a5ce1be1ba340f4fe4404806f4f0c0c909eb62d5fd1
+  metadata.gz: a7a482b7fc9181f9af0f7a9b9f4fa4d7cc131c9b30489414799b7a0cc16d2c26
+  data.tar.gz: f20feb6e99e26a0c7e4af2bd39b19f2ad5a90d369b142d699abedbaa23829d64
 SHA512:
-  metadata.gz: 4573d6b6f1ba7e0e6bdd4dc03df7cf442f9c73e727498bd36c064d8ad75df56fe4d13fa9f159cd3dfa52150bf2eefc6f3a903afbd32acc9d47d9141152360b9f
-  data.tar.gz: f6e541e72d6b15fda6fb9611a7422eede93d33054450662954b0c5bbab970df03154038a954b6f54f5821421ab2fea84ea8dbf86b591ecf4b99a3dbe829f6740
+  metadata.gz: 547028b04de7538b83d9bb1685e3424722691be427c40a3c33545b646c5df99cb1ff01ea7b899c175bb330c0163c4359c5d437e6bda81063ae17e4efcbf03273
+  data.tar.gz: 824399812e4df139b35c13c0d45c0adcf35d5c41528ebd235b8d95ecd8d07d7a0b4ae0bb409bec0d7cefdc288dfae8522c1e6c79a39f36842b2ea6e7e6074623

data/circle.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/ruby:2.6.1
+      - image: cimg/ruby:2.6.1
         environment:
           BUNDLER_VERSION: 2.0.1
     steps:
@@ -26,4 +26,4 @@ jobs:
           command: bundle exec rubocop
       - run:
           name: Run Specs
-          command: bundle exec rspec spec
+          command: bundle exec rspec spec

data/lib/valkyrie/shrine/checksum/s3.rb

@@ -16,7 +16,8 @@ module Valkyrie
         end
 
         def calculate_checksum(result)
-          result.io.data[:object].data.etag.delete('"')
+          result.io.data[:object]&.data&.etag&.delete('"') ||
+            checksum_for(result.io)
         end
 
         def checksum_for(io)

data/lib/valkyrie/shrine/version.rb

@@ -2,6 +2,6 @@
 
 module Valkyrie
   module Shrine
-    VERSION = "0.3.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,41 @@ 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
+
+      class DelayedDownload
+        attr_reader :shrine, :id
+        def initialize(shrine, id)
+          @shrine = shrine
+          @id = id
+        end
+
+        def file
+          @file ||= shrine.open(id)
+        end
+
+        def method_missing(meth_name, *args, &block)
+          return super unless file.respond_to?(meth_name)
+          file.send(meth_name, *args, &block)
+        end
+
+        def respond_to_missing?(meth_name, include_private = false)
+          file.respond_to?(meth_name) || super
         end
       end
 
@@ -57,7 +87,7 @@ module Valkyrie
       # @raise Valkyrie::StorageAdapter::FileNotFound if nothing is found
       def find_by(id:)
         raise Valkyrie::StorageAdapter::FileNotFound unless shrine.exists?(shrine_id_for(id))
-        Valkyrie::StorageAdapter::StreamFile.new(id: Valkyrie::ID.new(id.to_s), io: shrine.open(shrine_id_for(id)))
+        Valkyrie::StorageAdapter::StreamFile.new(id: Valkyrie::ID.new(id.to_s), io: DelayedDownload.new(shrine, shrine_id_for(id)))
       rescue Aws::S3::Errors::NoSuchKey
         raise Valkyrie::StorageAdapter::FileNotFound
       end

data/valkyrie-shrine.gemspec

@@ -24,15 +24,15 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'aws-sdk-s3', '~> 1'
-  spec.add_dependency 'shrine', '~> 2.0'
+  spec.add_dependency 'shrine', '>= 2.0', '< 4.0'
   spec.add_dependency 'valkyrie', '> 1.0'
 
   spec.add_development_dependency 'bixby', '~> 2.0.0.pre.beta1'
   spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'coveralls', '~> 0.8.3'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'pry-byebug'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'actionpack'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valkyrie-shrine
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Brendan Quinn
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-08-26 00:00:00.000000000 Z
+date: 2022-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -28,16 +28,22 @@ dependencies:
   name: shrine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: valkyrie
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +90,16 @@ dependencies:
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -126,16 +132,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -178,7 +184,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - brendan-quinn@northwestern.edu
 executables: []
@@ -207,7 +213,7 @@ homepage: https://github.com/samvera-labs/valkyrie-shrine
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -222,8 +228,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Shrine storage adapter for Valkyrie
 test_files: []