fetch-api 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b10573a6b8299637e5e694f582aeca98a5f6a98f034b5995715a1047e1fd52d
-  data.tar.gz: 704d073756a119bea36d3a65d2528726cb8ee514e94b70172f209577d4bca3b2
+  metadata.gz: c2ece1d340c0de1c25cf5ff54b2faa9282e457a398b1e02e8b1254c869643e63
+  data.tar.gz: af89501158b402c8b5a2d5ac6961a93546b5a6caa78c8f27492ff1b0fc4b5be4
 SHA512:
-  metadata.gz: '08f6657f264bbba58bdddda3f923c886cda73d5f853bfa3dfdea14896e35da915409a8408d2c0e08396db177f9fdc91e3807d91a241267157bbc801c914f0d93'
-  data.tar.gz: d8909c92cda908f4732280183f6e09317c1f51a899dabfb36aa2b5066c6bf69616ee8b3e6c4222c36936f6333743619274306b6467f7079234648e9b81c57cbb
+  metadata.gz: f42136117dc9ff72634fdd12774dd6bc270d3c7f58363a0b78c74e216f12b241d35f60329f3957219d79a3d6b81ffb1b73917a7788647252b42a5271056df5fb
+  data.tar.gz: 9902db054b692dc72bd645c7d7030ec7392369d41e70d3d27b64b19f871294749e065eae638604b23ab418133a16c0b13d444bb132aab96274327482c516ecff

data/lib/fetch/client.rb

@@ -4,8 +4,9 @@ require_relative 'headers'
 require_relative 'response'
 require_relative 'url_search_params'
 
-require 'marcel'
+require 'mini_mime'
 require 'net/http'
+require 'net/https'
 require 'singleton'
 require 'uri'
 
@@ -18,7 +19,7 @@ module Fetch
       req = Net::HTTP.const_get(method.capitalize).new(uri)
 
       headers.each do |k, v|
-        req[k] = v
+        req[k.to_s] = v.to_s
       end
 
       case body
@@ -27,7 +28,7 @@ module Fetch
           if v.is_a?(File)
             [k, v, {
               filename:     File.basename(v.path),
-              content_type: Marcel::MimeType.for(name: v.path)
+              content_type: MiniMime.lookup_by_filename(v.path)&.content_type || 'application/octet-stream'
             }]
           else
             [k, v]
@@ -39,7 +40,7 @@ module Fetch
         req.body = body
       end
 
-      http = Net::HTTP.new(uri.hostname, uri.port)
+      http = Net::HTTP.new(uri.hostname, uri.port) # steep:ignore ArgumentTypeMismatch
       http.use_ssl = uri.scheme == 'https'
 
       res = http.start { _1.request(req) }
@@ -48,7 +49,7 @@ module Fetch
       when Net::HTTPRedirection
         case redirect.to_s
         when 'follow'
-          fetch(res['Location'], method:, headers:, body:, redirect:, _redirected: true)
+          fetch(res['Location'], method:, headers:, body:, redirect:, _redirected: true) # steep:ignore ArgumentTypeMismatch
         when 'error'
           raise RedirectError, "redirected to #{res['Location']}"
         when 'manual'
@@ -65,9 +66,9 @@ module Fetch
 
     def to_response(url, res, redirected)
       Response.new(
-        url:        ,
+        url:        url.to_str,
         status:     res.code.to_i,
-        headers:    Headers.new(res),
+        headers:    Headers.new(res.each),
         body:       res.body,
         redirected:
       )

data/lib/fetch/form_data.rb

@@ -19,7 +19,7 @@ module Fetch
     attr_reader :entries
 
     def append(key, value)
-      @entries.push [key.to_s, value]
+      @entries.push [key.to_s, value.is_a?(File) ? value : value.to_s]
     end
 
     def delete(key)
@@ -51,8 +51,8 @@ module Fetch
       @entries.map(&:last)
     end
 
-    def each(&block)
-      @entries.each(&block)
+    def each(&)
+      @entries.each(&)
     end
   end
 end

data/lib/fetch/headers.rb

@@ -11,7 +11,7 @@ module Fetch
     end
 
     def append(key, value)
-      (@data[key.to_s.downcase] ||= []) << value
+      (@data[key.to_s.downcase] ||= []) << value.to_s
     end
 
     def delete(key)
@@ -42,8 +42,8 @@ module Fetch
       @data.values.map { _1.join(', ') }
     end
 
-    def each(&block)
-      entries.each(&block)
+    def each(&)
+      entries.each(&)
     end
   end
 end

data/lib/fetch/response.rb

@@ -2,7 +2,17 @@ require 'json'
 require 'rack/utils'
 
 module Fetch
-  Response = Data.define(:url, :status, :headers, :body, :redirected) {
+  class Response
+    def initialize(url:, status:, headers:, body:, redirected:)
+      @url        = url
+      @status     = status
+      @headers    = headers
+      @body       = body
+      @redirected = redirected
+    end
+
+    attr_reader :url, :status, :headers, :body, :redirected
+
     def ok
       status.between?(200, 299)
     end
@@ -12,7 +22,9 @@ module Fetch
     end
 
     def json(...)
+      return nil unless body
+
       JSON.parse(body, ...)
     end
-  }
+  end
 end

data/lib/fetch/url_search_params.rb

@@ -22,7 +22,7 @@ module Fetch
     attr_reader :entries
 
     def append(key, value)
-      @entries.push [key.to_s, value]
+      @entries.push [key.to_s, value.to_s]
     end
 
     def delete(key)
@@ -62,8 +62,8 @@ module Fetch
       @entries.map(&:last)
     end
 
-    def each(&block)
-      @entries.each(&block)
+    def each(&)
+      @entries.each(&)
     end
   end
 end

data/lib/fetch/version.rb

@@ -1,3 +1,3 @@
 module Fetch
-  VERSION = '0.3.3'
+  VERSION = '0.3.5'
 end

data/sig/fetch/api.rbs

@@ -0,0 +1,11 @@
+module Fetch
+  class API
+    def self?.fetch: (
+      _StringLike,
+      ?method: String | Symbol,
+      ?headers: Enumerable[[Object, Object]],
+      ?body: (String | FormData | URLSearchParams)?,
+      ?redirect: 'follow' | 'error' | 'manual' | :follow | :error | :manual,
+    ) -> Response
+  end
+end

data/sig/fetch/client.rbs

@@ -0,0 +1,18 @@
+module Fetch
+  class Client
+    include Singleton
+
+    def fetch: (
+      _StringLike,
+      ?method: String | Symbol,
+      ?headers: Enumerable[[Object, Object]],
+      ?body: (String | FormData | URLSearchParams)?,
+      ?redirect: 'follow' | 'error' | 'manual' | :follow | :error | :manual,
+      ?_redirected: bool
+    ) -> Response
+
+    private
+
+    def to_response: (_StringLike, Net::HTTPResponse, bool) -> Response
+  end
+end

data/sig/fetch/errors.rbs

@@ -0,0 +1,7 @@
+module Fetch
+  class Error < StandardError
+  end
+
+  class RedirectError < Error
+  end
+end

data/sig/fetch/form_data.rbs

@@ -0,0 +1,22 @@
+module Fetch
+  class FormData
+    type value = String | File
+
+    include Enumerable[[String, value]]
+
+    attr_reader entries: Array[[String, value]]
+
+    def self.build: (Enumerable[[Object, Object]]) -> FormData
+
+    def initialize: () -> void
+    def append: (Object, Object) -> void
+    def delete: (Object) -> void
+    def get: (Object) -> value?
+    def get_all: (Object) -> Array[value]
+    def has: (Object) -> bool
+    def keys: -> Array[String]
+    def set: (Object, Object) -> void
+    def values: () -> Array[value]
+    def each: () { ([String, value]) -> void } -> Array[[String, value]]
+  end
+end

data/sig/fetch/headers.rbs

@@ -0,0 +1,16 @@
+module Fetch
+  class Headers
+    include Enumerable[[String, String]]
+
+    def initialize: (Enumerable[[Object, Object]]) -> void
+    def append: (Object, Object) -> void
+    def delete: (Object) -> void
+    def entries: () -> Array[[String, String]]
+    def get: (Object) -> String?
+    def has: (Object) -> bool
+    def keys: -> Array[String]
+    def set: (Object, Object) -> void
+    def values: () -> Array[String]
+    def each: () { ([String, String]) -> void } -> Array[[String, String]]
+  end
+end

data/sig/fetch/response.rbs

@@ -0,0 +1,16 @@
+module Fetch
+  class Response
+    include Data::_DataClass
+
+    attr_reader url: String
+    attr_reader status: Integer
+    attr_reader headers: Headers
+    attr_reader body: String?
+    attr_reader redirected: bool
+
+    def initialize: (url: String, status: Integer, headers: Headers, body: String?, redirected: bool) -> void
+    def ok: () -> bool
+    def status_text: () -> String
+    def json: (json_options) -> Object?
+  end
+end

data/sig/fetch/url_search_params.rbs

@@ -0,0 +1,20 @@
+module Fetch
+  class URLSearchParams
+    include Enumerable[[String, String]]
+
+    attr_reader entries: Array[[String, String]]
+
+    def self.build: (Enumerable[[Object, Object]]) -> FormData
+
+    def initialize: (String | Enumerable[[Object, Object]]) -> void
+    def append: (Object, Object) -> void
+    def delete: (Object) -> void
+    def get: (Object) -> String?
+    def get_all: (Object) -> Array[String]
+    def has: (Object) -> bool
+    def keys: -> Array[String]
+    def set: (Object, Object) -> void
+    def values: () -> Array[String]
+    def each: () { ([String, String]) -> void } -> Array[[String, String]]
+  end
+end

data/sig/fetch.rbs

@@ -1,4 +1,7 @@
 module Fetch
+  interface _StringLike
+    def to_str: () -> String
+  end
+
   VERSION: String
-  # See the writing guide of rbs: https://github.com/ruby/rbs#guides
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fetch-api
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.5
 platform: ruby
 authors:
 - Keita Urashima
@@ -11,7 +11,21 @@ cert_chain: []
 date: 2024-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: marcel
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mini_mime
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -99,6 +113,13 @@ files:
 - lib/fetch/url_search_params.rb
 - lib/fetch/version.rb
 - sig/fetch.rbs
+- sig/fetch/api.rbs
+- sig/fetch/client.rbs
+- sig/fetch/errors.rbs
+- sig/fetch/form_data.rbs
+- sig/fetch/headers.rbs
+- sig/fetch/response.rbs
+- sig/fetch/url_search_params.rbs
 homepage: https://github.com/ursm/fetch-api
 licenses:
 - MIT
@@ -113,7 +134,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.2.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="