fetch-api 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc8cbe5804a5286df86b5840189dbbe3c1cfc77e68bfd33b0ba3244be99af5c2
-  data.tar.gz: f72c409553a6b531803d084d8e862c77329ef785579e9a11b5a461fadd481ca3
+  metadata.gz: a5087cd966a296311bc208ed82ba9c4eb33cb7abb1ca1474efc611acdea73982
+  data.tar.gz: e58cb6110ac3a0e62945f486593c95d04096c80e495935a90e3a46de13211526
 SHA512:
-  metadata.gz: 6051e1551078686b6624604b23966804684f7a764ffb76c467e79cf5bfd09e0025c8dd315803b0e7c8b1fe83874e349984c1a3fa325306fb4c09d1f855524e0c
-  data.tar.gz: 6340aa6ca403e46a023753fd08144081009512a3b97c12a3b035ac58aa951e49e1218e7d543a52151d9600022ed40773f00c655926eaa5d59b7fc9c3f9fc8ca3
+  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/headers.rb

@@ -3,48 +3,49 @@ module Fetch
     include Enumerable
 
     def initialize(init = [])
-      @entries = []
+      @data = {}
 
       init.each do |k, v|
         append k, v
       end
     end
 
-    attr_reader :entries
-
     def append(key, value)
-      @entries << [key.to_s.downcase, value]
+      (@data[key.to_s.downcase] ||= []) << value
     end
 
     def delete(key)
-      @entries.delete_if {|k,| k == key.to_s.downcase }
+      @data.delete key.to_s.downcase
+    end
+
+    def entries
+      @data.map {|k, vs| [k, vs.join(', ')] }
     end
 
     def get(key)
-      @entries.select {|k,| k == key.to_s.downcase }.map(&:last).join(', ')
+      @data[key.to_s.downcase]&.join(', ')
     end
 
     def has(key)
-      @entries.any? {|k,| k == key.to_s.downcase }
+      @data.key?(key.to_s.downcase)
     end
 
     def keys
-      @entries.map(&:first)
+      @data.keys
     end
 
     def set(key, value)
-      delete key
-      append key, value
+      @data[key.to_s.downcase] = [value]
     end
 
     def values
-      @entries.map(&:last)
+      @data.values.map { _1.join(', ') }
     end
 
     def each(&block)
       return enum_for(:each) unless block_given?
 
-      @entries.each(&block)
+      entries.each(&block)
     end
   end
 end

data/lib/fetch/version.rb

@@ -1,3 +1,3 @@
 module Fetch
-  VERSION = '0.3.0'
+  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.0
+  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