fetch-api 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4686aace90255f6eceef759fe22002292101a0cb5cac4db2be0cbdf21cf398fa
-  data.tar.gz: 6dda2ecd4cde88807c27261f3d4eb866387b6e913e824cc0797e09618383284d
+  metadata.gz: 1b10573a6b8299637e5e694f582aeca98a5f6a98f034b5995715a1047e1fd52d
+  data.tar.gz: 704d073756a119bea36d3a65d2528726cb8ee514e94b70172f209577d4bca3b2
 SHA512:
-  metadata.gz: f5f6ba84be5732b1784ee0f67b4ea3b2e35a7e6b34d04c0b5808587f0d71bfc253f408bd3c7596cad79b2eddb7dbb6b794dfcf5adc34df77491a152c7a15120d
-  data.tar.gz: 41a3bab80a11cc7f0fc432504cc73d996e1d3b4dfad72b33ccd957bf77acff5bc0bfc00f50145d2dc561366f50b61885ae976650965a1aa408f5e748009aaec2
+  metadata.gz: '08f6657f264bbba58bdddda3f923c886cda73d5f853bfa3dfdea14896e35da915409a8408d2c0e08396db177f9fdc91e3807d91a241267157bbc801c914f0d93'
+  data.tar.gz: d8909c92cda908f4732280183f6e09317c1f51a899dabfb36aa2b5066c6bf69616ee8b3e6c4222c36936f6333743619274306b6467f7079234648e9b81c57cbb

data/README.md

@@ -45,10 +45,10 @@ res = fetch('https://example.com')
 
 Options for `fetch` method:
 
-- `method`: HTTP method (default: `'GET'`)
-- `headers`: Request headers (default: `{}`)
+- `method`: HTTP method (default: `:get`)
+- `headers`: Request headers (default: `[]`)
 - `body`: Request body (default: `nil`)
-- `redirect`: Follow redirects (one of `follow`, `error`, `manual`, default: `follow`)
+- `redirect`: Follow redirects (one of `:follow`, `:error`, `:manual`, default: `:follow`)
 
 Methods of `Fetch::Response` object:
 
@@ -65,7 +65,7 @@ Methods of `Fetch::Response` object:
 
 ``` ruby
 res = fetch('http://example.com', **{
-  method: 'POST',
+  method: :post,
 
   headers: {
     'Content-Type' => 'application/json'
@@ -81,7 +81,7 @@ res = fetch('http://example.com', **{
 
 ``` ruby
 res = fetch('http://example.com', **{
-  method: 'POST',
+  method: :post,
 
   body: Fetch::URLSearchParams.new(
     name: 'Alice'
@@ -93,7 +93,7 @@ res = fetch('http://example.com', **{
 
 ``` ruby
 res = fetch('http://example.com', **{
-  method: 'POST',
+  method: :post,
 
   body: Fetch::FormData.build(
     name: 'Alice',

data/lib/fetch/client.rb

@@ -1,4 +1,4 @@
-require_relative '../fetch'
+require_relative 'errors'
 require_relative 'form_data'
 require_relative 'headers'
 require_relative 'response'
@@ -13,32 +13,28 @@ 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)
 
-      headers = Headers.new(headers) unless headers.is_a?(Headers)
-
       headers.each do |k, v|
         req[k] = v
       end
 
       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: Marcel::MimeType.for(name: v.path)
             }]
           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
@@ -50,7 +46,7 @@ module Fetch
 
       case res
       when Net::HTTPRedirection
-        case redirect
+        case redirect.to_s
         when 'follow'
           fetch(res['Location'], method:, headers:, body:, redirect:, _redirected: true)
         when 'error'
@@ -58,7 +54,7 @@ module Fetch
         when 'manual'
           to_response(resource, res, _redirected)
         else
-          raise ArgumentError, "invalid redirect option: #{redirect}"
+          raise ArgumentError, "invalid redirect option: #{redirect.inspect}"
         end
       else
         to_response(resource, res, _redirected)
@@ -68,18 +64,10 @@ module Fetch
     private
 
     def to_response(url, res, redirected)
-      headers = Headers.new
-
-      res.each do |k, vs|
-        vs.split(', ').each do |v|
-          headers.append k, v
-        end
-      end
-
       Response.new(
         url:        ,
         status:     res.code.to_i,
-        headers:    ,
+        headers:    Headers.new(res),
         body:       res.body,
         redirected:
       )

data/lib/{fetch.rb → fetch/errors.rb}

@@ -1,5 +1,3 @@
-require_relative 'fetch/version'
-
 module Fetch
   class Error < StandardError; end
   class RedirectError < Error; 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.1'
+  VERSION = '0.3.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fetch-api
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 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
@@ -90,9 +90,9 @@ files:
 - LICENSE.txt
 - README.md
 - lib/fetch-api.rb
-- lib/fetch.rb
 - lib/fetch/api.rb
 - lib/fetch/client.rb
+- lib/fetch/errors.rb
 - lib/fetch/form_data.rb
 - lib/fetch/headers.rb
 - lib/fetch/response.rb