faraday-multipart 1.0.4 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 003f27fac04888822e0601b1ff9e67a374d3a07a77cdaa2a59e929956228fe6c
-  data.tar.gz: e8bf33e1089e8e3f4b9b2326edcd2e2bb2c32f87bb89b2336b798fed5806c942
+  metadata.gz: c32bdcc8a56bde071bf290f431a4b9f7770607151f10f47741c96a811496dd08
+  data.tar.gz: c9f96a258eb0dcb02106ed07a4c2b35ef4edf96d8fe2c2fb9554810b361623c1
 SHA512:
-  metadata.gz: 8cc6c3ac2a717c353e035f4de9b7486142df5c6266f2464db3dbd533fa4d8236f64498e7cf00b22d8afc3d17fd34d5d387d5665908454061495199ebb031cab7
-  data.tar.gz: b59ce976a29a837ff68953db793d28565d8a5579c808d8ce758cdb4663a0bca1e7ce802ab98152874b79dcaea47faa9177578e1b1eae464c5701ecf5dbe20751
+  metadata.gz: 88bec52f2c139c1a91e8cbe2cd5a8e84b36721998c567aa244b629d45b961ea68e134d9071840f636017973822720c8d607cdee2649d0857c45087f8a6c5d070
+  data.tar.gz: 881d3bc91852a8ea2c2051cba449b059d5a56f6dff7c09c6216a089e522ee82562f53d57d77aa1f2ae2d03672842263fd55ff7e0c819e303b6894203a369b34e

data/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## [1.0.4](https://github.com/lostisland/faraday-multipart/releases/tag/v1.0.3) (2022-06-07)
+## [1.0.4](https://github.com/lostisland/faraday-multipart/releases/tag/v1.0.4) (2022-06-07)
 
 ### What's Changed
 
@@ -8,6 +8,8 @@
 * Change references to `UploadIO` and `Parts` according to class reorganization in the 'multipart-post' gem 2.2.0 (see [multipart-post gem PR #89](https://github.com/socketry/multipart-post/pull/89))
 * Introduce a backwards compatible safeguard so the gem still works with previous 'multipart-post' 2.x releases.
 
+**Full Changelog**: https://github.com/lostisland/faraday-multipart/compare/v1.0.3...v1.0.4
+
 ## [1.0.3](https://github.com/lostisland/faraday-multipart/releases/tag/v1.0.3) (2022-01-08)
 
 ### What's Changed

data/README.md

@@ -1,6 +1,6 @@
 # Faraday Multipart
 
-[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/lostisland/faraday-multipart/ci)](https://github.com/lostisland/faraday-multipart/actions?query=branch%3Amain)
+[![ci](https://github.com/lostisland/faraday-multipart/actions/workflows/ci.yml/badge.svg)](https://github.com/lostisland/faraday-multipart/actions/workflows/ci.yml)
 [![Gem](https://img.shields.io/gem/v/faraday-multipart.svg?style=flat-square)](https://rubygems.org/gems/faraday-multipart)
 [![License](https://img.shields.io/github/license/lostisland/faraday-multipart.svg?style=flat-square)](LICENSE.md)
 
@@ -51,6 +51,18 @@ conn = Faraday.new(...) do |f|
 end
 ```
 
+If you need to [specify a different content type for the multipart
+request](https://www.iana.org/assignments/media-types/media-types.xhtml#multipart),
+you can do so by providing the `content_type` option but it must start with
+`multipart/`
+otherwise it will default to `multipart/form-data`:
+
+```ruby
+conn = Faraday.new(...) do |f|
+  f.request :multipart, content_type: 'multipart/mixed'
+  # ...
+end
+```
 
 Payload can be a mix of POST data and multipart values.
 

data/lib/faraday/multipart/middleware.rb

@@ -5,11 +5,10 @@ require 'securerandom'
 module Faraday
   module Multipart
     # Middleware for supporting multi-part requests.
-    class Middleware < Faraday::Request::UrlEncoded
+    class Middleware < Faraday::Middleware
+      CONTENT_TYPE = 'Content-Type'
       DEFAULT_BOUNDARY_PREFIX = '-----------RubyMultipartPost'
 
-      self.mime_type = 'multipart/form-data'
-
       def initialize(app = nil, options = {})
         super(app)
         @options = options
@@ -28,15 +27,37 @@ module Faraday
         @app.call env
       end
 
+      private
+
+      # @param env [Faraday::Env]
+      # @yield [request_body] Body of the request
+      def match_content_type(env)
+        return unless process_request?(env)
+
+        env.request_headers[CONTENT_TYPE] ||= mime_type
+        return if env.body.respond_to?(:to_str) || env.body.respond_to?(:read)
+
+        yield(env.body)
+      end
+
       # @param env [Faraday::Env]
       def process_request?(env)
         type = request_type(env)
         env.body.respond_to?(:each_key) && !env.body.empty? && (
           (type.empty? && has_multipart?(env.body)) ||
-            (type == self.class.mime_type)
+            (type == mime_type)
         )
       end
 
+      # @param env [Faraday::Env]
+      #
+      # @return [String]
+      def request_type(env)
+        type = env.request_headers[CONTENT_TYPE].to_s
+        type = type.split(';', 2).first if type.index(';')
+        type
+      end
+
       # Returns true if obj is an enumerable with values that are multipart.
       #
       # @param obj [Object]
@@ -97,6 +118,17 @@ module Faraday
           end
         end
       end
+
+      # Determines and provides the multipart mime type for the request.
+      #
+      # @return [String] the multipart mime type
+      def mime_type
+        @mime_type ||= if @options[:content_type].to_s.match?(%r{\Amultipart/.+})
+                         @options[:content_type].to_s
+                       else
+                         'multipart/form-data'
+                       end
+      end
     end
   end
 end

data/lib/faraday/multipart/version.rb

@@ -3,7 +3,7 @@
 module Faraday
   # #:nodoc:
   module Multipart
-    VERSION = '1.0.4'
+    VERSION = '1.1.1'
 
     def self.multipart_post_version
       require 'multipart/post/version'

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: faraday-multipart
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.1
 platform: ruby
 authors:
 - Mattia Giuffrida
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-07 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
@@ -16,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '2.0'
 description: 'Perform multipart-post requests using Faraday.
 
   '
@@ -46,12 +45,11 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/lostisland/faraday-multipart/issues
-  changelog_uri: https://github.com/lostisland/faraday-multipart/blob/v1.0.4/CHANGELOG.md
-  documentation_uri: http://www.rubydoc.info/gems/faraday-multipart/1.0.4
+  changelog_uri: https://github.com/lostisland/faraday-multipart/blob/v1.1.1/CHANGELOG.md
+  documentation_uri: http://www.rubydoc.info/gems/faraday-multipart/1.1.1
   homepage_uri: https://github.com/lostisland/faraday-multipart
   source_code_uri: https://github.com/lostisland/faraday-multipart
   wiki_uri: https://github.com/lostisland/faraday-multipart/wiki
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -69,8 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Perform multipart-post requests using Faraday.
 test_files: []