uppy-s3_multipart 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 850751fff94e85ddaa7e9c6f458be83bad00b2730de0e11809c86d9667f7db9d
-  data.tar.gz: c5fa81daeb9652cb387db98dbcf1d2318a3982e5827f6eff7f6edb31c9c91ccc
+  metadata.gz: 74cc9df490db7f6381820d8cdede6aad9bf4ae883c124849ea69e7d596c1f3a8
+  data.tar.gz: 163f5cdf1ba930393f9029059abe3a7ad3534d68b9ee8aee3b7d2a5ccd9a482b
 SHA512:
-  metadata.gz: fde164448cac2a97a8f2788956eaacc5a8f5ce0730730ff3514157cd60e733ee924049a2d7e88cc759c6858d67dd28a205e64c4eb6ba8fc6f756998c3e8b0878
-  data.tar.gz: 1714c8d5b5ef25159b26138f488dbd64c58f6147574a1f1f389b2e2859f89df2565818fa7d072fd0581e082d1498358ed26cf1928f5b1fee598f461603093f44
+  metadata.gz: b59f29f7a88d8ce31f2d6ab4e0fdfe081cc5b0de982d600e4957e250afcf48f5d12585dc7974fb9c73b49282fc70474e306ad92b762ff367151fc98c5dda0598
+  data.tar.gz: e226b2b0c3f6fad19cc8b0705089563b0e9e119dbe89efee2fda7272b51b440c5e4cd8662bc6311b7a7411b59470335b2586438626e7cbaf6671ab94617b5827

data/README.md

@@ -22,36 +22,20 @@ following:
 
 ```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
-    }
+  {
+    "AllowedHeaders": ["content-type", "x-amz-content-sha256", "x-amz-date"],
+    "AllowedMethods": ["GET", "POST", "PUT"],
+    "AllowedOrigins": ["https://my-app.com"],
+    "ExposeHeaders": ["ETag", "Location"],
+    "MaxAgeSeconds": 3000
+  },
+  {
+    "AllowedHeaders": [],
+    "AllowedMethods": ["GET"],
+    "AllowedOrigins": ["*"],
+    "ExposeHeaders": [],
+    "MaxAgeSeconds": 3000
+  }
 ]
 ```
 
@@ -327,6 +311,37 @@ Shrine.storages = {
 }
 ```
 
+#### `:presigned_host`
+
+The `:presigned_host` option overrides the host used when generating
+presigned URLs (`#prepare_upload_part` and `#object_url`), while the rest of
+the operations continue to use the endpoint configured on the `:bucket`
+client.
+
+This is useful when the S3-compatible endpoint reachable by your app isn't
+the same one reachable by the browser, for example when running [Minio] in
+Docker Compose and accessing it via a different host than the app container
+does:
+
+```rb
+bucket = Aws::S3::Bucket.new(
+  name:              "<MINIO_BUCKET>",
+  access_key_id:     "<MINIO_ACCESS_KEY>",
+  secret_access_key: "<MINIO_SECRET_KEY>",
+  endpoint:          "http://minio:9000", # reachable from the app container
+  region:            "us-east-1",
+  force_path_style:  true,
+)
+
+Uppy::S3Multipart::App.new(bucket: bucket, presigned_host: "localhost")
+```
+
+In the Shrine plugin it can be passed the same way as other options:
+
+```rb
+Shrine.uppy_s3_multipart(:cache, presigned_host: "localhost")
+```
+
 ## Client
 
 If you would rather implement the endpoints yourself, you can utilize the

data/lib/uppy/s3_multipart/app.rb

@@ -8,9 +8,9 @@ require "securerandom"
 module Uppy
   module S3Multipart
     class App
-      def initialize(bucket:, prefix: nil, public: nil, options: {})
+      def initialize(bucket:, prefix: nil, public: nil, options: {}, presigned_host: nil)
         @router = Class.new(Router)
-        @router.opts[:client]  = Client.new(bucket: bucket)
+        @router.opts[:client]  = Client.new(bucket: bucket, presigned_host: presigned_host)
         @router.opts[:prefix]  = prefix
         @router.opts[:public]  = public
         @router.opts[:options] = options

data/lib/uppy/s3_multipart/client.rb

@@ -5,8 +5,9 @@ module Uppy
     class Client
       attr_reader :bucket
 
-      def initialize(bucket:)
-        @bucket = bucket
+      def initialize(bucket:, presigned_host: nil)
+        @bucket           = bucket
+        @presigned_client = build_presigned_client(bucket.client, presigned_host) if presigned_host
       end
 
       def create_multipart_upload(key:, **options)
@@ -50,7 +51,7 @@ module Uppy
         if public
           object(key).public_url(**options)
         else
-          object(key).presigned_url(:get, **options)
+          presigner.presigned_url(:get_object, bucket: bucket.name, key: object(key).key, **options)
         end
       end
 
@@ -72,7 +73,19 @@ module Uppy
       end
 
       def presigner
-        Aws::S3::Presigner.new(client: client)
+        Aws::S3::Presigner.new(client: @presigned_client || client)
+      end
+
+      def build_presigned_client(client, host)
+        endpoint      = client.config.endpoint.dup
+        endpoint.host = host
+
+        Aws::S3::Client.new(
+          credentials:      client.config.credentials,
+          region:           client.config.region,
+          endpoint:         endpoint,
+          force_path_style: client.config.force_path_style,
+        )
       end
 
       def client

data/uppy-s3_multipart.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |gem|
   gem.name         = "uppy-s3_multipart"
-  gem.version      = "1.2.1"
+  gem.version      = "1.3.0"
 
-  gem.required_ruby_version = ">= 2.3"
+  gem.required_ruby_version = ">= 2.6"
 
   gem.summary      = "Provides a Rack application that implements endpoints for the AwsS3Multipart Uppy plugin."
   gem.homepage     = "https://github.com/janko/uppy-s3_multipart"
@@ -19,9 +19,7 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "minitest"
-  gem.add_development_dependency "rack-test_app"
-  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 "rack-test", "~> 2.0"
+  gem.add_development_dependency "shrine", "~> 3.0"
   gem.add_development_dependency "rexml"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: uppy-s3_multipart
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Janko Marohnić
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-29 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roda
@@ -87,61 +86,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack-test_app
-  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'
-- !ruby/object:Gem::Dependency
-  name: shrine
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: shrine-memory
-  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'
-- !ruby/object:Gem::Dependency
-  name: aws-sdk-core
+  name: shrine
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.23'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.23'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rexml
   requirement: !ruby/object:Gem::Requirement
@@ -156,7 +127,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
 email:
 - janko.marohnic@gmail.com
 executables: []
@@ -175,7 +145,6 @@ homepage: https://github.com/janko/uppy-s3_multipart
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -183,15 +152,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
-signing_key:
+rubygems_version: 4.0.13
 specification_version: 4
 summary: Provides a Rack application that implements endpoints for the AwsS3Multipart
   Uppy plugin.