tus-server 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac1db8e0078cd0824caf54dc3c1993957ca90902
-  data.tar.gz: 032f12c4aaa676e7f55388f8af96d7a46cad42a7
+  metadata.gz: c1e0b6de3b8d7235547c83c2cbbb68070db193ba
+  data.tar.gz: b66d6f3fa1a83fe8edf090b110ba96dd1f73f679
 SHA512:
-  metadata.gz: 45aa99b75d86eb9197fa3edcb8fd4a140004e9e48bb955327e5e77dd7ac3fa3b407a5782f4bcf12fb2a7277704f4ea4cfd6a2972a35d3d69b5e3c778708dcb0f
-  data.tar.gz: b27487dc797127e1c51010e65e1ad44e22206bfcc8ff5dbecc4136eedf4c2197c6ae13b1d32bada612d614844f61e9780349748050559bb47c2ea386306bf31d
+  metadata.gz: 2b91c48408c262844816d2f0a4747c80da01a6cc69743b1a18c5a2c2026cd9ce05ffe9caafda4d8e4d344768e866d741f344a96bf971be958de215416ac5ec05
+  data.tar.gz: 87467de1991030125c12b3b8747b6436d09472c6ab26f540b16feffd4a593d4d94e1fa6b5aeb3cdb2ec1045b261508a8a6815cba236862acb4014d5d8826da80

data/README.md

@@ -37,7 +37,7 @@ endpoint:
 // using tus-js-client
 new tus.Upload(file, {
   endpoint: "http://localhost:9292/files",
-  chunkSize: 15*1024*1024, # 15 MB
+  chunkSize: 15*1024*1024, // 15 MB
   // ...
 })
 ```
@@ -50,7 +50,7 @@ see [shrine-tus-demo] on how you can integrate the two.
 
 As per tus protocol, you can assign custom metadata when creating a file using
 the `Upload-Metadata` header. When retrieving the file via a GET request,
-tus-server will use
+tus-ruby-server will use
 
 * `content_type` -- for setting the `Content-Type` header
 * `filename` -- for setting the `Content-Disposition` header
@@ -72,8 +72,9 @@ The downside of storing files on the filesystem is that it isn't distributed,
 so for resumable uploads to work you have to host the tus application on a
 single server.
 
-However, tus-server also ships with MongoDB [GridFS] storage, which among other
-things is convenient for a multi-server setup. It requires the [Mongo] gem:
+However, tus-ruby-server also ships with MongoDB [GridFS] storage, which among
+other things is convenient for a multi-server setup. It requires the [Mongo]
+gem:
 
 ```rb
 gem "mongo"
@@ -129,8 +130,8 @@ The following checksum algorithms are supported for the `checksum` extension:
 
 ## Limitations
 
-Since tus-server is built using a Rack-based web framework (Roda), if a PATCH
-request gets interrupted, none of the received data will be stored. It's
+Since tus-ruby-server is built using a Rack-based web framework (Roda), if a
+PATCH request gets interrupted, none of the received data will be stored. It's
 recommended to configure your client tus library not to use a single PATCH
 request for large files, but rather to split it into multiple chunks. You can
 do that for [tus-js-client] by specifying a maximum chunk size:
@@ -138,7 +139,7 @@ do that for [tus-js-client] by specifying a maximum chunk size:
 ```js
 new tus.Upload(file, {
   endpoint: "http://localhost:9292/files",
-  chunkSize: 15*1024*1024, # 15 MB
+  chunkSize: 15*1024*1024, // 15 MB
   // ...
 })
 ```
@@ -147,6 +148,10 @@ Tus-server also currently doesn't support the `checksum-trailer` extension,
 which would allow sending the checksum header *after* the data has been sent,
 using [trailing headers].
 
+## Inspiration
+
+The tus-ruby-server was inspired by [rubytus].
+
 ## License
 
 [MIT](/LICENSE.txt)
@@ -158,7 +163,9 @@ using [trailing headers].
 [checksum]: http://tus.io/protocols/resumable-upload.html#checksum
 [expiration]: http://tus.io/protocols/resumable-upload.html#expiration
 [termination]: http://tus.io/protocols/resumable-upload.html#termination
-[GridFS]: https://docs.mongodb.org/v3.0/core/gridfs/ 
+[GridFS]: https://docs.mongodb.org/v3.0/core/gridfs/
+[Mongo]: https://github.com/mongodb/mongo-ruby-driver
 [shrine-tus-demo]: https://github.com/janko-m/shrine-tus-demo
 [Shrine]: https://github.com/janko-m/shrine
 [trailing headers]: https://tools.ietf.org/html/rfc7230#section-4.1.2
+[rubytus]: https://github.com/picocandy/rubytus

data/lib/tus/server.rb

@@ -27,7 +27,6 @@ module Tus
     plugin :all_verbs
     plugin :delete_empty_headers
     plugin :request_headers
-    plugin :default_headers, "Content-Type" => ""
     plugin :not_allowed
 
     route do |r|
@@ -95,8 +94,6 @@ module Tus
       end
 
       r.is ":uid" do |uid|
-        not_found! unless storage.file_exists?(uid)
-
         r.options do
           response.headers.update(
             "Tus-Version"            => SUPPORTED_VERSIONS.join(","),
@@ -108,13 +105,27 @@ module Tus
           no_content!
         end
 
+        r.delete do
+          storage.delete_file(uid)
+
+          no_content!
+        end
+
+        not_found! unless storage.file_exists?(uid)
+
         r.get do
           path = storage.download_file(uid)
           info = Info.new(storage.read_info(uid))
 
-          file = Rack::File.new(File.dirname(path))
+          server = Rack::File.new(File.dirname(path))
 
-          result = file.serving(request, path)
+          result = if ::Rack.release > "2"
+                     server.serving(request, path)
+                   else
+                     server = server.dup
+                     server.path = path
+                     server.serving(env)
+                   end
 
           response.status = result[0]
           response.headers.update(result[1])
@@ -160,12 +171,6 @@ module Tus
 
           no_content!
         end
-
-        r.delete do
-          storage.delete_file(uid)
-
-          no_content!
-        end
       end
     end
 
@@ -273,12 +278,13 @@ module Tus
 
     def no_content!
       response.status = 204
-      response.headers["Content-Length"] = ""
+      request.halt
     end
 
     def created!(location)
       response.status = 201
       response.headers["Location"] = location
+      request.halt
     end
 
     def not_found!(message = "Upload not found")

data/lib/tus/storage/filesystem.rb

@@ -34,8 +34,10 @@ module Tus
       end
 
       def delete_file(uid)
-        file_path(uid).delete
-        info_path(uid).delete
+        if file_exists?(uid)
+          file_path(uid).delete
+          info_path(uid).delete
+        end
       end
 
       def read_info(uid)

data/lib/tus/storage/gridfs.rb

@@ -46,7 +46,7 @@ module Tus
 
       def delete_file(uid)
         file_info = bucket.files_collection.find(filename: uid).first
-        bucket.delete(file_info.fetch("_id"))
+        bucket.delete(file_info.fetch("_id")) if file_info
       end
 
       def read_info(uid)

data/tus-server.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name         = "tus-server"
-  gem.version      = "0.1.0"
+  gem.version      = "0.1.1"
 
   gem.required_ruby_version = ">= 2.1"
 
@@ -14,8 +14,7 @@ Gem::Specification.new do |gem|
   gem.files        = Dir["README.md", "LICENSE.txt", "lib/**/*.rb", "*.gemspec"]
   gem.require_path = "lib"
 
-  gem.add_dependency "roda", "~> 2.17"
-  gem.add_dependency "rack", "~> 2.0"
+  gem.add_dependency "roda", "~> 2.19"
 
   gem.add_development_dependency "rake", "~> 11.1"
   gem.add_development_dependency "minitest", "~> 5.8"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tus-server
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2016-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roda
@@ -16,28 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.17'
+        version: '2.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.17'
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.19'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement