httpx 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b31d47dee309cce01caf25b3bc2f9fe51f602e9e2b07318c0903dee4b6d5b0c2
-  data.tar.gz: 18d8eb569ef7b5cf989ee61a85ed747cf9ceb1098d37e102fe7a721ae00675d8
+  metadata.gz: b8a8f66dc2833078c5d718a91b0aa5ab0f3cfd0ddfa021ddebe491dc8a74cda1
+  data.tar.gz: b722b06b29af3a535efdc5da32298c358b5cb91ab248224fe21bc5f15982cbfb
 SHA512:
-  metadata.gz: c2fd3831074357bc36389c299f257f1b14cd70f94d3491125bc54ef67e485dac66f9f2457b013a25c7b298a6926cb0bb92436cf07f3e9bd1d9f5e850f63fa443
-  data.tar.gz: 498440a319ff97e08236dde05cd6413723e17f6be9b4d4ce110b59fe88e4da0a9254cbd639adc28a6c81a6183eb70fbd7dd38719716c480d00addfed409ca446
+  metadata.gz: c2a70d09852cf6612b50cf13fa54cdb71111bec0583f12830d58a5e042b0dae316e84d3e4b4db132bad77cda88fefd7d7cdd3c6b9ab288c08fdc573b8ff2e3fb
+  data.tar.gz: fd164d361e5e9b3d7c7439567c014a748c6eedb4b1887ff20213f653ea7234ca5567cd96bc71d651637049bf6405751f46fe423638ae1b820dac4767b2434fc9

data/lib/httpx.rb

@@ -47,11 +47,13 @@ module HTTPX
     end
   end
 
+  # :nocov:
   def self.const_missing(const_name)
     super unless const_name == :Client
     warn "DEPRECATION WARNING: the class #{self}::Client is deprecated. Use #{self}::Session instead."
     Session
   end
+  # :nocov:
 
   extend Chainable
 end

data/lib/httpx/adapters/faraday.rb

@@ -6,6 +6,7 @@ require "faraday"
 module Faraday
   class Adapter
     class HTTPX < Faraday::Adapter
+      # :nocov:
       SSL_ERROR = if defined?(Faraday::SSLError)
         Faraday::SSLError
       else
@@ -17,6 +18,7 @@ module Faraday
       else
         Faraday::Error::ConnectionFailed
       end
+      # :nocov:
 
       module RequestMixin
         private
@@ -63,6 +65,7 @@ module Faraday
         plugin(:compression)
         plugin(:persistent)
 
+        # :nocov:
         module ReasonPlugin
           if RUBY_VERSION < "2.5"
             def self.load_dependencies(*)
@@ -85,6 +88,7 @@ module Faraday
             end
           end
         end
+        # :nocov:
         plugin(ReasonPlugin)
       end
 
@@ -185,26 +189,26 @@ module Faraday
           return handler
         end
 
-        request_options = build_request(env)
+        meth, uri, request_options = build_request(env)
 
         session = @session.with(options_from_env(env))
         session = session.plugin(:proxy).with_proxy(proxy_options) if env.request.proxy
-        response = session.__send__(*request_options)
+        response = session.__send__(meth, uri, **request_options)
         response.raise_for_status unless response.is_a?(::HTTPX::Response)
         save_response(env, response.status, response.body.to_s, response.headers, response.reason) do |response_headers|
           response_headers.merge!(response.headers)
         end
         @app.call(env)
-      rescue OpenSSL::SSL::SSLError => err
-        raise SSL_ERROR, err
+      rescue OpenSSL::SSL::SSLError => e
+        raise SSL_ERROR, e
       rescue Errno::ECONNABORTED,
              Errno::ECONNREFUSED,
              Errno::ECONNRESET,
              Errno::EHOSTUNREACH,
              Errno::EINVAL,
              Errno::ENETUNREACH,
-             Errno::EPIPE => err
-        raise CONNECTION_FAILED_ERROR, err
+             Errno::EPIPE => e
+        raise CONNECTION_FAILED_ERROR, e
       end
 
       private

data/lib/httpx/altsvc.rb

@@ -67,6 +67,7 @@ module HTTPX
       end
     end
 
+    # :nocov:
     if RUBY_VERSION < "2.2"
       def parse_altsvc_origin(alt_origin)
         alt_proto, alt_origin = alt_origin.split("=")
@@ -87,5 +88,6 @@ module HTTPX
         URI.parse("#{alt_proto}://#{alt_origin}")
       end
     end
+    # :nocov:
   end
 end

data/lib/httpx/connection.rb

@@ -128,9 +128,9 @@ module HTTPX
     end
 
     def purge_pending
-      [@parser.pending, @pending].each do |pending|
-        pending.reject! do |request, *args|
-          yield(request, args) if block_given?
+      [*@parser.pending, *@pending].each do |pending|
+        pending.reject! do |request|
+          yield request
         end
       end
     end
@@ -358,15 +358,17 @@ module HTTPX
     end
 
     def handle_error(error)
-      if error.instance_of?(TimeoutError) && @timeout
-        @timeout -= error.timeout
-        return unless @timeout <= 0
+      if error.instance_of?(TimeoutError)
+        if @timeout
+          @timeout -= error.timeout
+          return unless @timeout <= 0
+        end
 
         error = error.to_connection_error if connecting?
       end
 
       parser.handle_error(error) if @parser && parser.respond_to?(:handle_error)
-      @pending.each do |request, _|
+      @pending.each do |request|
         request.emit(:response, ErrorResponse.new(request, error, @options))
       end
     end

data/lib/httpx/headers.rb

@@ -130,6 +130,12 @@ module HTTPX
       @headers.to_s
     end
 
+    # :nocov:
+    def inspect
+      to_hash.inspect
+    end
+    # :nocov:
+
     # this is internal API and doesn't abide to other public API
     # guarantees, like downcasing strings.
     # Please do not use this outside of core!

data/lib/httpx/io/ssl.rb

@@ -7,7 +7,9 @@ module HTTPX
     TLS_OPTIONS = if OpenSSL::SSL::SSLContext.instance_methods.include?(:alpn_protocols)
       { alpn_protocols: %w[h2 http/1.1] }
     else
+      # :nocov:
       {}
+      # :nocov:
     end
 
     def initialize(_, _, options)
@@ -18,10 +20,6 @@ module HTTPX
       @state = :negotiated if @keep_open
     end
 
-    def scheme
-      "https"
-    end
-
     def protocol
       @io.alpn_protocol || super
     rescue StandardError
@@ -68,6 +66,7 @@ module HTTPX
            ::IO::WaitWritable
     end
 
+    # :nocov:
     if RUBY_VERSION < "2.3"
       def read(*)
         super
@@ -93,11 +92,14 @@ module HTTPX
         end
       end
     end
+    # :nocov:
 
+    # :nocov:
     def inspect
       id = @io.closed? ? "closed" : @io.to_io.fileno
       "#<SSL(fd: #{id}): #{@ip}:#{@port} state: #{@state}>"
     end
+    # :nocov:
 
     private
 

data/lib/httpx/io/tcp.rb

@@ -41,10 +41,6 @@ module HTTPX
       @io ||= build_socket
     end
 
-    def scheme
-      "http"
-    end
-
     def to_io
       @io.to_io
     end
@@ -68,6 +64,11 @@ module HTTPX
     rescue Errno::EHOSTUNREACH => e
       raise e if @ip_index <= 0
 
+      @ip_index -= 1
+      retry
+    rescue Errno::ETIMEDOUT => e
+      raise ConnectTimeout, e.message if @ip_index <= 0
+
       @ip_index -= 1
       retry
     rescue Errno::EINPROGRESS,
@@ -76,6 +77,7 @@ module HTTPX
     end
 
     if RUBY_VERSION < "2.3"
+      # :nocov:
       def read(size, buffer)
         @io.read_nonblock(size, buffer)
         buffer.bytesize
@@ -94,6 +96,7 @@ module HTTPX
       rescue EOFError
         nil
       end
+      # :nocov:
     else
       def read(size, buffer)
         ret = @io.read_nonblock(size, buffer, exception: false)
@@ -131,10 +134,12 @@ module HTTPX
       @state == :idle || @state == :closed
     end
 
+    # :nocov:
     def inspect
       id = @io.closed? ? "closed" : @io.fileno
       "#<TCP(fd: #{id}): #{@ip}:#{@port} (state: #{@state})>"
     end
+    # :nocov:
 
     private
 
@@ -154,9 +159,7 @@ module HTTPX
     end
 
     def do_transition(nextstate)
-      log(level: 1) do
-        log_transition_state(nextstate)
-      end
+      log(level: 1) { log_transition_state(nextstate) }
       @state = nextstate
     end
 

data/lib/httpx/io/udp.rb

@@ -34,6 +34,7 @@ module HTTPX
       siz
     end
 
+    # :nocov:
     if RUBY_VERSION < "2.3"
       def read(size, buffer)
         data, _ = @io.recvfrom_nonblock(size)
@@ -53,5 +54,6 @@ module HTTPX
       rescue IOError
       end
     end
+    # :nocov:
   end
 end

data/lib/httpx/plugins/compression.rb

@@ -46,7 +46,7 @@ module HTTPX
       module ResponseBodyMethods
         attr_reader :encodings
 
-        def initialize(*)
+        def initialize(*, **)
           @encodings = []
 
           super

data/lib/httpx/plugins/digest_authentication.rb

@@ -59,9 +59,7 @@ module HTTPX
             prev_response = response
           end
 
-          return responses.first if responses.size == 1
-
-          responses
+          responses.size == 1 ? responses.first : responses
         end
       end
 
@@ -81,8 +79,9 @@ module HTTPX
 
           uri = request.path
 
-          params = Hash[auth_info.scan(/(\w+)="(.*?)"/)]
-
+          params = Hash[auth_info.split(/ *, */)
+                                 .map { |val| val.split("=") }
+                                 .map { |k, v| [k, v.delete("\"")] }]
           nonce = params["nonce"]
           nc = next_nonce
 
@@ -90,24 +89,19 @@ module HTTPX
           qop = params["qop"]
 
           if params["algorithm"] =~ /(.*?)(-sess)?$/
-            algorithm = case Regexp.last_match(1)
-                        when "MD5"    then ::Digest::MD5
-                        when "SHA1"   then ::Digest::SHA1
-                        when "SHA2"   then ::Digest::SHA2
-                        when "SHA256" then ::Digest::SHA256
-                        when "SHA384" then ::Digest::SHA384
-                        when "SHA512" then ::Digest::SHA512
-                        when "RMD160" then ::Digest::RMD160
-                        else raise DigestError, "unknown algorithm \"#{Regexp.last_match(1)}\""
-            end
+            alg = Regexp.last_match(1)
+            algorithm = ::Digest.const_get(alg)
+            raise DigestError, "unknown algorithm \"#{alg}\"" unless algorithm
+
             sess = Regexp.last_match(2)
+            params.delete("algorithm")
           else
             algorithm = ::Digest::MD5
           end
 
           if qop || sess
             cnonce = make_cnonce
-            nc = format("%08x", nc)
+            nc = format("%<nonce>08x", nonce: nc)
           end
 
           a1 = if sess

data/lib/httpx/plugins/h2c.rb

@@ -30,9 +30,7 @@ module HTTPX
 
           responses = send_requests(*requests, h2c_options)
 
-          return responses.first if responses.size == 1
-
-          responses
+          responses.size == 1 ? responses.first : responses
         end
 
         private
@@ -109,17 +107,6 @@ module HTTPX
           super("http/1.1")
         end
       end
-
-      module FrameBuilder
-        include HTTP2Next
-
-        module_function
-
-        def settings_value(settings)
-          frame = Framer.new.generate(type: :settings, stream: 0, payload: settings)
-          Base64.urlsafe_encode64(frame[9..-1])
-        end
-      end
     end
     register_plugin(:h2c, H2C)
   end

data/lib/httpx/plugins/proxy.rb

@@ -5,6 +5,7 @@ require "ipaddr"
 require "forwardable"
 
 module HTTPX
+  HTTPProxyError = Class.new(Error)
   module Plugins
     #
     # This plugin adds support for proxies. It ships with support for:
@@ -17,7 +18,7 @@ module HTTPX
     # https://gitlab.com/honeyryderchuck/httpx/wikis/Proxy
     #
     module Proxy
-      Error = Class.new(Error)
+      Error = HTTPProxyError
       PROXY_ERRORS = [TimeoutError, IOError, SystemCallError, Error].freeze
 
       class Parameters
@@ -34,14 +35,23 @@ module HTTPX
         end
 
         def token_authentication
-          Base64.strict_encode64("#{user}:#{password}")
+          return unless authenticated?
+
+          Base64.strict_encode64("#{@username}:#{@password}")
         end
 
         def ==(other)
-          if other.is_a?(Parameters)
+          case other
+          when Parameters
             @uri == other.uri &&
               @username == other.username &&
               @password == other.password
+          when URI::Generic, String
+            proxy_uri = @uri.dup
+            proxy_uri.user = @username
+            proxy_uri.password = @password
+            other_uri = other.is_a?(URI::Generic) ? other : URI.parse(other)
+            proxy_uri == other_uri
           else
             super
           end

data/lib/httpx/plugins/proxy/socks4.rb

@@ -4,6 +4,7 @@ require "resolv"
 require "ipaddr"
 
 module HTTPX
+  Socks4Error = Class.new(Error)
   module Plugins
     module Proxy
       module Socks4
@@ -12,7 +13,7 @@ module HTTPX
         GRANTED = 90
         PROTOCOLS = %w[socks4 socks4a].freeze
 
-        Error = Class.new(Error)
+        Error = Socks4Error
 
         module ConnectionMethods
           private
@@ -100,7 +101,7 @@ module HTTPX
 
               packet << [ip.to_i].pack("N")
             rescue IPAddr::InvalidAddressError
-              if parameters.uri.scheme == "socks4"
+              if parameters.uri.scheme =~ /^socks4a?$/
                 # resolv defaults to IPv4, and socks4 doesn't support IPv6 otherwise
                 ip = IPAddr.new(Resolv.getaddress(uri.host))
                 packet << [ip.to_i].pack("N")

data/lib/httpx/plugins/proxy/socks5.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module HTTPX
+  Socks5Error = Class.new(Error)
   module Plugins
     module Proxy
       module Socks5
@@ -14,7 +15,7 @@ module HTTPX
         IPV6 = 4
         SUCCESS = 0
 
-        Error = Class.new(Error)
+        Error = Socks5Error
 
         module ConnectionMethods
           def call
@@ -77,15 +78,14 @@ module HTTPX
               case method
               when PASSWD
                 transition(:authenticating)
-                return
+                nil
               when NONE
                 __on_socks5_error("no supported authorization methods")
               else
                 transition(:negotiating)
               end
             when :authenticating
-              version, status = packet.unpack("CC")
-              __socks5_check_version(version)
+              _, status = packet.unpack("CC")
               return transition(:negotiating) if status == SUCCESS
 
               __on_socks5_error("socks authentication error: #{status}")
@@ -147,8 +147,8 @@ module HTTPX
 
           def authenticate(parameters)
             user = parameters.username
-            pass = parameters.password
-            [0x01, user.bytesize, user, pass.bytesize, password].pack("CCA*CA*")
+            password = parameters.password
+            [0x01, user.bytesize, user, password.bytesize, password].pack("CCA*CA*")
           end
 
           def connect(uri)

data/lib/httpx/plugins/push_promise.rb

@@ -44,7 +44,9 @@ module HTTPX
 
         def __on_promise_request(parser, stream, h)
           log(level: 1, label: "#{stream.id}: ") do
+            # :nocov:
             h.map { |k, v| "-> PROMISE HEADER: #{k}: #{v}" }.join("\n")
+            # :nocov:
           end
           headers = @options.headers_class.new(h)
           path = headers[":path"]

data/lib/httpx/pool.rb

@@ -33,9 +33,9 @@ module HTTPX
         end
         @timers.fire
       end
-    rescue StandardError => ex
+    rescue StandardError => e
       @connections.each do |connection|
-        connection.emit(:error, ex)
+        connection.emit(:error, e)
       end
     end
 
@@ -161,7 +161,15 @@ module HTTPX
         resolver.on(:error, &method(:on_resolver_error))
         resolver.on(:close) { on_resolver_close(resolver) }
         resolver
+      # rubocop: disable Layout/RescueEnsureAlignment
+      rescue ArgumentError
+        # this block is here because of an error which happens on CI from time to time
+        warn "tried resolver: #{resolver_type}"
+        warn "initialize: #{resolver_type.instance_method(:initialize).source_location}"
+        warn "new: #{resolver_type.method(:new).source_location}"
+        raise
       end
+      # rubocop: enable Layout/RescueEnsureAlignment
     end
   end
 end

data/lib/httpx/request.rb

@@ -60,6 +60,7 @@ module HTTPX
       @state = :idle
     end
 
+    # :nocov:
     if RUBY_VERSION < "2.2"
       # rubocop: disable Lint/UriEscapeUnescape:
       def initialize_with_escape(verb, uri, options = {})
@@ -69,6 +70,7 @@ module HTTPX
       alias_method :initialize, :initialize_with_escape
       # rubocop: enable Lint/UriEscapeUnescape:
     end
+    # :nocov:
 
     def merge_headers(h)
       @headers = @headers.merge(h)
@@ -123,9 +125,15 @@ module HTTPX
       nil
     end
 
+    # :nocov:
     def inspect
-      "#<Request #{@verb.to_s.upcase} #{path} @headers=#{@headers.to_hash} @body=#{@body}>"
+      "#<HTTPX::Request:#{object_id} " \
+      "#{@verb.to_s.upcase} " \
+      "#{uri} " \
+      "@headers=#{@headers} " \
+      "@body=#{@body}>"
     end
+    # :nocov:
 
     class Body
       class << self
@@ -201,6 +209,13 @@ module HTTPX
       def chunk!
         @headers.add("transfer-encoding", "chunked")
       end
+
+      # :nocov:
+      def inspect
+        "#<HTTPX::Request::Body:#{object_id} " \
+        "#{unbounded_body? ? "stream" : "@bytesize=#{bytesize}"}>"
+      end
+      # :nocov:
     end
 
     def transition(nextstate)

data/lib/httpx/resolver/https.rb

@@ -9,6 +9,7 @@ module HTTPX
   class Resolver::HTTPS
     extend Forwardable
     include Resolver::ResolverMixin
+    using URIExtensions
 
     NAMESERVER = "https://1.1.1.1/dns-query"
 
@@ -38,7 +39,10 @@ module HTTPX
     end
 
     def <<(connection)
+      return if @uri.origin == connection.origin.to_s
+
       @uri_addresses ||= Resolv.getaddresses(@uri.host)
+
       if @uri_addresses.empty?
         ex = ResolveError.new("Can't resolve #{connection.origin.host}")
         ex.set_backtrace(caller)
@@ -94,11 +98,11 @@ module HTTPX
 
     def on_response(request, response)
       response.raise_for_status
-    rescue Error => ex
+    rescue StandardError => e
       connection = @requests[request]
       hostname = @queries.key(connection)
-      error = ResolveError.new("Can't resolve #{hostname}: #{ex.message}")
-      error.set_backtrace(ex.backtrace)
+      error = ResolveError.new("Can't resolve #{hostname}: #{e.message}")
+      error.set_backtrace(e.backtrace)
       emit(:error, connection, error)
     else
       parse(response)
@@ -176,8 +180,8 @@ module HTTPX
         payload = Resolver.encode_dns_query(hostname, type: RECORD_TYPES[type])
         request = rklass.new("POST", uri, @options.merge(body: [payload]))
         request.headers["content-type"] = "application/dns-message"
-        request.headers["accept"] = "application/dns-message"
       end
+      request.headers["accept"] = "application/dns-message"
       request.on(:response, &method(:on_response).curry[request])
       request.on(:promise, &method(:on_promise))
       request

data/lib/httpx/resolver/native.rb

@@ -14,6 +14,7 @@ module HTTPX
       "AAAA" => Resolv::DNS::Resource::IN::AAAA,
     }.freeze
 
+    # :nocov:
     DEFAULTS = if RUBY_VERSION < "2.2"
       {
         **Resolv::DNS::Config.default_config_hash,
@@ -42,6 +43,7 @@ module HTTPX
         false
       end
     end if DEFAULTS[:nameserver]
+    # :nocov:
 
     DNS_PORT = 53
 
@@ -93,7 +95,9 @@ module HTTPX
       @ns_index += 1
       if @ns_index < @nameserver.size
         log(label: "resolver: ") do
+          # :nocov:
           "failed resolving on nameserver #{@nameserver[@ns_index - 1]} (#{e.message})"
+          # :nocov:
         end
         transition(:idle)
       else
@@ -132,6 +136,8 @@ module HTTPX
     end
 
     def timeout
+      return if @connections.empty?
+
       @start_timeout = Process.clock_gettime(Process::CLOCK_MONOTONIC)
       hosts = @queries.keys
       @timeouts.values_at(*hosts).reject(&:empty?).map(&:first).min
@@ -166,7 +172,9 @@ module HTTPX
         else
           connections << connection
           log(label: "resolver: ") do
+            # :nocov:
             "timeout after #{prev_timeout}s, retry(#{timeouts.first}) #{host}..."
+            # :nocov:
           end
         end
       end

data/lib/httpx/response.rb

@@ -52,9 +52,15 @@ module HTTPX
       bodyless? || (@request.verb == :connect && @status == 200)
     end
 
+    # :nocov:
     def inspect
-      "#<Response:#{object_id} @status=#{@status} @headers=#{@headers}>"
+      "#<Response:#{object_id} "\
+      "HTTP/#{version} " \
+      "@status=#{@status} " \
+      "@headers=#{@headers} " \
+      "@body=#{@body}>"
     end
+    # :nocov:
 
     def raise_for_status
       return if @status < 400
@@ -165,6 +171,14 @@ module HTTPX
         to_s == other.to_s
       end
 
+      # :nocov:
+      def inspect
+        "#<HTTPX::Response::Body:#{object_id} " \
+        "@state=#{@state} " \
+        "@length=#{@length}>"
+      end
+      # :nocov:
+
       private
 
       def rewind

data/lib/httpx/timeout.rb

@@ -10,7 +10,7 @@ module HTTPX
     def self.new(opts = {})
       return opts if opts.is_a?(Timeout)
 
-      super
+      super(**opts)
     end
 
     attr_reader :connect_timeout, :operation_timeout, :total_timeout
@@ -25,8 +25,10 @@ module HTTPX
 
       return unless loop_timeout
 
+      # :nocov:
       warn ":loop_timeout is deprecated, use :operation_timeout instead"
       @operation_timeout = loop_timeout
+      # :nocov:
     end
 
     def ==(other)

data/lib/httpx/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HTTPX
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httpx
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Tiago Cardoso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-22 00:00:00.000000000 Z
+date: 2020-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-2-next
@@ -163,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: HTTPX, to the future, and beyond