valkyrie-shrine 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ff75a9dea7b1a3e920b1fa9152fad9e109414bb047afe1265111e3746e73671
-  data.tar.gz: 5f913f31d5499c272974669d9a30b478a367545daee706bc5580031e4b551c9c
+  metadata.gz: aef24fabeacf6da3dce1036b01bbc5738921e79f205b38c067d67d5d62d623f4
+  data.tar.gz: 53e0b0ffd66e766c808c0a5ce1be1ba340f4fe4404806f4f0c0c909eb62d5fd1
 SHA512:
-  metadata.gz: aff9fadbab0b342f8180114f0ea38d51a93f8935e491bb5b35b1185c186efd33a94748faacc8e0a36541723cd37891dd72068c702f2227669cb92b733ec57bc4
-  data.tar.gz: cef14742ca6ea9edaa892fdb16636c4312f174781b7014632b8cc4b331036e8a01f3b31b92126fd381c0ee35d8394c1c957a7d172410336556a2f667096bfe7e
+  metadata.gz: 4573d6b6f1ba7e0e6bdd4dc03df7cf442f9c73e727498bd36c064d8ad75df56fe4d13fa9f159cd3dfa52150bf2eefc6f3a903afbd32acc9d47d9141152360b9f
+  data.tar.gz: f6e541e72d6b15fda6fb9611a7422eede93d33054450662954b0c5bbab970df03154038a954b6f54f5821421ab2fea84ea8dbf86b591ecf4b99a3dbe829f6740

data/lib/valkyrie/shrine/version.rb

@@ -2,6 +2,6 @@
 
 module Valkyrie
   module Shrine
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/lib/valkyrie/storage/shrine.rb

@@ -8,7 +8,7 @@ module Valkyrie
     class Shrine
       PROTOCOL = 'shrine://'
 
-      attr_reader :shrine, :verifier, :path_generator
+      attr_reader :shrine, :verifier, :path_generator, :identifier_prefix
 
       class IDPathGenerator
         def initialize(base_path: nil)
@@ -20,9 +20,10 @@ module Valkyrie
         end
       end
 
-      def initialize(shrine_storage, verifier = nil, path_generator = IDPathGenerator)
+      def initialize(shrine_storage, verifier = nil, path_generator = IDPathGenerator, identifier_prefix: nil)
         @path_generator = path_generator.new(base_path: "")
         @shrine = shrine_storage
+        @identifier_prefix = identifier_prefix
         if verifier.nil?
           try_to_find_verifier
         else
@@ -38,9 +39,12 @@ module Valkyrie
       # @raise Valkyrie::Shrine::IntegrityError if #verify_checksum is defined
       #   on the shrine object and the file and result digests do not match
       def upload(file:, original_filename:, resource:, **upload_options)
+        # S3 adapter validates options, so we have to remove this one used in
+        # the shared specs.
+        upload_options.delete(:fake_upload_argument)
         identifier = path_generator.generate(resource: resource, file: file, original_filename: original_filename).to_s
         shrine.upload(file, identifier, **upload_options)
-        find_by(id: "#{PROTOCOL}#{identifier}").tap do |result|
+        find_by(id: "#{protocol_with_prefix}#{identifier}").tap do |result|
           if verifier
             raise Valkyrie::Shrine::IntegrityError unless verifier.verify_checksum(file, result)
           end
@@ -52,6 +56,7 @@ module Valkyrie
       # @return [Valkyrie::StorageAdapter::StreamFile]
       # @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)))
       rescue Aws::S3::Errors::NoSuchKey
         raise Valkyrie::StorageAdapter::FileNotFound
@@ -60,7 +65,7 @@ module Valkyrie
       # @param id [Valkyrie::ID]
       # @return [Boolean] true if this adapter can handle this type of identifier
       def handles?(id:)
-        id.to_s.start_with?(PROTOCOL)
+        id.to_s.start_with?(protocol_with_prefix)
       end
 
       # Delete the file in S3 associated with the given identifier.
@@ -77,7 +82,11 @@ module Valkyrie
         end
 
         def shrine_id_for(id)
-          id.to_s.sub(/^#{PROTOCOL}/, '')
+          id.to_s.sub(/^#{protocol_with_prefix}/, '')
+        end
+
+        def protocol_with_prefix
+          [identifier_prefix, PROTOCOL].compact.join("-")
         end
     end
   end

data/valkyrie-shrine.gemspec

@@ -35,4 +35,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'actionpack'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valkyrie-shrine
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Brendan Quinn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-04 00:00:00.000000000 Z
+date: 2019-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - brendan-quinn@northwestern.edu
@@ -208,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Shrine storage adapter for Valkyrie