fetch-api 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5087cd966a296311bc208ed82ba9c4eb33cb7abb1ca1474efc611acdea73982
-  data.tar.gz: e58cb6110ac3a0e62945f486593c95d04096c80e495935a90e3a46de13211526
+  metadata.gz: 872edd7141621bba9ac97f850fd7affb5daf229d3c2db581bf2f5422424fdecf
+  data.tar.gz: 1bcce61d1a762827070efc219024d3520b5c2959ede385bcfc2b3ba5d6897dc3
 SHA512:
-  metadata.gz: 1b64dcee60dbe28b3700c53932ef584d900a5e112c0e2e13b8bb63627d6df3d835f4cba30beb340e15993087d482d7408a0d8dfa5ef62c47beffba08c44d8587
-  data.tar.gz: 676d8113e1edbe75d16389b23d24633e55fe5fd599195e989d87da2e22c248279e9d9ae272c36662e5a5dc750a28629c48c2708dd04709e007827ddf4c59d8f9
+  metadata.gz: 4c88efee5d27ab2b0d1765e68d59625fc2b8249f70ced9bcee8467999b7c0f3a59bc43f4289b0e6510b6d31782c16a2e95577dce57294c9281ac6b0c8556cff9
+  data.tar.gz: deb9958e04948dc8e9c809d44517cda3af48497984297478046c0707f28d3daf9dca5fc665b86240bd92c4e77ca9f34b530111c193d9e0e878dfd28397888bc2

data/README.md

@@ -46,7 +46,7 @@ res = fetch('https://example.com')
 Options for `fetch` method:
 
 - `method`: HTTP method (default: `:get`)
-- `headers`: Request headers (default: `{}`)
+- `headers`: Request headers (default: `[]`)
 - `body`: Request body (default: `nil`)
 - `redirect`: Follow redirects (one of `:follow`, `:error`, `:manual`, default: `:follow`)
 

data/lib/fetch/client.rb

@@ -4,7 +4,7 @@ require_relative 'headers'
 require_relative 'response'
 require_relative 'url_search_params'
 
-require 'marcel'
+require 'mini_mime'
 require 'net/http'
 require 'singleton'
 require 'uri'
@@ -13,7 +13,7 @@ module Fetch
   class Client
     include Singleton
 
-    def fetch(resource, method: :get, headers: [], body: nil, redirect: 'follow', _redirected: false)
+    def fetch(resource, method: :get, headers: [], body: nil, redirect: :follow, _redirected: false)
       uri = URI.parse(resource)
       req = Net::HTTP.const_get(method.capitalize).new(uri)
 
@@ -23,20 +23,18 @@ module Fetch
 
       case body
       when FormData
-        req.set_form body.entries.map {|k, v|
+        req.set_form body.map {|k, v|
           if v.is_a?(File)
             [k, v, {
               filename:     File.basename(v.path),
-              content_type: Marcel::MimeType.for(v) || 'application/octet-stream'
+              content_type: MiniMime.lookup_by_filename(v.path)&.content_type || 'application/octet-stream'
             }]
           else
             [k, v]
           end
         }, 'multipart/form-data'
       when URLSearchParams
-        req['Content-Type'] ||= 'application/x-www-form-urlencoded'
-
-        req.body = body.to_s
+        req.set_form_data body.entries
       else
         req.body = body
       end

data/lib/fetch/form_data.rb

@@ -52,8 +52,6 @@ module Fetch
     end
 
     def each(&block)
-      return enum_for(:each) unless block_given?
-
       @entries.each(&block)
     end
   end

data/lib/fetch/headers.rb

@@ -43,8 +43,6 @@ module Fetch
     end
 
     def each(&block)
-      return enum_for(:each) unless block_given?
-
       entries.each(&block)
     end
   end

data/lib/fetch/response.rb

@@ -11,8 +11,8 @@ module Fetch
       Rack::Utils::HTTP_STATUS_CODES[status]
     end
 
-    def json(**opts)
-      JSON.parse(body, **opts)
+    def json(...)
+      JSON.parse(body, ...)
     end
   }
 end

data/lib/fetch/url_search_params.rb

@@ -63,8 +63,6 @@ module Fetch
     end
 
     def each(&block)
-      return enum_for(:each) unless block_given?
-
       @entries.each(&block)
     end
   end

data/lib/fetch/version.rb

@@ -1,3 +1,3 @@
 module Fetch
-  VERSION = '0.3.2'
+  VERSION = '0.3.4'
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: fetch-api
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - Keita Urashima
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-06 00:00:00.000000000 Z
+date: 2024-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: marcel
+  name: mini_mime
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="