excon 1.0.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 955c2ed7f6ee55d4a279f386f6041f2d465640bd2c49930fcb213f0e63852e17
-  data.tar.gz: 49190e08fa385b6bd878096da5df9ad062c8e643477930e60916908581c1ef02
+  metadata.gz: 9cadb0fca5300321fa61bcdb57371355155c81328976a0f9e656e73b272e7b2c
+  data.tar.gz: 82fcc66b00fbda3159cab3153e8a084b68bf5c5fc193e5c2fb1b3eca511e8999
 SHA512:
-  metadata.gz: d5fcebc27e76063b3be519a0eae585eabd4b3a40591fef96c1750cd7ddfcd9df940a760907f6f7717ab4628eb3f036640afe8da51312ec2741eb5eb8a13a612d
-  data.tar.gz: 10a234e21629066f1a6682c0c63a0f9bf60bd211ea13018ad5951c3012268e6826d88459d9bcee63518e2a3ccd1558dabb1fba03c9e7d450281d4ab7f8bc6c1a
+  metadata.gz: 696637b0c1d203447e5b45ca73c7d5c97ed8dc2dea05c60873828b661c2d63f44a9c10b4970cc6ec79b9daa05abae603a5e015297c6c67046a8318c0768aa4e8
+  data.tar.gz: 62ec0190538e8ed8665e8f9bf95108d5acf9e3f6a4f7c71200dde2d6582c99fe444d9b6a2450c1f101d98ec784df4537fd677ed21744fd2d9c6d44b6fb5ef606

data/lib/excon/connection.rb

@@ -138,7 +138,7 @@ module Excon
 
             # The HTTP spec isn't clear on it, but specifically, GET requests don't usually send bodies;
             # if they don't, sending Content-Length:0 can cause issues.
-            unless datum[:method].to_s.casecmp('GET') == 0 && body.nil?
+            unless datum[:method].to_s.casecmp?('GET') && body.nil?
               unless datum[:headers].has_key?('Content-Length')
                 datum[:headers]['Content-Length'] = detect_content_length(body)
               end
@@ -250,7 +250,7 @@ module Excon
         datum[:headers]['Authorization'] ||= 'Basic ' + ["#{user}:#{pass}"].pack('m').delete(Excon::CR_NL)
       end
 
-      host_key = datum[:headers].keys.detect {|k| k.casecmp('Host') == 0 } || 'Host'
+      host_key = datum[:headers].keys.detect {|k| k.casecmp?('Host') } || 'Host'
       if datum[:scheme] == UNIX
         datum[:headers][host_key] ||= ''
       else
@@ -298,8 +298,8 @@ module Excon
         @persistent_socket_reusable = true
 
         if datum[:persistent]
-          if (key = datum[:response][:headers].keys.detect {|k| k.casecmp('Connection') == 0 })
-            if datum[:response][:headers][key].casecmp('close') == 0
+          if (key = datum[:response][:headers].keys.detect {|k| k.casecmp?('Connection') })
+            if datum[:response][:headers][key].casecmp?('close')
               reset
             end
           end
@@ -338,8 +338,8 @@ module Excon
       end
 
       if @data[:persistent]
-        if (key = responses.last[:headers].keys.detect {|k| k.casecmp('Connection') == 0 })
-          if responses.last[:headers][key].casecmp('close') == 0
+        if (key = responses.last[:headers].keys.detect {|k| k.casecmp?('Connection') })
+          if responses.last[:headers][key].casecmp?('close')
             reset
           end
         end

data/lib/excon/middlewares/capture_cookies.rb

@@ -9,7 +9,7 @@ module Excon
 
       def get_header(datum, header)
         _, header_value = datum[:response][:headers].detect do |key, _|
-          key.casecmp(header) == 0
+          key.casecmp?(header)
         end
         header_value
       end

data/lib/excon/middlewares/decompress.rb

@@ -8,7 +8,7 @@ module Excon
 
       def request_call(datum)
         unless datum.key?(:response_block)
-          key = datum[:headers].keys.detect { |k| k.to_s.casecmp('Accept-Encoding').zero? } || 'Accept-Encoding'
+          key = datum[:headers].keys.detect { |k| k.to_s.casecmp?('Accept-Encoding') } || 'Accept-Encoding'
           datum[:headers][key] = 'deflate, gzip' if datum[:headers][key].to_s.empty?
         end
         @stack.request_call(datum)
@@ -17,16 +17,16 @@ module Excon
       def response_call(datum)
         body = datum[:response][:body]
         if !(datum.key?(:response_block) || body.nil? || body.empty?) &&
-           (key = datum[:response][:headers].keys.detect { |k| k.casecmp('Content-Encoding').zero? })
+           (key = datum[:response][:headers].keys.detect { |k| k.casecmp?('Content-Encoding') })
           encodings = Utils.split_header_value(datum[:response][:headers][key])
-          if encodings.last.casecmp('deflate').zero?
+          if encodings&.last&.casecmp?('deflate')
             datum[:response][:body] = begin
               Zlib::Inflate.new(INFLATE_ZLIB_OR_GZIP).inflate(body)
             rescue Zlib::DataError # fallback to raw on error
               Zlib::Inflate.new(INFLATE_RAW).inflate(body)
             end
             encodings.pop
-          elsif encodings.last.casecmp('gzip').zero? || encodings.last.casecmp('x-gzip').zero?
+          elsif encodings&.last&.casecmp?('gzip') || encodings&.last&.casecmp?('x-gzip')
             datum[:response][:body] = Zlib::GzipReader.new(StringIO.new(body)).read
             encodings.pop
           end

data/lib/excon/middlewares/redirect_follower.rb

@@ -17,7 +17,7 @@ module Excon
 
       def get_header(datum, header)
         _, header_value = datum[:response][:headers].detect do |key, _|
-          key.casecmp(header) == 0
+          key.casecmp?(header)
         end
         header_value
       end

data/lib/excon/response.rb

@@ -106,9 +106,9 @@ module Excon
 
       unless (['HEAD', 'CONNECT'].include?(datum[:method].to_s.upcase)) || NO_ENTITY.include?(datum[:response][:status])
 
-        if (key = datum[:response][:headers].keys.detect {|k| k.casecmp('Transfer-Encoding') == 0 })
+        if (key = datum[:response][:headers].keys.detect {|k| k.casecmp?('Transfer-Encoding') })
           encodings = Utils.split_header_value(datum[:response][:headers][key])
-          if (encoding = encodings.last) && encoding.casecmp('chunked') == 0
+          if (encoding = encodings.last) && encoding.casecmp?('chunked')
             transfer_encoding_chunked = true
             if encodings.length == 1
               datum[:response][:headers].delete(key)
@@ -156,7 +156,7 @@ module Excon
           end
           parse_headers(socket, datum) # merge trailers into headers
         else
-          if (key = datum[:response][:headers].keys.detect {|k| k.casecmp('Content-Length') == 0 })
+          if (key = datum[:response][:headers].keys.detect {|k| k.casecmp?('Content-Length') })
             content_length = datum[:response][:headers][key].to_i
           end
 
@@ -202,7 +202,7 @@ module Excon
           raise Excon::Error::ResponseParse, 'malformed header' unless value
           # add key/value or append value to existing values
           datum[:response][:headers][key] = ([datum[:response][:headers][key]] << value.strip).compact.join(', ')
-          if key.casecmp('Set-Cookie') == 0
+          if key.casecmp?('Set-Cookie')
             datum[:response][:cookies] << value.strip
           end
           last_key = key

data/lib/excon/utils.rb

@@ -69,26 +69,21 @@ module Excon
       end
     end
 
-    # Used to normalize queries for stubs, based on Rack::Utils.parse_query
-    def parse_query_string(string)
-      params = {}
+    def split_query_string(string)
+      query = {}
 
       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
+        key, value = pair.split('=', 2)
+        query[key] = query[key] ? [query[key], value].flatten : value
       end
 
-      params
+      query
     end
 
     def default_port?(datum)
-      (datum[:scheme].casecmp('http').zero? && datum[:port] == 80) ||
-        (datum[:scheme].casecmp('https').zero? && datum[:port] == 443)
+      (!datum[:scheme]&.casecmp?('unix') && datum[:port].nil?) ||
+        (datum[:scheme]&.casecmp?('http') && datum[:port] == 80) ||
+        (datum[:scheme]&.casecmp?('https') && datum[:port] == 443)
     end
 
     def query_string(datum)

data/lib/excon/version.rb

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

data/lib/excon.rb

@@ -163,7 +163,7 @@ module Excon
         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])
+        request_params[:query] = Utils.split_query_string(request_params[:query])
       end
       if block_given?
         raise(ArgumentError, 'stub requires either response_params OR a block') if response_params
@@ -186,7 +186,7 @@ module Excon
         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])
+        request_params[:query] = Utils.split_query_string(request_params[:query])
       end
       Excon.stubs.each do |stub, response_params|
         captures = { headers: {} }

metadata

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