fetch-api 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae66c4ee1f7d2b11e55480e6456be9eb78f5b1f6a2da0a22fb0cef1b4388328b
-  data.tar.gz: 2995e13999494f718966a8dc3f293342593a17f88a0c003b702243ae710492e2
+  metadata.gz: dc8cbe5804a5286df86b5840189dbbe3c1cfc77e68bfd33b0ba3244be99af5c2
+  data.tar.gz: f72c409553a6b531803d084d8e862c77329ef785579e9a11b5a461fadd481ca3
 SHA512:
-  metadata.gz: 81683853c7d4e62b19dd0e4472b343958d656c361251239e160c44504b5671ba3b32078626433fd63f0be5a5a6290564cdc232f1db0a2c8dbbf462320b2102d8
-  data.tar.gz: ca6a9131aa1a4a3c504e74521b3c8244e89a66cc4f5e2e9bb27a7974352c910a7a869cd1ab96b531ccf694f3565e5ba93ae8de21d374006ac533ddb0f289241e
+  metadata.gz: 6051e1551078686b6624604b23966804684f7a764ffb76c467e79cf5bfd09e0025c8dd315803b0e7c8b1fe83874e349984c1a3fa325306fb4c09d1f855524e0c
+  data.tar.gz: 6340aa6ca403e46a023753fd08144081009512a3b97c12a3b035ac58aa951e49e1218e7d543a52151d9600022ed40773f00c655926eaa5d59b7fc9c3f9fc8ca3

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,50 @@
+module Fetch
+  class Headers
+    include Enumerable
+
+    def initialize(init = [])
+      @entries = []
+
+      init.each do |k, v|
+        append k, v
+      end
+    end
+
+    attr_reader :entries
+
+    def append(key, value)
+      @entries << [key.to_s.downcase, value]
+    end
+
+    def delete(key)
+      @entries.delete_if {|k,| k == key.to_s.downcase }
+    end
+
+    def get(key)
+      @entries.select {|k,| k == key.to_s.downcase }.map(&:last).join(', ')
+    end
+
+    def has(key)
+      @entries.any? {|k,| k == key.to_s.downcase }
+    end
+
+    def keys
+      @entries.map(&:first)
+    end
+
+    def set(key, value)
+      delete key
+      append key, value
+    end
+
+    def values
+      @entries.map(&:last)
+    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.0'
 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.0
 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:
   - - ">="