valkyrie-shrine 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0908bc4244f8aada0a0016f0409a30ed7bcb16742796cdaefce8b682a14909f8'
-  data.tar.gz: c3f4f1e9d9b9291ac1171f53575bf9240094b0b774b9617f2b6cb2c39ee8172e
+  metadata.gz: 2ff75a9dea7b1a3e920b1fa9152fad9e109414bb047afe1265111e3746e73671
+  data.tar.gz: 5f913f31d5499c272974669d9a30b478a367545daee706bc5580031e4b551c9c
 SHA512:
-  metadata.gz: 7e9d584eb2b9712515a49b5a0b466dee46990362c6cc6e5a1d0deae02ae97cb6e16445b56080582e6899bd6d679a2f45aece574a3b37af2eb7cad89a22f43996
-  data.tar.gz: 27dd5f1a9121264f91aee77bb7626145767cb0f9673bed525208e905580d650ea8c05dea7fa80305eada198634ed443a4bdc548ef86a0fc619e3d44bf05d0a64
+  metadata.gz: aff9fadbab0b342f8180114f0ea38d51a93f8935e491bb5b35b1185c186efd33a94748faacc8e0a36541723cd37891dd72068c702f2227669cb92b733ec57bc4
+  data.tar.gz: cef14742ca6ea9edaa892fdb16636c4312f174781b7014632b8cc4b331036e8a01f3b31b92126fd381c0ee35d8394c1c957a7d172410336556a2f667096bfe7e

data/README.md

@@ -21,8 +21,8 @@ Follow the Valkyrie [README](https://github.com/samvera-labs/valkyrie) to get a
   # config/initializers/valkyrie.rb
   require 'shrine/storage/s3'
   require 'shrine/storage/file_system'
-  require 'valkyrie/storage/shrine/s3_checksum'
-  require 'valkyrie/storage/shrine/file_system_checksum'
+  require 'valkyrie/storage/shrine/checksum/s3'
+  require 'valkyrie/storage/shrine/checksum/file_system'
 
   Shrine.storages = {
     file: Shrine::Storage::FileSystem.new("public", prefix: "uploads"),
@@ -38,6 +38,8 @@ Follow the Valkyrie [README](https://github.com/samvera-labs/valkyrie) to get a
   )
 ```
 
+Then proceed to configure your application following the [Valkyrie documentation](https://github.com/samvera-labs/valkyrie#sample-configuration-configvalkyrieyml) 
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
@@ -46,4 +48,4 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/valkyrie-shrine.
+Bug reports and pull requests are welcome on GitHub at https://github.com/samvera-labs/valkyrie-shrine.

data/lib/valkyrie/shrine/version.rb

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

data/lib/valkyrie/storage/shrine.rb

@@ -8,9 +8,20 @@ module Valkyrie
     class Shrine
       PROTOCOL = 'shrine://'
 
-      attr_reader :shrine, :verifier
+      attr_reader :shrine, :verifier, :path_generator
 
-      def initialize(shrine_storage, verifier = nil)
+      class IDPathGenerator
+        def initialize(base_path: nil)
+          @base_path = base_path
+        end
+
+        def generate(resource:, file:, original_filename:)
+          resource.id.to_s
+        end
+      end
+
+      def initialize(shrine_storage, verifier = nil, path_generator = IDPathGenerator)
+        @path_generator = path_generator.new(base_path: "")
         @shrine = shrine_storage
         if verifier.nil?
           try_to_find_verifier
@@ -27,7 +38,7 @@ 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)
-        identifier = resource.id.to_s
+        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|
           if verifier

data/valkyrie-shrine.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'aws-sdk-s3', '~> 1'
   spec.add_dependency 'shrine', '~> 2.0'
-  spec.add_dependency 'valkyrie', '~> 2.0.0.RC3'
+  spec.add_dependency 'valkyrie', '> 1.0'
 
   spec.add_development_dependency 'bixby', '~> 2.0.0.pre.beta1'
   spec.add_development_dependency 'bundler', '~> 2.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valkyrie-shrine
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Brendan Quinn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-07 00:00:00.000000000 Z
+date: 2019-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -42,16 +42,16 @@ dependencies:
   name: valkyrie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 2.0.0.RC3
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 2.0.0.RC3
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bixby
   requirement: !ruby/object:Gem::Requirement
@@ -208,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Shrine storage adapter for Valkyrie