fetch-api 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f3850dbddc3e46b5c6e59efdde4538c5c94e0464e94fb3ddd615e93d48a4e4f
-  data.tar.gz: 5783d23d208526c9f009f6ad15317a136ad22ddbb58d403cad655e7c6909034a
+  metadata.gz: 7c17efb152e74853bef394109a4f6012247e44e17277f22b49569249bb4ec01f
+  data.tar.gz: d1451560f1fc8a26a0a381d7c7fe1c69a5e0cdff9a3641706aeacea801ef724c
 SHA512:
-  metadata.gz: 77c50b51b5e084f405e26a6222bc388e1b2843f3f856db2f4f242fe64491ec31b8dd2f00532ff7099ab915b44bcf21f5edca3ca66bb5d9a0218f0f00c26100a3
-  data.tar.gz: bd4668f688f2a9cf06bab9eec7f471a61b8e5bd3c2d0408521f46b6b2b61e2054cf7057f71ebaf53028d20b8363f9e01586fa75bfec8d5ef7c1ad3b9e49a3d9c
+  metadata.gz: 480a9fba5b2d4ccb972122507dd907d2fae0ffe941d470e7bfb2f20cb39e0e81440c879d87d43192a7b67ff2673bc4e41c1c1237cbd2c8a5baeedc0ed2abcdee
+  data.tar.gz: b497f558eab4796ecc87a89cdfe696eb8ec68dc2b417215f1e2d0f34fa350b31965460ed2a810e50668bfa92a2c8f71329764a556141b990b4e826f44948ab80

data/lib/fetch/form_data.rb

@@ -1,13 +1,7 @@
-require 'forwardable'
+require_relative 'multi_map'
 
 module Fetch
-  class FormData
-    include Enumerable
-
-    extend Forwardable
-
-    def_delegators :entries, :each
-
+  class FormData < MultiMap
     def self.build(enumerable)
       data = FormData.new
 
@@ -18,43 +12,14 @@ module Fetch
       data
     end
 
-    def initialize
-      @entries = []
-    end
-
-    attr_reader :entries
-
-    def append(key, value)
-      @entries.push [key.to_s, File === value ? value : value.to_s]
-    end
-
-    def delete(key)
-      @entries.reject! {|k,| k == key.to_s }
-    end
-
-    def get(key)
-      @entries.assoc(key.to_s)&.last
-    end
-
-    def get_all(key)
-      @entries.select {|k,| k == key.to_s }.map(&:last)
-    end
-
-    def has(key)
-      @entries.any? {|k,| k == key.to_s }
-    end
-
-    def keys
-      @entries.map(&:first)
-    end
+    private
 
-    def set(key, value)
-      delete key
-      append key, value
+    def to_key(key)
+      key.to_s
     end
 
-    def values
-      @entries.map(&:last)
+    def to_value(value)
+      File === value ? value : value.to_s
     end
   end
 end

data/lib/fetch/headers.rb

@@ -1,13 +1,7 @@
-require 'forwardable'
-
 module Fetch
   class Headers
     include Enumerable
 
-    extend Forwardable
-
-    def_delegators :entries, :each
-
     def initialize(init = [])
       @data = {}
 
@@ -47,5 +41,9 @@ module Fetch
     def values
       @data.values.map { _1.join(', ') }
     end
+
+    def each(&block)
+      block ? entries.each(&block) : entries.each
+    end
   end
 end

data/lib/fetch/multi_map.rb

@@ -0,0 +1,58 @@
+module Fetch
+  class MultiMap
+    include Enumerable
+
+    def initialize
+      @entries = []
+    end
+
+    attr_reader :entries
+
+    def append(key, value)
+      @entries.push [to_key(key), to_value(value)]
+    end
+
+    def delete(key)
+      @entries.reject! {|k,| k == to_key(key) }
+    end
+
+    def get(key)
+      @entries.assoc(to_key(key))&.last
+    end
+
+    def get_all(key)
+      @entries.select {|k,| k == to_key(key) }.map(&:last)
+    end
+
+    def has(key)
+      @entries.any? {|k,| k == to_key(key) }
+    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(&)
+      @entries.each(&)
+    end
+
+    private
+
+    def to_key(key)
+      raise NotImplementedError
+    end
+
+    def to_value(value)
+      raise NotImplementedError
+    end
+  end
+end

data/lib/fetch/url_search_params.rb

@@ -1,16 +1,11 @@
-require 'forwardable'
+require_relative 'multi_map'
+
 require 'uri'
 
 module Fetch
-  class URLSearchParams
-    include Enumerable
-
-    extend Forwardable
-
-    def_delegators :entries, :each
-
+  class URLSearchParams < MultiMap
     def initialize(options = [])
-      @entries = []
+      super()
 
       case options
       when String
@@ -24,47 +19,22 @@ module Fetch
       end
     end
 
-    attr_reader :entries
-
-    def append(key, value)
-      @entries.push [key.to_s, value.to_s]
-    end
-
-    def delete(key)
-      @entries.reject! {|k,| k == key.to_s }
-    end
-
-    def get(key)
-      @entries.assoc(key.to_s)&.last
-    end
-
-    def get_all(key)
-      @entries.select {|k,| k == key.to_s }.map(&:last)
-    end
-
-    def has(key)
-      @entries.any? {|k,| k == key.to_s }
-    end
-
-    def keys
-      @entries.map(&:first)
+    def sort
+      entries.sort_by!(&:first)
     end
 
-    def set(key, value)
-      delete key
-      append key, value
+    def to_s
+      URI.encode_www_form(entries)
     end
 
-    def sort
-      @entries.sort_by!(&:first)
-    end
+    private
 
-    def to_s
-      URI.encode_www_form(@entries)
+    def to_key(key)
+      key.to_s
     end
 
-    def values
-      @entries.map(&:last)
+    def to_value(value)
+      value.to_s
     end
   end
 end

data/lib/fetch/version.rb

@@ -1,3 +1,3 @@
 module Fetch
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

data/sig/fetch/form_data.rbs

@@ -1,24 +1,5 @@
 module Fetch
-  class FormData
-    include Enumerable[[String, String | File]]
-
-    extend Forwardable
-
-    attr_reader entries: Array[[String, String | File]]
-
+  class FormData < MultiMap[_ToS, String, _ToS | File, String | File]
     def self.build: (_Each[[_ToS, _ToS | File]]) -> FormData
-
-    def initialize: () -> void
-    def append: (_ToS, _ToS | File) -> void
-    def delete: (_ToS) -> void
-    def get: (_ToS) -> (String | File)?
-    def get_all: (_ToS) -> Array[String | File]
-    def has: (_ToS) -> bool
-    def keys: -> Array[String]
-    def set: (_ToS, _ToS | File) -> void
-    def values: () -> Array[String | File]
-
-    def each: () { ([String, String | File]) -> void } -> Array[[String, String | File]]
-            | () -> Enumerator[[String, String | File], Array[[String, String | File]]]
   end
 end

data/sig/fetch/headers.rbs

@@ -2,8 +2,6 @@ module Fetch
   class Headers
     include Enumerable[[String, String]]
 
-    extend Forwardable
-
     def initialize: (_Each[[_ToS, _ToS]]) -> void
     def append: (_ToS, _ToS) -> void
     def delete: (_ToS) -> void

data/sig/fetch/multi_map.rbs

@@ -0,0 +1,23 @@
+module Fetch
+  class MultiMap[KIN, KOUT, VIN, VOUT]
+    include Enumerable[[KOUT, VOUT]]
+
+    def initialize: () -> void
+    def append: (KIN, VIN) -> void
+    def delete: (KIN) -> void
+    def get: (KIN) -> VOUT?
+    def get_all: (KIN) -> Array[VOUT]
+    def has: (KIN) -> bool
+    def keys: -> Array[KOUT]
+    def set: (KIN, VIN) -> void
+    def values: () -> Array[VOUT]
+
+    def each: () { ([KOUT, VOUT]) -> void } -> Array[[KOUT, VOUT]]
+            | () -> Enumerator[[KOUT, VOUT], Array[[KOUT, VOUT]]]
+
+    private
+
+    def to_key: (KIN) -> KOUT
+    def to_value: (VIN) -> VOUT
+  end
+end

data/sig/fetch/url_search_params.rbs

@@ -1,24 +1,7 @@
 module Fetch
-  class URLSearchParams
-    include Enumerable[[String, String]]
-
-    extend Forwardable
-
-    attr_reader entries: Array[[String, String]]
-
-    def self.build: (_Each[[_ToS, _ToS]]) -> FormData
-
+  class URLSearchParams < MultiMap[_ToS, String, _ToS, String]
     def initialize: (String | _Each[[_ToS, _ToS]]) -> void
-    def append: (_ToS, _ToS) -> void
-    def delete: (_ToS) -> void
-    def get: (_ToS) -> String?
-    def get_all: (_ToS) -> Array[String]
-    def has: (_ToS) -> bool
-    def keys: -> Array[String]
-    def set: (_ToS, _ToS) -> void
-    def values: () -> Array[String]
-
-    def each: () { ([String, String]) -> void } -> Array[[String, String]]
-            | () -> Enumerator[[String, String], Array[[String, String]]]
+    def sort: () -> void
+    def to_s: () -> String
   end
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fetch-api
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Keita Urashima
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-11 00:00:00.000000000 Z
+date: 2024-08-03 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: forwardable
-  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: json
   requirement: !ruby/object:Gem::Requirement
@@ -126,6 +112,7 @@ files:
 - lib/fetch/errors.rb
 - lib/fetch/form_data.rb
 - lib/fetch/headers.rb
+- lib/fetch/multi_map.rb
 - lib/fetch/response.rb
 - lib/fetch/url_search_params.rb
 - lib/fetch/version.rb
@@ -137,6 +124,7 @@ files:
 - sig/fetch/errors.rbs
 - sig/fetch/form_data.rbs
 - sig/fetch/headers.rbs
+- sig/fetch/multi_map.rbs
 - sig/fetch/response.rbs
 - sig/fetch/url_search_params.rbs
 - sig/fetch/version.rbs