tus-server 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69d128e57072bd02cb340fa74fadce8b325a8163bfae16d96acfa17770ae2bd1
-  data.tar.gz: 46fd5fba0d0fde85385564ad46aa1ad71ed16dcb84022d7947a7970ac1bf40e0
+  metadata.gz: c0caef3d7cfbadc9b74678f99e687c0fe51bfbbab77acece73e9e1332aaa8661
+  data.tar.gz: 8be7b8e4ef8c2c6a5bc58ca11417c88b743b54252da7a3481f3866a591ef5abf
 SHA512:
-  metadata.gz: 02df94c40fe475de5c3b9e23e0089a827aed7f8970a6c248abe8e64106b5d4babb5f957bfadfe7571e16eaf41ba50f0d5c3d9cfcdf63e8567cf0e9e79318ffec
-  data.tar.gz: 47d2d27bbb014e489d6393af0d5e03c2583f78cb4d913c0d19a664150754f7de4d77bf21313c24072538b11735ad10a98c45ec8daa6f84324a0dad331aa0dfc8
+  metadata.gz: 65e6d0496407297529e55063bbb27036d08697a986291dd08299e8994bbbeb6329d15dac4fa6a1137364e126379ae2fcd8c23df5500e0cb8c5e60074265070ae
+  data.tar.gz: b3328632108adeaf10761b3df9ab6ad9e957fe48a4b4ab92cccfaa36221f0c99be142af08ced374cbf1ab460e0b6622f0d964be55636683438b9c473e3533263

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-## 2.1.1 (2018-15-26)
+## 2.1.2 (2018-10-21)
+
+* Make tus-ruby-server fully work with non-rewindable Rack input (@janko-m)
+
+## 2.1.1 (2018-05-26)
 
 * Rename `:download_url` option to `:redirect_download` (@janko-m)
 

data/README.md

@@ -258,6 +258,55 @@ can for example change the `:endpoint` to use S3's accelerate host:
 Tus::Storage::S3.new(endpoint: "https://s3-accelerate.amazonaws.com", **options)
 ```
 
+### Google Cloud Storage, Microsoft Azure Blob Storage
+
+While tus-ruby-server doesn't currently ship with integrations for Google Cloud
+Storage or Microsoft Azure Blob Storage, you can still use these services via
+**[Minio]**.
+
+Minio is an open source distributed object storage server that implements the
+Amazon S3 API and provides gateways for [GCP][minio gcp] and [Azure][minio
+azure]. This means it's possible to use the existing S3 tus-ruby-server
+integration to point to the Minio server, which will then in turn forward those
+calls to GCP or Azure.
+
+Let's begin by installing Minio via Homebrew:
+
+```sh
+$ brew install minio/stable/minio
+```
+
+And starting the Minio server as a gateway to GCP or Azure:
+
+```sh
+# Google Cloud Storage
+$ export GOOGLE_APPLICATION_CREDENTIALS=/path/credentials.json
+$ export MINIO_ACCESS_KEY=minioaccesskey
+$ export MINIO_SECRET_KEY=miniosecretkey
+$ minio gateway gcs yourprojectid
+```
+```sh
+# Microsoft Azure Blob Storage
+$ export MINIO_ACCESS_KEY=azureaccountname
+$ export MINIO_SECRET_KEY=azureaccountkey
+$ minio gateway azure
+```
+
+Now follow the displayed link to open the Minio web UI and create a bucket in
+which you want your files to be stored. Once you've done that, you can
+initialize `Tus::Storage::S3` to point to your Minio server and bucket:
+
+```rb
+Tus::Storage::S3.new(
+  access_key_id:     "<MINIO_ACCESS_KEY>", # "AccessKey" value
+  secret_access_key: "<MINIO_SECRET_KEY>", # "SecretKey" value
+  endpoint:          "<MINIO_ENDPOINT>",   # "Endpoint"  value
+  bucket:            "<MINIO_BUCKET>",     # name of the bucket you created
+  region:            "us-east-1",
+  force_path_style:  true,
+)
+```
+
 ### MongoDB GridFS
 
 MongoDB has a specification for storing and retrieving large files, called
@@ -391,7 +440,7 @@ Set `MONGO=1` environment variable if you want to also run MongoDB tests.
 
 ## Inspiration
 
-The tus-ruby-server was inspired by [rubytus].
+The tus-ruby-server was inspired by [rubytus] and [tusd].
 
 ## License
 
@@ -420,3 +469,7 @@ The tus-ruby-server was inspired by [rubytus].
 [Rack::Sendfile]: https://www.rubydoc.info/github/rack/rack/master/Rack/Sendfile
 [`Aws::S3::Object#get`]: https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/Object.html#get-instance_method
 [shrine resumable walkthrough]: https://github.com/shrinerb/shrine/wiki/Adding-Resumable-Uploads
+[Minio]: https://minio.io
+[minio gcp]: https://minio.io/gcp.html
+[minio azure]: https://minio.io/azure.html
+[tusd]: https://github.com/tus/tusd

data/lib/tus/input.rb

@@ -35,6 +35,12 @@ module Tus
       @pos = 0
     end
 
+    def rewindable?
+      @input.is_a?(Tempfile) ||               # Puma, Thin
+      @input.is_a?(StringIO) ||               # WEBRick, Puma, Thin
+      @input.class.name.end_with?("TeeInput") # Unicorn, Passenger
+    end
+
     def close
       # Rack input shouldn't be closed, we just support the interface
     end

data/lib/tus/server.rb

@@ -10,6 +10,8 @@ require "tus/errors"
 require "securerandom"
 require "time"
 
+require "rack/rewindable_input"
+
 module Tus
   class Server < Roda
     SUPPORTED_VERSIONS = ["1.0.0"]
@@ -135,9 +137,13 @@ module Tus
           validate_content_type!
           validate_upload_offset!(info)
           validate_content_length!(request.content_length.to_i, info) if request.content_length
-          validate_upload_checksum!(input) if request.headers["Upload-Checksum"]
 
           begin
+            if request.headers["Upload-Checksum"]
+              input = Rack::RewindableInput.new(input) unless input.rewindable?
+              validate_upload_checksum!(input)
+            end
+
             bytes_uploaded = storage.patch_file(uid, input, info.to_h)
           rescue Tus::MaxSizeExceeded
             validate_content_length!(input.pos, info)

data/tus-server.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name         = "tus-server"
-  gem.version      = "2.1.1"
+  gem.version      = "2.1.2"
 
   gem.required_ruby_version = ">= 2.2"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tus-server
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-26 00:00:00.000000000 Z
+date: 2018-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roda