excon 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a1cbd57e645d8d22b4180e346b0fcf365165ffb9e95a69a83fe805f56d50e16
-  data.tar.gz: e073309fd959dded213203af46f07bccded5fc8c1fe4b879902a9b04e5d82046
+  metadata.gz: 3a905930d349f68ec0851844a4107cd3e2e1b7cbf16283fa72bc8795db20c260
+  data.tar.gz: 1a5382bd4a2e03269d54272ecab5f90aac343f572be0b2c4dc27b567f8054402
 SHA512:
-  metadata.gz: 109ed16c1c5f49cc84261a0c271c0f8769aabc9258a1482842d1c2f48b96ff48ce558b7018b01a1054d57b0f15f4321430e6cfb5f2f8af354150b41dec976d24
-  data.tar.gz: cb8c80990fea59470508ada7fcff74f217229c2f8f973d5369ef7f7beb32e105fb10013164427f787bcc38ff77f601fe617f0644a9a70407eaf405409444edfc
+  metadata.gz: 9d76128a6817cb8cdfc77109b27ea7cbbb68ddc46d4335fa753711858e8c48db8eeca286ab0f1e1b3885d0b8aa589fe597a5559fa968e7f13e434abb33b05156
+  data.tar.gz: c89be296753470add2742bf9326ff27854968acfd152f9dfacdf2ff33e81a6c09491e32832ef9eb61dc7a23182d28fb5e1053a8e9b703bc3d3674414e408b958

data/lib/excon/ssl_socket.rb

@@ -108,7 +108,7 @@ module Excon
       end
 
       if @data[:proxy]
-        request = "CONNECT #{@data[:host]}#{Excon::HTTP_1_1}" \
+        request = "CONNECT #{@data[:host]}#{port_string(@data)}#{Excon::HTTP_1_1}" \
                   "Host: #{@data[:host]}#{port_string(@data)}#{Excon::CR_NL}"
 
         if @data[:proxy].has_key?(:user) || @data[:proxy].has_key?(:password)

data/lib/excon/utils.rb

@@ -69,23 +69,6 @@ module Excon
       end
     end
 
-    # Used to normalize queries for stubs, based on Rack::Utils.parse_query
-    def parse_query_string(string)
-      params = {}
-
-      string.split(/[&;] */n).each do |pair|
-        key, value = pair.split('=', 2).map { |x| CGI.unescape(x) }
-
-        params[key] = if params[key]
-                        [params[key], value].flatten
-                      else
-                        value
-                      end
-      end
-
-      params
-    end
-
     def default_port?(datum)
       (!datum[:scheme]&.casecmp?('unix') && datum[:port].nil?) ||
         (datum[:scheme]&.casecmp?('http') && datum[:port] == 80) ||

data/lib/excon/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Excon
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/lib/excon.rb

@@ -162,9 +162,7 @@ module Excon
         end
         request_params[:headers] = headers
       end
-      if request_params.key?(:query) && request_params[:query].instance_of?(String)
-        request_params[:query] = Utils.parse_query_string(request_params[:query])
-      end
+      request_params[:query] = Utils.query_string(request_params)[1...] if request_params.key?(:query)
       if block_given?
         raise(ArgumentError, 'stub requires either response_params OR a block') if response_params
 
@@ -185,9 +183,7 @@ module Excon
       if (method = request_params.delete(:method))
         request_params[:method] = method.to_s.downcase.to_sym
       end
-      if request_params.key?(:query) && request_params[:query].instance_of?(String)
-        request_params[:query] = Utils.parse_query_string(request_params[:query])
-      end
+      request_params[:query] = Utils.query_string(request_params)[1...] if request_params.key?(:query)
       Excon.stubs.each do |stub, response_params|
         captures = { headers: {} }
         headers_match = !stub.key?(:headers) || stub[:headers].keys.all? do |key|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - dpiddy (Dan Peterson)
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-29 00:00:00.000000000 Z
+date: 2024-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec