tus-server 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4970687c1cfd81a01844c3626f4ee8e879410772
-  data.tar.gz: 017e147d7dbf79a40fb9ab1ada4a9c87b4490f81
+  metadata.gz: 0e7ec2a89ccbb20c13484b06734c5a8892eef8c1
+  data.tar.gz: 8d00f4e4f025bd5292979d2b33582a13aca157eb
 SHA512:
-  metadata.gz: 7b937ef67a26f46eeaa45e241bf593684ef99420d8ff41007bcf734130b891733f71a096c61a00c02bc805fbcf4aa1932260f4c85f5c4ac09fb097a8f53d4ef7
-  data.tar.gz: 24ee3bc3aab8dc3b4bf427dc5a65477efdf8b2dbb03edefeb8f23ee77ee0adf31c5e3d022b26223a36c0d2f69125177c958cae712a6f18feff7cde5e6a76d51d
+  metadata.gz: 0e4cae19bb8f3a3499f07347b2884e5aaa9bd740842cb0729b6228d93b573ddb3a9aa1ea1bb9ababa587614ed59ce481d61759b8d9ad3ac5e0894f984c57e694
+  data.tar.gz: 46c5ede8052c0e7873ce47809e11caef2bc248d18364426e6b7f9ce77478df3fdfee860c1d2a79e4a7189089f1b49f9b0df938c2447255140e5367c71b3dfa5d

data/README.md

@@ -4,7 +4,7 @@ A Ruby server for the [tus resumable upload protocol]. It implements the core
 1.0 protocol, along with the following extensions:
 
 * [`creation`][creation] (and `creation-defer-length`)
-* [`concatenation`][concatenation] (and `concatenation-unfinished`)
+* [`concatenation`][concatenation]
 * [`checksum`][checksum]
 * [`expiration`][expiration]
 * [`termination`][termination]
@@ -96,6 +96,12 @@ client = Mongo::Client.new("mongodb://127.0.0.1:27017/mydb")
 Tus::Server.opts[:storage] = Tus::Storage::Gridfs.new(client: client)
 ```
 
+You can change the database prefix (defaults to `fs`):
+
+```rb
+Tus::Storage::Gridfs.new(client: client, prefix: "fs_temp")
+```
+
 By default MongoDB Gridfs stores files in chunks of 256KB, but you can change
 that with the `:chunk_size` option:
 
@@ -290,6 +296,31 @@ the tus server), until it has been moved to a permanent storage. You might also
 want to consider copying finished uploads to permanent storage directly from
 the underlying tus storage, instead of downloading them through the app.
 
+## Tests
+
+Run tests with
+
+```
+$ rake test
+```
+
+The S3 tests are excluded by default, but you can include them by setting the
+`$S3` environment variable.
+
+```
+$ S3=1 rake test
+```
+
+For running S3 tests you need to create an `.env` with the S3 credentials:
+
+```sh
+# .env
+S3_BUCKET="..."
+S3_REGION="..."
+S3_ACCESS_KEY_ID="..."
+S3_SECRET_ACCESS_KEY="..."
+```
+
 ## Inspiration
 
 The tus-ruby-server was inspired by [rubytus].

data/lib/tus/checksum.rb

@@ -47,14 +47,14 @@ module Tus
     end
 
     def generate_crc32(io)
-      crc = nil
-      crc = Zlib.crc32(io.read(16*1024, buffer ||= "").to_s, crc) until io.eof?
+      crc = 0
+      crc = Zlib.crc32(io.read(16*1024, buffer ||= ""), crc) until io.eof?
       Base64.encode64(crc.to_s)
     end
 
     def digest(name, io)
       digest = Digest.const_get(name).new
-      digest.update(io.read(16*1024, buffer ||= "").to_s) until io.eof?
+      digest.update(io.read(16*1024, buffer ||= "")) until io.eof?
       digest.base64digest
     end
   end

data/lib/tus/server.rb

@@ -16,7 +16,7 @@ module Tus
       "creation", "creation-defer-length",
       "termination",
       "expiration",
-      "concatenation", "concatenation-unfinished",
+      "concatenation",
       "checksum",
     ]
     SUPPORTED_CHECKSUM_ALGORITHMS = %w[sha1 sha256 sha384 sha512 md5 crc32]

data/lib/tus/storage/filesystem.rb

@@ -81,7 +81,7 @@ module Tus
           remaining_length = length
 
           while remaining_length > 0
-            chunk = file.read([16*1024, remaining_length].min, buffer ||= "") or break
+            chunk = file.read([16*1024, remaining_length].min) or break
             remaining_length -= chunk.bytesize
             yielder << chunk
           end

data/lib/tus/storage/gridfs.rb

@@ -11,11 +11,12 @@ module Tus
       attr_reader :client, :prefix, :bucket, :chunk_size
 
       def initialize(client:, prefix: "fs", chunk_size: 256*1024)
-        @client = client
-        @prefix = prefix
-        @bucket = @client.database.fs(bucket_name: @prefix)
-        @bucket.send(:ensure_indexes!)
+        @client     = client
+        @prefix     = prefix
         @chunk_size = chunk_size
+        @bucket     = client.database.fs(bucket_name: prefix)
+
+        @bucket.send(:ensure_indexes!)
       end
 
       def create_file(uid, info = {})
@@ -131,8 +132,6 @@ module Tus
             else
               yielder << data
             end
-
-            data.clear # deallocate chunk string
           end
         end
 

data/lib/tus/storage/s3.rb

@@ -67,15 +67,15 @@ module Tus
         raise error
       end
 
-      def patch_file(uid, io, info = {})
+      def patch_file(uid, input, info = {})
         upload_id   = info["multipart_id"]
         part_number = info["multipart_parts"].count + 1
 
         multipart_upload = object(uid).multipart_upload(upload_id)
         multipart_part   = multipart_upload.part(part_number)
-        md5              = Tus::Checksum.new("md5").generate(io)
+        md5              = Tus::Checksum.new("md5").generate(input)
 
-        response = multipart_part.upload(body: io, content_md5: md5)
+        response = multipart_part.upload(body: input, content_md5: md5)
 
         info["multipart_parts"] << {
           "part_number" => part_number,
@@ -113,12 +113,7 @@ module Tus
         object = object(uid)
         range  = "bytes=#{range.begin}-#{range.end}" if range
 
-        raw_chunks = Enumerator.new do |yielder|
-          object.get(range: range) do |chunk|
-            yielder << chunk
-            chunk.clear # deallocate string
-          end
-        end
+        raw_chunks = object.enum_for(:get, range: range)
 
         # Start the request to be notified if the object doesn't exist, and to
         # get Aws::S3::Object#content_length.

data/tus-server.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name         = "tus-server"
-  gem.version      = "0.10.0"
+  gem.version      = "0.10.1"
 
   gem.required_ruby_version = ">= 2.1"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tus-server
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-27 00:00:00.000000000 Z
+date: 2017-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roda