shrine-tus 1.2.1 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b464e4d6d99f84092e1343586bc0102882ada25831fdb9eb8085fe820f823e19
-  data.tar.gz: b1972b8c02e3c9c38a24f0cc4b214fae775d08a20607d2f39c002c7da79c0baf
+  metadata.gz: c8aef0acf353a78d6957ff427b68ad717a1af9ad64f2592fe85c4566ca980b84
+  data.tar.gz: 0b300ece5f083fbc078034309aa53cdc652aeaad68eaa495479d3c2ee046518d
 SHA512:
-  metadata.gz: 72106677f12aab0d05cbc85918af78fa31467ac08c3dbf2f3ed3528de39282f22be601d9e885a11ad131e388e3d1435ca4fb8e150edee128bde46770b2709253
-  data.tar.gz: 73a95ada3fee3d760702beed96b91fde1f7fc18f0be38b6f44af64365ce339a4d194e87b323df1d839828a8ff0ba9e689516ae134f55cd9171d8d3c6a45154d6
+  metadata.gz: aa9848d522da77ebd06ae9eeea0822bb2806da90ab632ab34baaea6e2a386076428a32bbe44e11422b9c9f55a2e41ea9c9a2aaccf922c4d570e73387e5b626d2
+  data.tar.gz: 4f1128b8f3007ea339f9148e3b618f179d79a42dacb40d47657db117794193dce63113d095329efb6fca0260b8878b5e1ee96df1c83c340c3d6cb7df71a4eb37

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
@@ -37,6 +37,11 @@ Movie.create(video: file_data)
 
 See [shrine-tus-demo] for an example application that uses shrine-tus.
 
+Note that by default **Shrine won't extract metadata from directly upload
+files**, instead it will just copy metadata that was extracted on the client
+side. See [this section][metadata direct uploads] for the rationale and
+instructions on how to opt in.
+
 ### Approach A: Downloading through tus server
 
 Conceptionally the simplest setup is to have Shrine download the uploaded file
@@ -184,8 +189,9 @@ $ bundle exec rake test
 [MIT](/LICENSE.txt)
 
 [Shrine]: https://github.com/shrinerb/shrine
-[tus-ruby-server]: https://github.com/janko-m/tus-ruby-server
-[Down]: https://github.com/janko-m/down
+[tus-ruby-server]: https://github.com/janko/tus-ruby-server
+[Down]: https://github.com/janko/down
 [HTTP.rb]: https://github.com/httprb/http
 [shrine-tus-demo]: https://github.com/shrinerb/shrine-tus-demo
 [tusd]: https://github.com/tus/tusd
+[metadata direct uploads]: https://github.com/shrinerb/shrine/blob/master/doc/metadata.md#direct-uploads

data/lib/shrine/plugins/tus.rb

@@ -5,17 +5,19 @@ class Shrine
   module Plugins
     module Tus
       module AttacherMethods
-        def assign(value)
-          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, **options)
+          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, **options)
+        end
 
         def tus_url_to_storage_id(tus_url, storage)
           tus_uid = tus_url.split("/").last

data/lib/shrine/storage/tus.rb

@@ -10,49 +10,28 @@ class Shrine
       def initialize(tus_storage: nil, **options)
         @tus_storage = tus_storage
 
-        super(**options)
-      end
-
-      def download(id, **options)
-        if tus_storage
-          download_from_tus_storage(tus_uid(id))
-        else
-          super
-        end
+        super(delete: true, **options)
       end
 
       def open(id, **options)
-        if tus_storage
-          open_from_tus_storage(tus_uid(id))
-        else
-          super
-        end
+        return super unless tus_storage
+
+        open_from_tus_storage(tus_uid(id), **options)
+      rescue ::Tus::NotFound
+        raise Shrine::FileNotFound, "file #{id.inspect} not found on storage"
       end
 
       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)
-        response = get_tus_file(uid)
+      def open_from_tus_storage(uid, rewindable: true, **)
         info     = get_tus_info(uid)
+        response = get_tus_file(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.1"
+  gem.version       = "2.1.1"
 
   gem.required_ruby_version = ">= 2.1"
 
@@ -13,13 +13,13 @@ 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.2"
   gem.add_dependency "tus-server", "~> 2.0"
-  gem.add_dependency "shrine-url", "~> 2.1"
+  gem.add_dependency "shrine-url", "~> 2.4"
 
   gem.add_development_dependency "rake"
   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 "shrine-gridfs", "~> 1.0"
+  gem.add_development_dependency "aws-sdk-s3", "~> 1.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shrine-tus
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 2.1.1
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-15 00:00:00.000000000 Z
+date: 2020-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shrine
@@ -16,14 +16,14 @@ dependencies:
     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: tus-server
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -98,30 +98,30 @@ dependencies:
   name: shrine-gridfs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
     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
@@ -153,8 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.1
 signing_key: 
 specification_version: 4
 summary: Provides storage and plugin for easier integration between Shrine and tus-ruby-server.