Replace query_values delegation with stdlib URI encoding

Remove query_values/query_values= delegations from HTTP::URI. Query
parameter merging in Request::Builder now uses stdlib
URI.decode_www_form/URI.encode_www_form instead of Addressable's
query_values API.

Author: sferik

CHANGELOG.md

@@ -80,6 +80,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `HTTP::URI#request_uri` is no longer delegated to `Addressable::URI`
 - `HTTP::URI#omit` is no longer delegated to `Addressable::URI` and now
   returns `HTTP::URI` instead of `Addressable::URI` (#491)
+- `HTTP::URI#query_values` and `HTTP::URI#query_values=` delegations to
+  `Addressable::URI`. Query parameter merging now uses stdlib
+  `URI.decode_www_form`/`URI.encode_www_form`
 
 ### Changed
 

Steepfile

@@ -13,5 +13,6 @@ target :lib do
   library "socket"
   library "tempfile"
   library "timeout"
+  library "uri"
   library "zlib"
 end

lib/http/request/builder.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "uri"
+
 require "http/form_data"
 require "http/headers"
 require "http/connection"
@@ -126,7 +128,8 @@ def resolve_against_base(uri)
       def merge_query_params!(uri)
         return unless @options.params && !@options.params.empty?
 
-        uri.query_values = uri.query_values(Array).to_a.concat(@options.params.to_a)
+        existing = ::URI.decode_www_form(uri.query || "")
+        uri.query = ::URI.encode_www_form(existing.concat(@options.params.to_a))
       end
 
       # Creates request headers

lib/http/uri.rb

@@ -12,7 +12,7 @@ class InvalidError < HTTP::RequestError; end
 
     def_delegators :@uri, :scheme, :normalized_scheme, :user, :password,
                    :authority, :normalized_authority
-    def_delegators :@uri, :path, :path=, :query, :query=, :query_values, :query_values=
+    def_delegators :@uri, :path, :path=, :query, :query=
     def_delegators :@uri, :fragment, :normalized_fragment, :join, :normalize
 
     # Host, either a domain name or IP address

sig/http.rbs

@@ -608,8 +608,6 @@ module HTTP
     def path=: (String) -> String
     def query: () -> String?
     def query=: (String?) -> String?
-    def query_values: (?untyped notation) -> untyped
-    def query_values=: (untyped) -> untyped
     def request_uri: () -> String
     def fragment: () -> String?
     def normalized_fragment: () -> String?