s3-rb 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8da7974f1a862a8b59312aa1b2a14e62acb50e0c395a59cb0e9163c81ca6c1d9
-  data.tar.gz: 271348a115ab248f843912064ce39ec87466165706304cbbfda8919f47e3d00b
+  metadata.gz: 85a4eeb57da7dbe4999bb438af9db19d367daf81350f784448e3f150a1e1fd70
+  data.tar.gz: a698dcb334a90ba430190bad1bbae206d4d0a4b5c7ab8ce7c49a4de8332367db
 SHA512:
-  metadata.gz: 89d5da5bdae4ba11bf4fd3de8145d2f992a012b4d28f2cba73c9752af4d220f788fcefb8e45fe73aea16eb31ee3d6286fd989f83ba1768cb60e4950a9063ee8c
-  data.tar.gz: a57ec119c7b94cc518a10869e95f58937df0ef553cf2d7e0aafab14341980c96fcb54e5bcf0885566b0d3cb268ecd24b9cfc9cbb793147311177ca0e4a1047b5
+  metadata.gz: 670b1933127338a97975c5950415bf397aa59892732dc8fa88d8e3467af908e7b343a051128d017c781f94a633956867424fa9cb319b46d73d79e5fc61f61ce6
+  data.tar.gz: ebc2090cef7c63ee6da0fc136e94f05a46cfd605971ba64e1c738026b6fa6762cddbb5259478528f4ee18cbbd8231b5716973fdadb430eb6bd57894bbdb01b56

data/CHANGELOG.md

@@ -0,0 +1,38 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+## [1.1.0] - 2025-02-04
+
+### Added
+
+- New options classes for all requests with optional parameters:
+  - `BucketCreateOptions` (region, acl)
+  - `MultipartCreateOptions` (metadata, content_type, acl, storage_class)
+  - `MultipartListOptions` (prefix, key_marker, upload_id_marker, max_uploads)
+  - `MultipartPartsOptions` (part_number_marker, max_parts)
+  - `ObjectListOptions` (prefix, delimiter, max_keys, continuation_token, start_after)
+  - `PresignGetOptions` (expires_in, response_content_type, response_content_disposition)
+  - `PresignPutOptions` (expires_in, content_type)
+
+- Added `metadata` field to `ObjectPutOptions` and `ObjectCopyOptions`
+
+- Flexible options passing for all requests and service methods:
+  - Pass options as keyword arguments (primary approach)
+  - Pass an options struct as the first positional argument
+  - Pass an options struct or hash via the `options:` keyword argument
+  - Combine any of the above (precedence: positional < `options:` kwarg < other kwargs)
+
+### Changed
+
+- Refactored request classes to use shared `merge_options` helper method in base `Request` class
+- Simplified service method signatures to use `**kwargs` passthrough
+
+### Notes
+
+- Fully backwards compatible with 1.0.0
+- All existing code continues to work without modification
+
+## [1.0.0] - 2025-02-04
+
+- Initial release

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    s3-rb (0.1.0)
+    s3-rb (1.1.0)
       dynamicschema (~> 2.0)
       faraday (~> 2.0)
       faraday-net_http_persistent (~> 2.0)

data/README.md

@@ -4,17 +4,12 @@ This is a lightweight, low dependency, high performance, high compatibility, 'ba
 
 I chose to make this implementation 'bare metal' in that there is minimal abstraction layer atop the S3 API - not even an iterator for the object list. You are then free to build your own abstraction best suited to the semantics of your application or gem.
 
-At its most basic the implementation provides a request class per operation which returns a result structure. In some cases, for operations with many parameters, there is an options structure you can build. The operation is executed by 'submitting' an instance of the request.
+At its most basic the implementation provides a request class per operation which returns a result structure. The operation is executed by 'submitting' an instance of the request with required parameters and optional keyword arguments.
 
 ```ruby
 require 's3'
 
-# build the options for the put operation
-options = S3::ObjectPutOptions.build( content_type: 'text/plain',
-                                      acl: :public_read,
-                                      storage_class: :standard_ia )
-
-# create the request and submit it
+# create the request and submit it with keyword arguments
 request = S3::ObjectPutRequest.new( access_key_id: 'AKIA...',
                                     secret_access_key: '...',
                                     region: 'us-east-1' )
@@ -22,7 +17,9 @@ request = S3::ObjectPutRequest.new( access_key_id: 'AKIA...',
 response = request.submit( bucket: 'my-bucket',
                            key: 'hello.txt',
                            body: 'Hello, World!',
-                           options: options )
+                           content_type: 'text/plain',
+                           acl: :public_read,
+                           storage_class: :standard_ia )
 
 # check for success and read the result
 if response.success?
@@ -34,6 +31,32 @@ else
 end
 ```
 
+Alternatively, you can build an options structure and pass it as the first positional argument or as the `options:` keyword argument:
+
+```ruby
+# build the options for the put operation
+options = S3::ObjectPutOptions.build( content_type: 'text/plain',
+                                      acl: :public_read,
+                                      storage_class: :standard_ia )
+
+# as first positional argument
+response = request.submit( options, bucket: 'my-bucket',
+                                    key: 'hello.txt',
+                                    body: 'Hello, World!' )
+
+# or as keyword argument
+response = request.submit( bucket: 'my-bucket',
+                           key: 'hello.txt',
+                           body: 'Hello, World!',
+                           options: options )
+
+# options can also be a Hash
+response = request.submit( bucket: 'my-bucket',
+                           key: 'hello.txt',
+                           body: 'Hello, World!',
+                           options: { content_type: 'text/plain', acl: :public_read } )
+```
+
 The operation methods - similar to those in the AWS gem - then create a matching request object with the given arguments and submit a request, typically returning the same result structure.
 
 ```ruby

data/lib/s3/bucket_create_options.rb

@@ -0,0 +1,14 @@
+module S3
+  class BucketCreateOptions
+    include SchemaOptions
+
+    CANNED_ACLS = %w[
+      private public-read public-read-write authenticated-read
+    ].freeze
+
+    schema do
+      region              String
+      acl                 [ String, Symbol ], normalize: ->( v ) { v.to_s.downcase.tr( '_', '-' ) }
+    end
+  end
+end

data/lib/s3/bucket_create_request.rb

@@ -1,11 +1,13 @@
 module S3
   class BucketCreateRequest < Request
-    def submit( bucket:, region: nil, acl: nil )
+    def submit( options = nil, bucket:, **kwargs )
+      options = merge_options( options, kwargs, BucketCreateOptions )
+
       headers = {}
-      headers[ 'x-amz-acl' ] = acl if acl
+      headers[ 'x-amz-acl' ] = options[ :acl ] if options[ :acl ]
 
       body = nil
-      location = region || @region
+      location = options[ :region ] || @region
 
       if location && location != 'us-east-1'
         body = <<~XML

data/lib/s3/bucket_methods.rb

@@ -9,9 +9,9 @@ module S3
       response.result
     end
 
-    def bucket_create( bucket:, region: nil, acl: nil )
+    def bucket_create( options = nil, bucket:, **kwargs )
       request = BucketCreateRequest.new( **request_options )
-      response = request.submit( bucket: bucket, region: region, acl: acl )
+      response = request.submit( options, bucket: bucket, **kwargs )
 
       raise_if_error( response )
 

data/lib/s3/multipart_create_options.rb

@@ -0,0 +1,22 @@
+module S3
+  class MultipartCreateOptions
+    include SchemaOptions
+
+    STORAGE_CLASSES = %w[
+      STANDARD REDUCED_REDUNDANCY STANDARD_IA ONEZONE_IA
+      INTELLIGENT_TIERING GLACIER DEEP_ARCHIVE GLACIER_IR
+    ].freeze
+
+    CANNED_ACLS = %w[
+      private public-read public-read-write authenticated-read
+      aws-exec-read bucket-owner-read bucket-owner-full-control
+    ].freeze
+
+    schema do
+      metadata            Hash
+      content_type        String
+      acl                 [ String, Symbol ], normalize: ->( v ) { v.to_s.downcase.tr( '_', '-' ) }
+      storage_class       [ String, Symbol ], normalize: ->( v ) { v.to_s.upcase.tr( '-', '_' ) }
+    end
+  end
+end

data/lib/s3/multipart_create_request.rb

@@ -1,15 +1,17 @@
 module S3
   class MultipartCreateRequest < Request
-    def submit( bucket:, key:, metadata: nil, content_type: nil, acl: nil, storage_class: nil )
+    def submit( options = nil, bucket:, key:, **kwargs )
       path = "/#{ bucket }/#{ Helpers.encode_key( key ) }"
       query = 'uploads='
 
+      options = merge_options( options, kwargs, MultipartCreateOptions )
+
       headers = {}
-      headers[ 'Content-Type' ] = content_type if content_type
-      headers[ 'x-amz-acl' ] = acl if acl
-      headers[ 'x-amz-storage-class' ] = storage_class if storage_class
+      headers[ 'Content-Type' ] = options[ :content_type ] if options[ :content_type ]
+      headers[ 'x-amz-acl' ] = options[ :acl ] if options[ :acl ]
+      headers[ 'x-amz-storage-class' ] = options[ :storage_class ] if options[ :storage_class ]
 
-      metadata&.each do | meta_key, value |
+      options[ :metadata ]&.each do | meta_key, value |
         headers[ "x-amz-meta-#{ meta_key }" ] = value.to_s
       end
 

data/lib/s3/multipart_list_options.rb

@@ -0,0 +1,12 @@
+module S3
+  class MultipartListOptions
+    include SchemaOptions
+
+    schema do
+      prefix              String
+      key_marker          String
+      upload_id_marker    String
+      max_uploads         Integer
+    end
+  end
+end

data/lib/s3/multipart_list_request.rb

@@ -1,13 +1,15 @@
 module S3
   class MultipartListRequest < Request
-    def submit( bucket:, prefix: nil, key_marker: nil, upload_id_marker: nil, max_uploads: nil )
+    def submit( options = nil, bucket:, **kwargs )
       path = "/#{ bucket }"
 
+      options = merge_options( options, kwargs, MultipartListOptions )
+
       params = { 'uploads' => '' }
-      params[ 'prefix' ] = prefix if prefix
-      params[ 'key-marker' ] = key_marker if key_marker
-      params[ 'upload-id-marker' ] = upload_id_marker if upload_id_marker
-      params[ 'max-uploads' ] = max_uploads.to_s if max_uploads
+      params[ 'prefix' ] = options[ :prefix ] if options[ :prefix ]
+      params[ 'key-marker' ] = options[ :key_marker ] if options[ :key_marker ]
+      params[ 'upload-id-marker' ] = options[ :upload_id_marker ] if options[ :upload_id_marker ]
+      params[ 'max-uploads' ] = options[ :max_uploads ].to_s if options[ :max_uploads ]
 
       query = Helpers.build_query_string( params )
 

data/lib/s3/multipart_methods.rb

@@ -1,15 +1,8 @@
 module S3
   module MultipartMethods
-    def multipart_create( bucket:, key:, metadata: nil, content_type: nil, acl: nil, storage_class: nil )
+    def multipart_create( options = nil, bucket:, key:, **kwargs )
       request = MultipartCreateRequest.new( **request_options )
-      response = request.submit(
-        bucket: bucket,
-        key: key,
-        metadata: metadata,
-        content_type: content_type,
-        acl: acl,
-        storage_class: storage_class
-      )
+      response = request.submit( options, bucket: bucket, key: key, **kwargs )
 
       raise_if_error( response )
 
@@ -54,30 +47,18 @@ module S3
       response.result
     end
 
-    def multipart_list( bucket:, prefix: nil, key_marker: nil, upload_id_marker: nil, max_uploads: nil )
+    def multipart_list( options = nil, bucket:, **kwargs )
       request = MultipartListRequest.new( **request_options )
-      response = request.submit(
-        bucket: bucket,
-        prefix: prefix,
-        key_marker: key_marker,
-        upload_id_marker: upload_id_marker,
-        max_uploads: max_uploads
-      )
+      response = request.submit( options, bucket: bucket, **kwargs )
 
       raise_if_error( response )
 
       response.result
     end
 
-    def multipart_parts( bucket:, key:, upload_id:, part_number_marker: nil, max_parts: nil )
+    def multipart_parts( options = nil, bucket:, key:, upload_id:, **kwargs )
       request = MultipartPartsRequest.new( **request_options )
-      response = request.submit(
-        bucket: bucket,
-        key: key,
-        upload_id: upload_id,
-        part_number_marker: part_number_marker,
-        max_parts: max_parts
-      )
+      response = request.submit( options, bucket: bucket, key: key, upload_id: upload_id, **kwargs )
 
       raise_if_error( response )
 

data/lib/s3/multipart_parts_options.rb

@@ -0,0 +1,10 @@
+module S3
+  class MultipartPartsOptions
+    include SchemaOptions
+
+    schema do
+      part_number_marker  Integer
+      max_parts           Integer
+    end
+  end
+end

data/lib/s3/multipart_parts_request.rb

@@ -1,11 +1,13 @@
 module S3
   class MultipartPartsRequest < Request
-    def submit( bucket:, key:, upload_id:, part_number_marker: nil, max_parts: nil )
+    def submit( options = nil, bucket:, key:, upload_id:, **kwargs )
       path = "/#{ bucket }/#{ Helpers.encode_key( key ) }"
 
+      options = merge_options( options, kwargs, MultipartPartsOptions )
+
       params = { 'uploadId' => upload_id }
-      params[ 'part-number-marker' ] = part_number_marker.to_s if part_number_marker
-      params[ 'max-parts' ] = max_parts.to_s if max_parts
+      params[ 'part-number-marker' ] = options[ :part_number_marker ].to_s if options[ :part_number_marker ]
+      params[ 'max-parts' ] = options[ :max_parts ].to_s if options[ :max_parts ]
 
       query = Helpers.build_query_string( params )
 

data/lib/s3/object_copy_options.rb

@@ -15,6 +15,7 @@ module S3
     ].freeze
 
     schema do
+      metadata            Hash
       metadata_directive  [ String, Symbol ], normalize: ->( v ) { v.to_s.upcase }
       storage_class       [ String, Symbol ], normalize: ->( v ) { v.to_s.upcase.tr( '-', '_' ) }
       acl                 [ String, Symbol ], normalize: ->( v ) { v.to_s.downcase.tr( '_', '-' ) }

data/lib/s3/object_copy_request.rb

@@ -1,20 +1,19 @@
 module S3
   class ObjectCopyRequest < Request
-    def submit( source_bucket:, source_key:, bucket:, key:, metadata: nil, options: nil )
+    def submit( options = nil, source_bucket:, source_key:, bucket:, key:, **kwargs )
       path = "/#{ bucket }/#{ Helpers.encode_key( key ) }"
 
       source = "/#{ source_bucket }/#{ Helpers.encode_key( source_key ) }"
 
-      headers = { 'x-amz-copy-source' => source }
+      options = merge_options( options, kwargs, ObjectCopyOptions )
 
-      if options
-        headers[ 'x-amz-metadata-directive' ] = options[ :metadata_directive ] if options[ :metadata_directive ]
-        headers[ 'x-amz-storage-class' ] = options[ :storage_class ] if options[ :storage_class ]
-        headers[ 'x-amz-acl' ] = options[ :acl ] if options[ :acl ]
-        headers[ 'Content-Type' ] = options[ :content_type ] if options[ :content_type ]
-      end
+      headers = { 'x-amz-copy-source' => source }
+      headers[ 'x-amz-metadata-directive' ] = options[ :metadata_directive ] if options[ :metadata_directive ]
+      headers[ 'x-amz-storage-class' ] = options[ :storage_class ] if options[ :storage_class ]
+      headers[ 'x-amz-acl' ] = options[ :acl ] if options[ :acl ]
+      headers[ 'Content-Type' ] = options[ :content_type ] if options[ :content_type ]
 
-      metadata&.each do | meta_key, value |
+      options[ :metadata ]&.each do | meta_key, value |
         headers[ "x-amz-meta-#{ meta_key }" ] = value.to_s
       end
 

data/lib/s3/object_list_options.rb

@@ -0,0 +1,13 @@
+module S3
+  class ObjectListOptions
+    include SchemaOptions
+
+    schema do
+      prefix              String
+      delimiter           String
+      max_keys            Integer
+      continuation_token  String
+      start_after         String
+    end
+  end
+end

data/lib/s3/object_list_request.rb

@@ -1,13 +1,14 @@
 module S3
   class ObjectListRequest < Request
-    def submit( bucket:, prefix: nil, delimiter: nil, max_keys: nil,
-                continuation_token: nil, start_after: nil )
+    def submit( options = nil, bucket:, **kwargs )
+      options = merge_options( options, kwargs, ObjectListOptions )
+
       params = { 'list-type' => '2' }
-      params[ 'prefix' ] = prefix if prefix
-      params[ 'delimiter' ] = delimiter if delimiter
-      params[ 'max-keys' ] = max_keys.to_s if max_keys
-      params[ 'continuation-token' ] = continuation_token if continuation_token
-      params[ 'start-after' ] = start_after if start_after
+      params[ 'prefix' ] = options[ :prefix ] if options[ :prefix ]
+      params[ 'delimiter' ] = options[ :delimiter ] if options[ :delimiter ]
+      params[ 'max-keys' ] = options[ :max_keys ].to_s if options[ :max_keys ]
+      params[ 'continuation-token' ] = options[ :continuation_token ] if options[ :continuation_token ]
+      params[ 'start-after' ] = options[ :start_after ] if options[ :start_after ]
 
       query = Helpers.build_query_string( params )
 

data/lib/s3/object_methods.rb

@@ -1,16 +1,8 @@
 module S3
   module ObjectMethods
-    def object_list( bucket:, prefix: nil, delimiter: nil, max_keys: nil,
-                     continuation_token: nil, start_after: nil )
+    def object_list( options = nil, bucket:, **kwargs )
       request = ObjectListRequest.new( **request_options )
-      response = request.submit(
-        bucket: bucket,
-        prefix: prefix,
-        delimiter: delimiter,
-        max_keys: max_keys,
-        continuation_token: continuation_token,
-        start_after: start_after
-      )
+      response = request.submit( options, bucket: bucket, **kwargs )
 
       raise_if_error( response )
 
@@ -31,29 +23,9 @@ module S3
       end
     end
 
-    def object_put( bucket:, key:, body:, metadata: nil, content_type: nil,
-                    acl: nil, storage_class: nil, cache_control: nil,
-                    content_disposition: nil, content_encoding: nil,
-                    content_language: nil, expires: nil )
-      options = ObjectPutOptions.build(
-        content_type: content_type,
-        acl: acl,
-        storage_class: storage_class,
-        cache_control: cache_control,
-        content_disposition: content_disposition,
-        content_encoding: content_encoding,
-        content_language: content_language,
-        expires: expires
-      )
-
+    def object_put( options = nil, bucket:, key:, body:, **kwargs )
       request = ObjectPutRequest.new( **request_options )
-      response = request.submit(
-        bucket: bucket,
-        key: key,
-        body: body,
-        metadata: metadata,
-        options: options
-      )
+      response = request.submit( options, bucket: bucket, key: key, body: body, **kwargs )
 
       raise_if_error( response )
 
@@ -93,24 +65,15 @@ module S3
       !object_head( bucket: bucket, key: key ).nil?
     end
 
-    def object_copy( source_bucket:, source_key:, bucket:, key:,
-                     metadata: nil, metadata_directive: nil,
-                     storage_class: nil, acl: nil, content_type: nil )
-      options = ObjectCopyOptions.build(
-        metadata_directive: metadata_directive,
-        storage_class: storage_class,
-        acl: acl,
-        content_type: content_type
-      )
-
+    def object_copy( options = nil, source_bucket:, source_key:, bucket:, key:, **kwargs )
       request = ObjectCopyRequest.new( **request_options )
       response = request.submit(
+        options,
         source_bucket: source_bucket,
         source_key: source_key,
         bucket: bucket,
         key: key,
-        metadata: metadata,
-        options: options
+        **kwargs
       )
 
       raise_if_error( response )

data/lib/s3/object_put_options.rb

@@ -13,6 +13,7 @@ module S3
     ].freeze
 
     schema do
+      metadata            Hash
       content_type        String
       acl                 [ String, Symbol ], normalize: ->( v ) { v.to_s.downcase.tr( '_', '-' ) }
       storage_class       [ String, Symbol ], normalize: ->( v ) { v.to_s.upcase.tr( '-', '_' ) }

data/lib/s3/object_put_request.rb

@@ -1,21 +1,21 @@
 module S3
   class ObjectPutRequest < Request
-    def submit( bucket:, key:, body:, metadata: nil, options: nil )
+    def submit( options = nil, bucket:, key:, body:, **kwargs )
       path = "/#{ bucket }/#{ Helpers.encode_key( key ) }"
 
+      options = merge_options( options, kwargs, ObjectPutOptions )
+
       headers = {}
-      if options
-        headers[ 'Content-Type' ] = options[ :content_type ] if options[ :content_type ]
-        headers[ 'x-amz-acl' ] = options[ :acl ] if options[ :acl ]
-        headers[ 'x-amz-storage-class' ] = options[ :storage_class ] if options[ :storage_class ]
-        headers[ 'Cache-Control' ] = options[ :cache_control ] if options[ :cache_control ]
-        headers[ 'Content-Disposition' ] = options[ :content_disposition ] if options[ :content_disposition ]
-        headers[ 'Content-Encoding' ] = options[ :content_encoding ] if options[ :content_encoding ]
-        headers[ 'Content-Language' ] = options[ :content_language ] if options[ :content_language ]
-        headers[ 'Expires' ] = options[ :expires ].httpdate if options[ :expires ]
-      end
+      headers[ 'Content-Type' ] = options[ :content_type ] if options[ :content_type ]
+      headers[ 'x-amz-acl' ] = options[ :acl ] if options[ :acl ]
+      headers[ 'x-amz-storage-class' ] = options[ :storage_class ] if options[ :storage_class ]
+      headers[ 'Cache-Control' ] = options[ :cache_control ] if options[ :cache_control ]
+      headers[ 'Content-Disposition' ] = options[ :content_disposition ] if options[ :content_disposition ]
+      headers[ 'Content-Encoding' ] = options[ :content_encoding ] if options[ :content_encoding ]
+      headers[ 'Content-Language' ] = options[ :content_language ] if options[ :content_language ]
+      headers[ 'Expires' ] = options[ :expires ].httpdate if options[ :expires ]
 
-      metadata&.each do | meta_key, value |
+      options[ :metadata ]&.each do | meta_key, value |
         headers[ "x-amz-meta-#{ meta_key }" ] = value.to_s
       end
 

data/lib/s3/presign_get_options.rb

@@ -0,0 +1,11 @@
+module S3
+  class PresignGetOptions
+    include SchemaOptions
+
+    schema do
+      expires_in                    Integer
+      response_content_type         String
+      response_content_disposition  String
+    end
+  end
+end

data/lib/s3/presign_get_request.rb

@@ -2,13 +2,15 @@ module S3
   class PresignGetRequest < Request
     DEFAULT_EXPIRES_IN = 3600
 
-    def submit( bucket:, key:, expires_in: nil, response_content_type: nil, response_content_disposition: nil )
-      expires_in ||= DEFAULT_EXPIRES_IN
+    def submit( options = nil, bucket:, key:, **kwargs )
+      options = merge_options( options, kwargs, PresignGetOptions )
+
+      expires_in = options[ :expires_in ] || DEFAULT_EXPIRES_IN
       path = "/#{ bucket }/#{ Helpers.encode_key( key ) }"
 
       generate_presigned_url( :get, path, expires_in: expires_in,
-                              response_content_type: response_content_type,
-                              response_content_disposition: response_content_disposition )
+                              response_content_type: options[ :response_content_type ],
+                              response_content_disposition: options[ :response_content_disposition ] )
     end
 
     private

data/lib/s3/presign_methods.rb

@@ -1,24 +1,13 @@
 module S3
   module PresignMethods
-    def presign_get( bucket:, key:, expires_in: nil, response_content_type: nil, response_content_disposition: nil )
+    def presign_get( options = nil, bucket:, key:, **kwargs )
       request = PresignGetRequest.new( **request_options )
-      request.submit(
-        bucket: bucket,
-        key: key,
-        expires_in: expires_in,
-        response_content_type: response_content_type,
-        response_content_disposition: response_content_disposition
-      )
+      request.submit( options, bucket: bucket, key: key, **kwargs )
     end
 
-    def presign_put( bucket:, key:, expires_in: nil, content_type: nil )
+    def presign_put( options = nil, bucket:, key:, **kwargs )
       request = PresignPutRequest.new( **request_options )
-      request.submit(
-        bucket: bucket,
-        key: key,
-        expires_in: expires_in,
-        content_type: content_type
-      )
+      request.submit( options, bucket: bucket, key: key, **kwargs )
     end
   end
 end

data/lib/s3/presign_put_options.rb

@@ -0,0 +1,10 @@
+module S3
+  class PresignPutOptions
+    include SchemaOptions
+
+    schema do
+      expires_in          Integer
+      content_type        String
+    end
+  end
+end

data/lib/s3/presign_put_request.rb

@@ -2,11 +2,13 @@ module S3
   class PresignPutRequest < Request
     DEFAULT_EXPIRES_IN = 3600
 
-    def submit( bucket:, key:, expires_in: nil, content_type: nil )
-      expires_in ||= DEFAULT_EXPIRES_IN
+    def submit( options = nil, bucket:, key:, **kwargs )
+      options = merge_options( options, kwargs, PresignPutOptions )
+
+      expires_in = options[ :expires_in ] || DEFAULT_EXPIRES_IN
       path = "/#{ bucket }/#{ Helpers.encode_key( key ) }"
 
-      generate_presigned_url( :put, path, expires_in: expires_in, content_type: content_type )
+      generate_presigned_url( :put, path, expires_in: expires_in, content_type: options[ :content_type ] )
     end
 
     private

data/lib/s3/request.rb

@@ -163,5 +163,16 @@ module S3
         faraday.options.timeout = 300
       end
     end
+
+    def merge_options( options, kwargs, options_class )
+      # support options as positional arg, keyword arg, or both (merged)
+      # precedence: positional < options: kwarg < other kwargs
+      kwargs_options = kwargs.delete( :options )
+      options = options.is_a?( Hash ) ? options_class.build( options ) : options
+      kwargs_options = kwargs_options.is_a?( Hash ) ? options_class.build( kwargs_options ) : kwargs_options
+      ( options&.to_h || {} )
+        .merge( kwargs_options&.to_h || {} )
+        .merge( options_class.build( kwargs ).to_h )
+    end
   end
 end

data/lib/s3/version.rb

@@ -1,3 +1,3 @@
 module S3
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/lib/s3.rb

@@ -15,17 +15,20 @@ require_relative 's3/response_methods'
 require_relative 's3/error_result'
 require_relative 's3/request'
 
+require_relative 's3/schema_options'
+
 require_relative 's3/bucket_list_request'
 require_relative 's3/bucket_list_result'
+require_relative 's3/bucket_create_options'
 require_relative 's3/bucket_create_request'
 require_relative 's3/bucket_delete_request'
 require_relative 's3/bucket_head_request'
 require_relative 's3/bucket_head_result'
 
+require_relative 's3/object_list_options'
 require_relative 's3/object_list_request'
 require_relative 's3/object_list_result'
 require_relative 's3/object_get_request'
-require_relative 's3/schema_options'
 require_relative 's3/object_put_options'
 require_relative 's3/object_put_request'
 require_relative 's3/object_put_result'
@@ -38,6 +41,7 @@ require_relative 's3/object_copy_options'
 require_relative 's3/object_copy_request'
 require_relative 's3/object_copy_result'
 
+require_relative 's3/multipart_create_options'
 require_relative 's3/multipart_create_request'
 require_relative 's3/multipart_create_result'
 require_relative 's3/multipart_upload_request'
@@ -46,12 +50,16 @@ require_relative 's3/multipart_complete_options'
 require_relative 's3/multipart_complete_request'
 require_relative 's3/multipart_complete_result'
 require_relative 's3/multipart_abort_request'
+require_relative 's3/multipart_list_options'
 require_relative 's3/multipart_list_request'
 require_relative 's3/multipart_list_result'
+require_relative 's3/multipart_parts_options'
 require_relative 's3/multipart_parts_request'
 require_relative 's3/multipart_parts_result'
 
+require_relative 's3/presign_get_options'
 require_relative 's3/presign_get_request'
+require_relative 's3/presign_put_options'
 require_relative 's3/presign_put_request'
 
 require_relative 's3/bucket_methods'

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: s3-rb
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Kristoph Cichocki-Romanov
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-02-02 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -158,12 +157,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - README.md
 - Rakefile
 - lib/s3-rb.rb
 - lib/s3.rb
+- lib/s3/bucket_create_options.rb
 - lib/s3/bucket_create_request.rb
 - lib/s3/bucket_delete_request.rb
 - lib/s3/bucket_head_request.rb
@@ -179,11 +180,14 @@ files:
 - lib/s3/multipart_complete_options.rb
 - lib/s3/multipart_complete_request.rb
 - lib/s3/multipart_complete_result.rb
+- lib/s3/multipart_create_options.rb
 - lib/s3/multipart_create_request.rb
 - lib/s3/multipart_create_result.rb
+- lib/s3/multipart_list_options.rb
 - lib/s3/multipart_list_request.rb
 - lib/s3/multipart_list_result.rb
 - lib/s3/multipart_methods.rb
+- lib/s3/multipart_parts_options.rb
 - lib/s3/multipart_parts_request.rb
 - lib/s3/multipart_parts_result.rb
 - lib/s3/multipart_upload_request.rb
@@ -197,14 +201,17 @@ files:
 - lib/s3/object_get_request.rb
 - lib/s3/object_head_request.rb
 - lib/s3/object_head_result.rb
+- lib/s3/object_list_options.rb
 - lib/s3/object_list_request.rb
 - lib/s3/object_list_result.rb
 - lib/s3/object_methods.rb
 - lib/s3/object_put_options.rb
 - lib/s3/object_put_request.rb
 - lib/s3/object_put_result.rb
+- lib/s3/presign_get_options.rb
 - lib/s3/presign_get_request.rb
 - lib/s3/presign_methods.rb
+- lib/s3/presign_put_options.rb
 - lib/s3/presign_put_request.rb
 - lib/s3/request.rb
 - lib/s3/response_methods.rb
@@ -223,7 +230,6 @@ metadata:
   homepage_uri: https://github.com/EndlessInternational/s3-rb
   source_code_uri: https://github.com/EndlessInternational/s3-rb
   changelog_uri: https://github.com/EndlessInternational/s3-rb/blob/main/CHANGELOG.md
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -238,8 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: A lightweight, low dependency, high performance, 'bare metal' S3 API gem.
 test_files: []