From 1220acf929ffbd16c3795e6ebacb2eee59f9f3c3 Mon Sep 17 00:00:00 2001 From: Mohammed Mutawa Date: Sun, 7 Jun 2020 16:05:17 +0300 Subject: [PATCH 1/2] Fix typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 11a6efb..9443c56 100644 --- a/README.md +++ b/README.md @@ -210,7 +210,7 @@ a `:prefix` in the storage configuration. Tus::Storage::S3.new(prefix: "tus", **options) ``` -You can also specify additional options that will be fowarded to +You can also specify additional options that will be forwarded to [`Aws::S3::Client#create_multipart_upload`] using `:upload_options`. ```rb From d42106a5fc8b7b2804ea81d7ee16e357f788226f Mon Sep 17 00:00:00 2001 From: Mohammed Mutawa Date: Sun, 7 Jun 2020 16:06:30 +0300 Subject: [PATCH 2/2] Make S3 content disposition option dynamic --- README.md | 2 +- lib/tus/storage/s3.rb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9443c56..c02f576 100644 --- a/README.md +++ b/README.md @@ -214,7 +214,7 @@ You can also specify additional options that will be forwarded to [`Aws::S3::Client#create_multipart_upload`] using `:upload_options`. ```rb -Tus::Storage::S3.new(upload_options: { acl: "public-read" }, **options) +Tus::Storage::S3.new(upload_options: { acl: "public-read", disposition: "attachment" }, **options) ``` All other options will be forwarded to [`Aws::S3::Client#initialize`]: diff --git a/lib/tus/storage/s3.rb b/lib/tus/storage/s3.rb index ae07825..e8082f8 100644 --- a/lib/tus/storage/s3.rb +++ b/lib/tus/storage/s3.rb @@ -50,7 +50,8 @@ def create_file(uid, info = {}) options = {} options[:content_type] = tus_info.type if tus_info.type - options[:content_disposition] = ContentDisposition.inline(tus_info.name) if tus_info.name + options[:content_disposition] = ContentDisposition.(disposition: upload_options[:disposition] || "inline", filename: tus_info.name) + upload_options.delete(:disposition) options.merge!(upload_options) multipart_upload = object(uid).initiate_multipart_upload(options)