Refactor

Author: ursm

Gemfile.lock

@@ -2,7 +2,6 @@ PATH
   remote: .
   specs:
     fetch-api (0.5.0)
-      forwardable
       json
       mini_mime
       net-http
@@ -34,7 +33,6 @@ GEM
     ffi (1.17.0)
     ffi (1.17.0-x86_64-linux-gnu)
     fileutils (1.7.2)
-    forwardable (1.3.3)
     i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     json (2.7.2)

Steepfile

@@ -3,7 +3,6 @@
 
    check 'lib'
 
-   library 'forwardable'
    library 'json'
    library 'mini_mime'
    library 'net-http'

fetch-api.gemspec

@@ -25,7 +25,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { File.basename(_1) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'forwardable'
   spec.add_dependency 'json'
   spec.add_dependency 'mini_mime'
   spec.add_dependency 'net-http'

lib/fetch/form_data.rb

@@ -1,7 +1,5 @@
 require_relative 'multi_map'
 
-require 'forwardable'
-
 module Fetch
   class FormData < MultiMap
     def self.build(enumerable)

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 @@ def set(key, value)
     def values
       @data.values.map { _1.join(', ') }
     end
+
+    def each(&block)
+      block ? entries.each(&block) : entries.each
+    end
   end
 end

lib/fetch/multi_map.rb

@@ -41,8 +41,8 @@ def values
       @entries.map(&:last)
     end
 
-    def each(...)
-      @entries.each(...)
+    def each(&)
+      @entries.each(&)
     end
 
     private

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