fetch-api 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae66c4ee1f7d2b11e55480e6456be9eb78f5b1f6a2da0a22fb0cef1b4388328b
-  data.tar.gz: 2995e13999494f718966a8dc3f293342593a17f88a0c003b702243ae710492e2
+  metadata.gz: 4686aace90255f6eceef759fe22002292101a0cb5cac4db2be0cbdf21cf398fa
+  data.tar.gz: 6dda2ecd4cde88807c27261f3d4eb866387b6e913e824cc0797e09618383284d
 SHA512:
-  metadata.gz: 81683853c7d4e62b19dd0e4472b343958d656c361251239e160c44504b5671ba3b32078626433fd63f0be5a5a6290564cdc232f1db0a2c8dbbf462320b2102d8
-  data.tar.gz: ca6a9131aa1a4a3c504e74521b3c8244e89a66cc4f5e2e9bb27a7974352c910a7a869cd1ab96b531ccf694f3565e5ba93ae8de21d374006ac533ddb0f289241e
+  metadata.gz: f5f6ba84be5732b1784ee0f67b4ea3b2e35a7e6b34d04c0b5808587f0d71bfc253f408bd3c7596cad79b2eddb7dbb6b794dfcf5adc34df77491a152c7a15120d
+  data.tar.gz: 41a3bab80a11cc7f0fc432504cc73d996e1d3b4dfad72b33ccd957bf77acff5bc0bfc00f50145d2dc561366f50b61885ae976650965a1aa408f5e748009aaec2

data/README.md

@@ -29,8 +29,8 @@ require 'fetch-api'
 
 res = Fetch::API.fetch('https://example.com')
 
-# res is a Rack::Response object
-puts res.body.first
+# res is a Fetch::Response object
+puts res.body
 ```
 
 or
@@ -43,13 +43,24 @@ include Fetch::API
 res = fetch('https://example.com')
 ```
 
-Supported options are as follows:
+Options for `fetch` method:
 
 - `method`: HTTP method (default: `'GET'`)
 - `headers`: Request headers (default: `{}`)
 - `body`: Request body (default: `nil`)
 - `redirect`: Follow redirects (one of `follow`, `error`, `manual`, default: `follow`)
 
+Methods of `Fetch::Response` object:
+
+- `body`: Response body (String)
+- `headers`: Response headers
+- `ok`: Whether the response was successful or not (status code is in the range 200-299)
+- `redirected`: Whether the response is the result of a redirect
+- `status`: Status code (e.g. `200`, `404`)
+- `status_text`: Status text (e.g. `'OK'`, `'Not Found'`)
+- `url`: Response URL
+- `json(**args)`: An object that parses the response body as JSON. The arguments are passed to `JSON.parse`
+
 ### Post JSON
 
 ``` ruby

data/lib/fetch/client.rb

@@ -1,10 +1,11 @@
 require_relative '../fetch'
 require_relative 'form_data'
+require_relative 'headers'
+require_relative 'response'
 require_relative 'url_search_params'
 
 require 'marcel'
 require 'net/http'
-require 'rack/response'
 require 'singleton'
 require 'uri'
 
@@ -12,10 +13,12 @@ module Fetch
   class Client
     include Singleton
 
-    def fetch(resource, method: 'GET', headers: {}, body: nil, redirect: 'follow')
+    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
@@ -49,23 +52,37 @@ module Fetch
       when Net::HTTPRedirection
         case redirect
         when 'follow'
-          fetch(res['Location'], method:, headers:, body:, redirect:)
+          fetch(res['Location'], method:, headers:, body:, redirect:, _redirected: true)
         when 'error'
           raise RedirectError, "redirected to #{res['Location']}"
         when 'manual'
-          to_rack_response(res)
+          to_response(resource, res, _redirected)
         else
           raise ArgumentError, "invalid redirect option: #{redirect}"
         end
       else
-        to_rack_response(res)
+        to_response(resource, res, _redirected)
       end
     end
 
     private
 
-    def to_rack_response(res)
-      Rack::Response.new(res.body, res.code, res.to_hash)
+    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:    ,
+        body:       res.body,
+        redirected:
+      )
     end
   end
 end

data/lib/fetch/headers.rb

@@ -0,0 +1,51 @@
+module Fetch
+  class Headers
+    include Enumerable
+
+    def initialize(init = [])
+      @data = {}
+
+      init.each do |k, v|
+        append k, v
+      end
+    end
+
+    def append(key, value)
+      (@data[key.to_s.downcase] ||= []) << value
+    end
+
+    def delete(key)
+      @data.delete key.to_s.downcase
+    end
+
+    def entries
+      @data.map {|k, vs| [k, vs.join(', ')] }
+    end
+
+    def get(key)
+      @data[key.to_s.downcase]&.join(', ')
+    end
+
+    def has(key)
+      @data.key?(key.to_s.downcase)
+    end
+
+    def keys
+      @data.keys
+    end
+
+    def set(key, value)
+      @data[key.to_s.downcase] = [value]
+    end
+
+    def values
+      @data.values.map { _1.join(', ') }
+    end
+
+    def each(&block)
+      return enum_for(:each) unless block_given?
+
+      entries.each(&block)
+    end
+  end
+end

data/lib/fetch/response.rb

@@ -0,0 +1,18 @@
+require 'json'
+require 'rack/utils'
+
+module Fetch
+  Response = Data.define(:url, :status, :headers, :body, :redirected) {
+    def ok
+      status.between?(200, 299)
+    end
+
+    def status_text
+      Rack::Utils::HTTP_STATUS_CODES[status]
+    end
+
+    def json(**opts)
+      JSON.parse(body, **opts)
+    end
+  }
+end

data/lib/fetch/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fetch-api
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Keita Urashima
@@ -94,6 +94,8 @@ files:
 - lib/fetch/api.rb
 - lib/fetch/client.rb
 - lib/fetch/form_data.rb
+- lib/fetch/headers.rb
+- lib/fetch/response.rb
 - lib/fetch/url_search_params.rb
 - lib/fetch/version.rb
 - sig/fetch.rbs
@@ -111,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="