Remove Headers::Mixin and [] / []= delegators from Request and Response

Closes #537.

Author: sferik

CHANGELOG.md

@@ -58,5 +58,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 
 - **BREAKING** Drop Ruby 2.x support
+- **BREAKING** Remove `Headers::Mixin` and the `[]`/`[]=` delegators on
+  `Request` and `Response`. Use `request.headers["..."]` and
+  `response.headers["..."]` instead (#537)
 
 [unreleased]: https://github.com/httprb/http/compare/v5.3.0...main

lib/http/headers.rb

@@ -3,7 +3,6 @@
 require "forwardable"
 
 require "http/errors"
-require "http/headers/mixin"
 require "http/headers/normalizer"
 require "http/headers/known"
 

lib/http/headers/mixin.rb

@@ -134,7 +134,7 @@ def cookie_jar
     # @api private
     # @return [void]
     def collect_cookies_from_request
-      request_cookie_header = @request["Cookie"]
+      request_cookie_header = @request.headers["Cookie"]
       cookies = Cookie.cookie_value_to_hash(request_cookie_header.to_s)
 
       cookies.each do |key, value|

lib/http/redirector.rb

@@ -18,7 +18,6 @@ class Request
     extend Forwardable
 
     include HTTP::Base64
-    include HTTP::Headers::Mixin
     include Proxy
 
     # The method given was not understood
@@ -125,6 +124,15 @@ class UnsupportedSchemeError < RequestError; end
     # @api public
     attr_reader :body
 
+    # The HTTP headers collection
+    #
+    # @example
+    #   request.headers
+    #
+    # @return [HTTP::Headers]
+    # @api public
+    attr_reader :headers
+
     # HTTP version string
     #
     # @example

lib/http/request.rb

@@ -16,8 +16,6 @@ module HTTP
   class Response
     extend Forwardable
 
-    include HTTP::Headers::Mixin
-
     # The response status
     #
     # @example
@@ -54,6 +52,15 @@ class Response
     # @api public
     attr_reader :request
 
+    # The HTTP headers collection
+    #
+    # @example
+    #   response.headers
+    #
+    # @return [HTTP::Headers] the response headers
+    # @api public
+    attr_reader :headers
+
     # The proxy headers
     #
     # @example

lib/http/response.rb

@@ -185,14 +185,6 @@ module HTTP
   end
 
   class Headers
-    module Mixin
-      extend Forwardable
-
-      attr_reader headers: Headers
-      def []: (untyped name) -> (String | Array[String] | nil)
-      def []=: (untyped name, untyped value) -> void
-    end
-
     class Normalizer
       CANONICAL_NAME_RE: Regexp
       COMPLIANT_NAME_RE: Regexp
@@ -558,7 +550,6 @@ module HTTP
 
   class Request
     extend Forwardable
-    include Headers::Mixin
     include Base64
     include Request::Proxy
 
@@ -579,6 +570,7 @@ module HTTP
     attr_reader uri: URI
     attr_reader proxy: Hash[untyped, untyped]
     attr_reader body: Request::Body
+    attr_reader headers: Headers
     attr_reader version: String
 
     def initialize: (untyped opts) -> void
@@ -679,13 +671,13 @@ module HTTP
 
   class Response
     extend Forwardable
-    include Headers::Mixin
 
     @content_type: ContentType
     @cookies: untyped
 
     attr_reader status: Response::Status
     attr_reader version: String
+    attr_reader headers: Headers
     attr_reader body: Response::Body
     attr_reader request: Request
     attr_reader proxy_headers: untyped

sig/http.rbs

@@ -255,7 +255,7 @@ def parse_query(str)
       req = capture_request(client) { client.get("http://example.com/", json: { foo: :bar }) }
 
       assert_equal '{"foo":"bar"}', req.body.source
-      assert_equal "application/json; charset=utf-8", req["Content-Type"]
+      assert_equal "application/json; charset=utf-8", req.headers["Content-Type"]
     end
   end
 
@@ -279,7 +279,7 @@ def parse_query(str)
       it "keeps Host header as is" do
         req = capture_request(client) { client.request(:get, "http://example.com/") }
 
-        assert_equal "another.example.com", req["Host"]
+        assert_equal "another.example.com", req.headers["Host"]
       end
     end
 
@@ -290,13 +290,13 @@ def parse_query(str)
       it "deletes Content-Length header" do
         req = capture_request(client) { client.request(:get, "http://example.com/") }
 
-        assert_nil req["Content-Length"]
+        assert_nil req.headers["Content-Length"]
       end
 
       it "sets Content-Encoding header" do
         req = capture_request(client) { client.request(:get, "http://example.com/") }
 
-        assert_equal "gzip", req["Content-Encoding"]
+        assert_equal "gzip", req.headers["Content-Encoding"]
       end
 
       context "and there is no body" do

test/http/client_test.rb

@@ -660,7 +660,7 @@ def empty_body
         ]
 
         redirector.perform(req, hops.shift) do |request|
-          assert_equal "Bearer secret", request["Authorization"]
+          assert_equal "Bearer secret", request.headers["Authorization"]
           hops.shift
         end
       end
@@ -674,7 +674,7 @@ def empty_body
         ]
 
         redirector.perform(req, hops.shift) do |request|
-          assert_nil request["Authorization"]
+          assert_nil request.headers["Authorization"]
           hops.shift
         end
       end
@@ -688,7 +688,7 @@ def empty_body
         ]
 
         redirector.perform(req, hops.shift) do |request|
-          assert_nil request["Authorization"]
+          assert_nil request.headers["Authorization"]
           hops.shift
         end
       end
@@ -702,7 +702,7 @@ def empty_body
         ]
 
         redirector.perform(req, hops.shift) do |request|
-          assert_nil request["Authorization"]
+          assert_nil request.headers["Authorization"]
           hops.shift
         end
       end