tus-server 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9ba14174a689878aa1224bdb2e526d869b888dc85164ec3e9320c8a171bcd73
-  data.tar.gz: 61e227c29273bd00007a96522a16b5f470fc433741999b072bf1c3642e13289b
+  metadata.gz: 316f557990315ae072a266cb92bd5acdf4a5e930f734fc7886cb8c2cc2ec2eb3
+  data.tar.gz: a98df5216aa495f2f18bad0f61b2ed7797f714139991f700fdb403b94abd0271
 SHA512:
-  metadata.gz: a4914ab70cda026beee4de2b830778e43ef32131ddb65f470086d5cfd036f9dd046fafb09deced577d64965d539bf08a24ec44b810a77052822efde595610b04
-  data.tar.gz: 3c3f0d9196654541f5ebee297130c3d216dc1948a8a5c29695dc3251d969af85a101b0e249a889ec140e8f837c1fba1269a977649926d537c02dd5cd249d4e14
+  metadata.gz: '02662191fa1b2e8df42bbba1a5f32d1b70ae3623cc89736ad4bbaa4c46cbc97364c0c4edd3c5fdfc348611bbca76132e7c71d6c785e953aa6f556f986755680b'
+  data.tar.gz: 6ac96ebc6710e231dabaa66faf8fced5fbf80faceb12f4992f3afa2235d4908f40649f00e794e0923a2311f0ee91ed2f4df0e7adf8c19321f1554f451010d2f8

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.2.1 (2018-12-19)
+
+* Use `content_disposition` gem to generate `Content-Disposition` in download endpoint (@janko-m)
+
 ## 2.2.0 (2018-12-02)
 
 * Add `before_create`, `after_create`, `after_finish`, and `after_terminate` hooks (@janko-m)

data/README.md

@@ -227,7 +227,7 @@ to `:redirect_download`, which will then be evaluated in the context of the
 
 ```rb
 Tus::Server.opts[:redirect_download] = -> (uid, info, **options) do
-  storage.file_url(uid, info, response_expires: 10, **options) # link expires after 10 seconds
+  storage.file_url(uid, info, expires_in: 10, **options) # link expires after 10 seconds
 end
 ```
 
@@ -242,7 +242,7 @@ You can also specify additional options that will be fowarded to
 [`Aws::S3::Client#create_multipart_upload`] using `:upload_options`.
 
 ```rb
-Tus::Storage::S3.new(upload_options: {content_disposition: "attachment"}, **options)
+Tus::Storage::S3.new(upload_options: { content_disposition: "attachment" }, **options)
 ```
 
 All other options will be forwarded to [`Aws::S3::Client#initialize`], so you

data/lib/tus/server.rb

@@ -1,6 +1,7 @@
 # frozen-string-literal: true
 
 require "roda"
+require "rack/rewindable_input"
 
 require "tus/storage/filesystem"
 require "tus/info"
@@ -8,11 +9,11 @@ require "tus/input"
 require "tus/checksum"
 require "tus/errors"
 
+require "content_disposition"
+
 require "securerandom"
 require "time"
 
-require "rack/rewindable_input"
-
 module Tus
   class Server < Roda
     SUPPORTED_VERSIONS = ["1.0.0"]
@@ -188,9 +189,8 @@ module Tus
           name     = metadata["name"] || metadata["filename"]
           type     = metadata["type"] || metadata["content_type"]
 
-          content_disposition  = opts[:disposition]
-          content_disposition += "; filename=\"#{name}\"" if name
-          content_type = type || "application/octet-stream"
+          content_disposition = ContentDisposition.(disposition: opts[:disposition], filename: name)
+          content_type        = type || "application/octet-stream"
 
           if redirect_download
             redirect_url = instance_exec(uid, info.to_h,

data/tus-server.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name         = "tus-server"
-  gem.version      = "2.2.0"
+  gem.version      = "2.2.1"
 
   gem.required_ruby_version = ">= 2.3"
 
@@ -15,11 +15,12 @@ Gem::Specification.new do |gem|
   gem.require_path = "lib"
 
   gem.add_dependency "roda", ">= 2.27", "< 4"
+  gem.add_dependency "content_disposition", "~> 1.0"
 
   gem.add_development_dependency "rake", "~> 11.1"
   gem.add_development_dependency "minitest", "~> 5.8"
   gem.add_development_dependency "rack-test_app"
-  gem.add_development_dependency "cucumber"
+  gem.add_development_dependency "cucumber", "~> 3.1"
   gem.add_development_dependency "mongo"
   gem.add_development_dependency "aws-sdk-s3", "~> 1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tus-server
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-02 00:00:00.000000000 Z
+date: 2018-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roda
@@ -30,6 +30,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
+- !ruby/object:Gem::Dependency
+  name: content_disposition
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -76,16 +90,16 @@ dependencies:
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: mongo
   requirement: !ruby/object:Gem::Requirement