fetch-api 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4686aace90255f6eceef759fe22002292101a0cb5cac4db2be0cbdf21cf398fa
-  data.tar.gz: 6dda2ecd4cde88807c27261f3d4eb866387b6e913e824cc0797e09618383284d
+  metadata.gz: a5087cd966a296311bc208ed82ba9c4eb33cb7abb1ca1474efc611acdea73982
+  data.tar.gz: e58cb6110ac3a0e62945f486593c95d04096c80e495935a90e3a46de13211526
 SHA512:
-  metadata.gz: f5f6ba84be5732b1784ee0f67b4ea3b2e35a7e6b34d04c0b5808587f0d71bfc253f408bd3c7596cad79b2eddb7dbb6b794dfcf5adc34df77491a152c7a15120d
-  data.tar.gz: 41a3bab80a11cc7f0fc432504cc73d996e1d3b4dfad72b33ccd957bf77acff5bc0bfc00f50145d2dc561366f50b61885ae976650965a1aa408f5e748009aaec2
+  metadata.gz: 1b64dcee60dbe28b3700c53932ef584d900a5e112c0e2e13b8bb63627d6df3d835f4cba30beb340e15993087d482d7408a0d8dfa5ef62c47beffba08c44d8587
+  data.tar.gz: 676d8113e1edbe75d16389b23d24633e55fe5fd599195e989d87da2e22c248279e9d9ae272c36662e5a5dc750a28629c48c2708dd04709e007827ddf4c59d8f9

data/README.md

@@ -45,10 +45,10 @@ res = fetch('https://example.com')
 
 Options for `fetch` method:
 
-- `method`: HTTP method (default: `'GET'`)
+- `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,12 +13,10 @@ 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
@@ -50,7 +48,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 +56,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 +66,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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fetch-api
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Keita Urashima
@@ -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