uppy-s3_multipart 0.3.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc97a26ba80d456081aa3972306acf87ab3b16a2689da06abf0351ea328c4ca6
-  data.tar.gz: 20f0a190ff1a875858cd69dd06d3505292c918b3af2056838d28cad554828c72
+  metadata.gz: 92f5e8ea76379a4e2a6e05a4bbe95b1e0f4b30aefb76a00073e1e059666e5aac
+  data.tar.gz: c3a1f4b4147311314c0c467ce56ffb0dfbd43dcd3eabbd907670783d645d8cc7
 SHA512:
-  metadata.gz: eed1595f31dc9ac39e9ecf4f52f38608c3c1c9ed04902618d05782d63092f1af6933a700ecf24b1fca8217af327367ff93b4510ef16167684662f354d0ab3821
-  data.tar.gz: dbfe414174143758540e1077b65d611e5bd846132c0d4b609959d93d3d7fe73693bd2e5dfa995ddc0f3c84170018b8fb44ed1b4594c26696ae6438aa77b4c7e3
+  metadata.gz: da31cb0732d04bd750905329c67f91ffccea0d6fb988f9d488812f2dcc06266c3ea31578322cfa646b0dbe01f56dca69a97084fe175e7749dba56f1b42d5e25b
+  data.tar.gz: 8a85c20e8195c1d58de393b9e8d7a0957640fd56d02b860dd71e13205581f4221884c66ed2ae39b40235b246df5b8c9781dec3c307907be8709709408155e295

data/README.md

@@ -1,4 +1,4 @@
-# Uppy::S3Multipart
+# uppy-s3_multipart
 
 Provides a Rack application that implements endpoints for the [aws-s3-multipart]
 Uppy plugin. This enables multipart uploads directly to S3, which is
@@ -10,7 +10,7 @@ uploads.
 Add the gem to your Gemfile:
 
 ```rb
-gem "uppy-s3_multipart", "~> 0.3"
+gem "uppy-s3_multipart", "~> 1.0"
 ```
 
 ## Setup
@@ -20,27 +20,39 @@ the bucket's CORS configuration. In the AWS S3 Console go to your bucket, click
 on "Permissions" tab and then on "CORS configuration". There paste in the
 following:
 
-```xml
-<?xml version="1.0" encoding="UTF-8"?>
-<CORSConfiguration xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
-  <CORSRule>
-    <AllowedOrigin>https://my-app.com</AllowedOrigin>
-    <AllowedMethod>GET</AllowedMethod>
-    <AllowedMethod>POST</AllowedMethod>
-    <AllowedMethod>PUT</AllowedMethod>
-    <MaxAgeSeconds>3000</MaxAgeSeconds>
-    <AllowedHeader>Authorization</AllowedHeader>
-    <AllowedHeader>x-amz-date</AllowedHeader>
-    <AllowedHeader>x-amz-content-sha256</AllowedHeader>
-    <AllowedHeader>content-type</AllowedHeader>
-    <ExposeHeader>ETag</ExposeHeader>
-  </CORSRule>
-  <CORSRule>
-    <AllowedOrigin>*</AllowedOrigin>
-    <AllowedMethod>GET</AllowedMethod>
-    <MaxAgeSeconds>3000</MaxAgeSeconds>
-  </CORSRule>
-</CORSConfiguration>
+```json
+[
+    {
+        "AllowedHeaders": [
+            "content-type",
+            "x-amz-content-sha256",
+            "x-amz-date"
+        ],
+        "AllowedMethods": [
+            "GET",
+            "POST",
+            "PUT"
+        ],
+        "AllowedOrigins": [
+            "https://my-app.com"
+        ],
+        "ExposeHeaders": [
+            "ETag"
+        ],
+        "MaxAgeSeconds": 3000
+    },
+    {
+        "AllowedHeaders": [],
+        "AllowedMethods": [
+            "GET"
+        ],
+        "AllowedOrigins": [
+            "*"
+        ],
+        "ExposeHeaders": [],
+        "MaxAgeSeconds": 3000
+    }
+]
 ```
 
 Replace `https://my-app.com` with the URL to your app (in development you can

data/lib/uppy/s3_multipart/app.rb

@@ -54,6 +54,16 @@ module Uppy
             { uploadId: result.fetch(:upload_id), key: result.fetch(:key) }
           end
 
+          # OPTIONS /s3/multipart
+          r.options ["", true] do
+            r.halt 204
+          end
+
+          # OPTIONS /s3/multipart/:uploadId/:partNumber
+          r.options String, String do |upload_id, part_number|
+            r.halt 204
+          end
+
           # GET /s3/multipart/:uploadId
           r.get String do |upload_id|
             key = param!("key")
@@ -65,6 +75,19 @@ module Uppy
             end
           end
 
+          # GET /s3/multipart/:uploadId/batch
+          r.get String, "batch" do |upload_id|
+            key = param!("key")
+            part_numbers = param!("partNumbers").split(",")
+
+            batch = part_numbers.map do |part_number|
+              result = client_call(:prepare_upload_part, upload_id: upload_id, key: key, part_number: part_number)
+              [part_number, result.fetch(:url)]
+            end.to_h
+
+            { presignedUrls: batch }
+          end
+
           # GET /s3/multipart/:uploadId/:partNumber
           r.get String, String do |upload_id, part_number|
             key = param!("key")
@@ -98,7 +121,14 @@ module Uppy
           r.delete String do |upload_id|
             key = param!("key")
 
-            client_call(:abort_multipart_upload, upload_id: upload_id, key: key)
+            begin
+              client_call(:abort_multipart_upload, upload_id: upload_id, key: key)
+            rescue Aws::S3::Errors::NoSuchUpload
+              error!(
+                "Upload doesn't exist for \"key\" parameter",
+                status: 404
+              )
+            end
 
             {}
           end
@@ -123,8 +153,8 @@ module Uppy
           value
         end
 
-        def error!(message)
-          request.halt 400, { error: message }
+        def error!(message, status: 400)
+          request.halt status, { error: message }
         end
       end
     end

data/uppy-s3_multipart.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |gem|
   gem.name         = "uppy-s3_multipart"
-  gem.version      = "0.3.3"
+  gem.version      = "1.2.0"
 
-  gem.required_ruby_version = ">= 2.2"
+  gem.required_ruby_version = ">= 2.3"
 
   gem.summary      = "Provides a Rack application that implements endpoints for the AwsS3Multipart Uppy plugin."
   gem.homepage     = "https://github.com/janko/uppy-s3_multipart"
@@ -23,4 +23,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "shrine", "~> 2.13"
   gem.add_development_dependency "shrine-memory"
   gem.add_development_dependency "aws-sdk-core", "~> 3.23"
+  gem.add_development_dependency "rexml"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uppy-s3_multipart
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Janko Marohnić
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-28 00:00:00.000000000 Z
+date: 2021-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roda
@@ -142,7 +142,21 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.23'
-description: 
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description:
 email:
 - janko.marohnic@gmail.com
 executables: []
@@ -161,7 +175,7 @@ homepage: https://github.com/janko/uppy-s3_multipart
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -169,15 +183,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.1
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Provides a Rack application that implements endpoints for the AwsS3Multipart
   Uppy plugin.