shrine-tus 1.2.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da9e552ed9264c1c408f43310627ea1a8889a22f515e897f1341aae1609c77ee
-  data.tar.gz: c469c7ad799bf47cef51a388ea3db1a542e6d58d2eecaecce6dce5b06f816739
+  metadata.gz: d3b9a750cdf52cbc0f84641e08b508500fa7443f33505b2736ead57685654c24
+  data.tar.gz: 7c49ff4133fd86f38034b260579a98934d4037b53205227d92ec8bb45b57666b
 SHA512:
-  metadata.gz: 3b69f870e7136722958f6dbe00f77c8c3ca7306cf45ce1e85f13a100a6b0465559f403bd3e25a0ddd3a0f9a3bdbe46cc29c2e55dfd0b22c2b7b295b9e1f8c325
-  data.tar.gz: 496281aca3f21f8a0d7d3d03d66ee78b70ee25b5ce72e58ed04a88a5cf9b7179daee2c2ff4d93924fc147d6d72f563890ba006d4c0d8f6c93087b3389c0bb4c2
+  metadata.gz: 007c7034718f1ce19fafb0c34ee831b7e6d5ea9b301c09e2a8462b4c80eff3c77d76d38c1ae497525977a67b447243fb31da0dd31a81bade0efbd5f80dfb86f1
+  data.tar.gz: 04f5ef1a90889437a86c2bedba87ab124a9bbb3ca05a7d291b60cef05b0c6fd4b7bafce03ee0f98a29ba91f5aeed42bfe5616817e84d54c07c2892c572820c08

data/README.md

@@ -5,7 +5,7 @@ Provides tools for integrating [Shrine] with [tus-ruby-server].
 ## Installation
 
 ```rb
-gem "shrine-tus", "~> 1.2"
+gem "shrine-tus", "~> 2.0"
 ```
 
 ## Usage

data/lib/shrine/plugins/tus.rb

@@ -5,17 +5,19 @@ class Shrine
   module Plugins
     module Tus
       module AttacherMethods
-        def assign(value, **options)
-          if value.is_a?(String) && value != ""
-            data = JSON.parse(value)
-            data["id"] = tus_url_to_storage_id(data["id"], cache.storage) if URI.regexp =~ data["id"]
-            super(data.to_json)
-          else
-            super
+        private
+
+        def cached(data)
+          data = data.dup
+          data = JSON.parse(data) if data.is_a?(String)
+
+          if URI.regexp =~ (data["id"] || data[:id])
+            id         = data.delete("id") || data.delete(:id)
+            data["id"] = tus_url_to_storage_id(id, cache.storage)
           end
-        end
 
-        private
+          super(data)
+        end
 
         def tus_url_to_storage_id(tus_url, storage)
           tus_uid = tus_url.split("/").last

data/lib/shrine/storage/tus.rb

@@ -13,17 +13,9 @@ class Shrine
         super(delete: true, **options)
       end
 
-      def download(id, **options)
-        if tus_storage
-          download_from_tus_storage(tus_uid(id))
-        else
-          super
-        end
-      end
-
       def open(id, **options)
         if tus_storage
-          open_from_tus_storage(tus_uid(id))
+          open_from_tus_storage(tus_uid(id), **options)
         else
           super
         end
@@ -31,28 +23,15 @@ class Shrine
 
       private
 
-      def download_from_tus_storage(uid)
-        tempfile = Tempfile.new("shrine-tus", binmode: true)
-
-        response = get_tus_file(uid)
-        response.each do |chunk|
-          tempfile << chunk
-          chunk.clear # deallocate string
-        end
-        response.close
-
-        tempfile.open
-        tempfile
-      end
-
-      def open_from_tus_storage(uid)
+      def open_from_tus_storage(uid, rewindable: true, **)
         response = get_tus_file(uid)
         info     = get_tus_info(uid)
 
         Down::ChunkedIO.new(
-          size:     Integer(info["Upload-Length"]),
-          chunks:   response.each,
-          on_close: response.method(:close),
+          size:       Integer(info["Upload-Length"]),
+          chunks:     response.each,
+          on_close:   response.method(:close),
+          rewindable: rewindable
         )
       end
 

data/shrine-tus.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = "shrine-tus"
-  gem.version       = "1.2.3"
+  gem.version       = "2.0.0"
 
   gem.required_ruby_version = ">= 2.1"
 
@@ -13,7 +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", "~> 2.0"
+  gem.add_dependency "shrine", ">= 3.0.0.beta3", "< 4"
   gem.add_dependency "tus-server", "~> 2.0"
   gem.add_dependency "shrine-url", ">= 2.2.1", "< 3"
 
@@ -21,5 +21,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "minitest"
   gem.add_development_dependency "webmock"
   gem.add_development_dependency "shrine-gridfs"
-  gem.add_development_dependency "aws-sdk-s3", "~> 1.2"
+  gem.add_development_dependency "aws-sdk-s3", "~> 1.14"
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: shrine-tus
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-12 00:00:00.000000000 Z
+date: 2019-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shrine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 3.0.0.beta3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 3.0.0.beta3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: tus-server
   requirement: !ruby/object:Gem::Requirement
@@ -120,14 +126,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.14'
 description: 
 email:
 - janko.marohnic@gmail.com