shrine-tus 2.1.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0e37e19e2990440589f8c19976e7dc43cc012387da17ff854ba1226544e1cca
-  data.tar.gz: 07e70c10ec9c197c1445b0a6cf78f360e6504123ab1d06cd4b1dc63ddc1547ff
+  metadata.gz: b18f732eb94f0495dd4f9751e8b90e7a22035511dd9c5a7efa26b907763ff7b1
+  data.tar.gz: 963405456175daed695c3c8e8d3430fe9f2267294bbea335e69293abc48fc00b
 SHA512:
-  metadata.gz: 7cbbd7a375dcd729c2bffa9bbdbc9c1a3a8be76df8610f3ff22407fc71d275e2a84ae91e7d122d7b0e28299477b383ee43a9ae578a3501d9e8c2589d82ad4c5f
-  data.tar.gz: d954736334bd4b2d1ad6f55ee87f294d15b086af054ebbdc45be60510429dfd36a0e88b12c34323f2eb851750f43c5320dfee02468763408b553cd9a7d3f1b9d
+  metadata.gz: b69f5beaf01fdbd31fa1d3f66f8278c8c6b9d0c381f8fcc440ffcc66c7396ac3ba9ea7a0e75d1615630cd8413a25c458f27647a554b1ed11a31645db16741172
+  data.tar.gz: d4e616877fb0c56bb5d92a44daac74f13c9e56075bcc44eb9b15dbfd4638bf4033f58109aee4a4bc6d66f3cb721006335991d797ef64f04afe85c94ee96a32bd

data/lib/shrine/plugins/tus.rb

@@ -7,7 +7,7 @@ class Shrine
       module AttacherMethods
         private
 
-        def cached(data)
+        def cached(data, **options)
           data = data.dup
           data = JSON.parse(data) if data.is_a?(String)
 
@@ -16,7 +16,7 @@ class Shrine
             data["id"] = tus_url_to_storage_id(id, cache.storage)
           end
 
-          super(data)
+          super(data, **options)
         end
 
         def tus_url_to_storage_id(tus_url, storage)

data/lib/shrine/storage/tus.rb

@@ -17,12 +17,19 @@ class Shrine
         return super unless tus_storage
 
         open_from_tus_storage(tus_uid(id), **options)
-      rescue ::Tus::NotFound
+      rescue => error
+        raise error unless tus_not_found?(error)
         raise Shrine::FileNotFound, "file #{id.inspect} not found on storage"
       end
 
       private
 
+      # Avoids a hard dependency on the tus-server gem, which defines the
+      # Tus::NotFound exception raised by tus storages on a missing file.
+      def tus_not_found?(error)
+        defined?(::Tus::NotFound) && error.is_a?(::Tus::NotFound)
+      end
+
       def open_from_tus_storage(uid, rewindable: true, **)
         info     = get_tus_info(uid)
         response = get_tus_file(uid)

data/shrine-tus.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = "shrine-tus"
-  gem.version       = "2.1.0"
+  gem.version       = "3.0.0"
 
   gem.required_ruby_version = ">= 2.1"
 
@@ -13,8 +13,7 @@ Gem::Specification.new do |gem|
   gem.files        = Dir["README.md", "LICENSE.txt", "lib/**/*.rb", "*.gemspec"]
   gem.require_path = "lib"
 
-  gem.add_dependency "shrine", ">= 3.0.0.rc", "< 4"
-  gem.add_dependency "tus-server", "~> 2.0"
+  gem.add_dependency "shrine",     "~> 3.2"
   gem.add_dependency "shrine-url", "~> 2.4"
 
   gem.add_development_dependency "rake"
@@ -22,4 +21,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "webmock"
   gem.add_development_dependency "shrine-gridfs", "~> 1.0"
   gem.add_development_dependency "aws-sdk-s3", "~> 1.14"
+  gem.add_development_dependency "tus-server", "~> 2.0"
 end

metadata

@@ -1,49 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: shrine-tus
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Janko Marohnić
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-28 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shrine
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0.rc
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0.rc
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
-- !ruby/object:Gem::Dependency
-  name: tus-server
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: shrine-url
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +107,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
-description: 
+- !ruby/object:Gem::Dependency
+  name: tus-server
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 email:
 - janko.marohnic@gmail.com
 executables: []
@@ -144,7 +136,6 @@ homepage: https://github.com/shrinerb/shrine-tus
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -159,8 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 4.0.13
 specification_version: 4
 summary: Provides storage and plugin for easier integration between Shrine and tus-ruby-server.
 test_files: []