httpx 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 853641fa479bca4da2dca4d69bf8eddf6b323b12c40096cdb22faff1a8f80176
-  data.tar.gz: 8f74a2b53e2037863b9b66e4184e568f7de33bab9f6a65f27b9b9d8f6f3b145b
+  metadata.gz: cdf61781fa437f8bf02932b38f029d56f25443690eee087fb09974c5d48595a3
+  data.tar.gz: 75ab23803f01f6c52bcc6f754a93c799efce99b5892c9a4f0815c6254a3e022c
 SHA512:
-  metadata.gz: 736eb3d84089ac6d98576f6aeb1b20f3cb56cf32bc070c999fd41c0b1685612b89cf397884053e8d103c9464c1998f2651b9a219692b36dee9848a051f13d5d4
-  data.tar.gz: 6c17fbd06732769f09689ccc2f10e0f5fcb8e897ac6c32aa6e96ef707b2bcc26577b4dae8a8b3486e35495e002e833e06593421f99baa26f3c2586e651aaf393
+  metadata.gz: 57ae0b1d04da8d0e19951a704a40d9c136785281fb5ec2677aaac6b54e98baab0542ad4c8d40553270af8b120d6cf856678bd62554fe1cab7192bfdc26ee08f2
+  data.tar.gz: 1e0f59ecd050838021578981d3ea1f3fa467671ef6c7efc740770cb33462ec81afa7e6a55bbfa2814cd19dacff0bf0e887c6b24ecea405c5440daf369074f766

data/lib/httpx/adapters/faraday.rb

@@ -18,6 +18,31 @@ module Faraday
           }
           [meth, env.url, request_options]
         end
+
+        def options_from_env(env)
+          timeout_options = {
+            connect_timeout: env.request.open_timeout,
+            operation_timeout: env.request.timeout,
+          }.reject { |_, v| v.nil? }
+
+          options = {
+            ssl: {},
+            timeout: timeout_options,
+          }
+
+          options[:ssl][:verify_mode] = OpenSSL::SSL::VERIFY_PEER if env.ssl.verify
+          options[:ssl][:ca_file] = env.ssl.ca_file if env.ssl.ca_file
+          options[:ssl][:ca_path] = env.ssl.ca_path if env.ssl.ca_path
+          options[:ssl][:cert_store] = env.ssl.cert_store if env.ssl.cert_store
+          options[:ssl][:cert] = env.ssl.client_cert if env.ssl.client_cert
+          options[:ssl][:key] = env.ssl.client_key if env.ssl.client_key
+          options[:ssl][:ssl_version] = env.ssl.version if env.ssl.version
+          options[:ssl][:verify_depth] = env.ssl.verify_depth if env.ssl.verify_depth
+          options[:ssl][:min_version] = env.ssl.min_version if env.ssl.min_version
+          options[:ssl][:max_version] = env.ssl.max_version if env.ssl.max_version
+
+          options
+        end
       end
 
       include RequestMixin
@@ -109,19 +134,9 @@ module Faraday
           requests = @handlers.map { |handler| build_request(handler.env) }
           env = @handlers.last.env
 
-          timeout_options = {
-            connect_timeout: env.request.open_timeout,
-            operation_timeout: env.request.timeout,
-          }.reject { |_, v| v.nil? }
-
-          options = {
-            ssl: env.ssl,
-            timeout: timeout_options,
-          }
-
           proxy_options = { uri: env.request.proxy }
 
-          session = @session.with(options)
+          session = @session.with(options_from_env(env))
           session = session.plugin(:proxy).with_proxy(proxy_options) if env.request.proxy
 
           responses = session.request(requests)
@@ -159,19 +174,7 @@ module Faraday
 
         request_options = build_request(env)
 
-        timeout_options = {
-          connect_timeout: env.request.open_timeout,
-          operation_timeout: env.request.timeout,
-        }.reject { |_, v| v.nil? }
-
-        options = {
-          ssl: env.ssl,
-          timeout: timeout_options,
-        }
-
-        proxy_options = { uri: env.request.proxy }
-
-        session = @session.with(options)
+        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.raise_for_status unless response.is_a?(::HTTPX::Response)

data/lib/httpx/connection.rb

@@ -177,8 +177,8 @@ module HTTPX
     end
 
     def send(request)
-      if @error_response
-        emit(:response, request, @error_response)
+      if @error
+        emit(:response, request, ErrorResponse.new(request, @error, @options))
       elsif @parser && !@write_buffer.full?
         request.headers["alt-used"] = @origin.authority if match_altsvcs?(request.uri)
         parser.send(request)
@@ -297,7 +297,7 @@ module HTTPX
         when MisdirectedRequestError
           emit(:uncoalesce, request.uri)
         else
-          response = ErrorResponse.new(ex, @options)
+          response = ErrorResponse.new(request, ex, @options)
           request.emit(:response, response)
         end
       end
@@ -306,7 +306,7 @@ module HTTPX
     def transition(nextstate)
       case nextstate
       when :idle
-        @error_response = nil
+        @error = nil
         @timeout_threshold = @options.timeout.connect_timeout
         @timeout = @timeout_threshold
       when :open
@@ -363,9 +363,9 @@ module HTTPX
       end
 
       parser.handle_error(e) if @parser && parser.respond_to?(:handle_error)
-      @error_response = ErrorResponse.new(e, @options)
+      @error = e
       @pending.each do |request, _|
-        request.emit(:response, @error_response)
+        request.emit(:response, ErrorResponse.new(request, @error, @options))
       end
     end
   end

data/lib/httpx/errors.rb

@@ -26,6 +26,15 @@ module HTTPX
 
   ResolveError = Class.new(Error)
 
+  NativeResolveError = Class.new(ResolveError) do
+    attr_reader :connection, :host
+    def initialize(connection, host, message = "Can't resolve #{host}")
+      @connection = connection
+      @host = host
+      super(message)
+    end
+  end
+
   HTTPError = Class.new(Error) do
     attr_reader :response
 

data/lib/httpx/plugins/authentication.rb

@@ -3,9 +3,11 @@
 module HTTPX
   module Plugins
     #
-    # This plugin adds a shim #authentication method to the session, which will fill
+    # This plugin adds a shim +authentication+ method to the session, which will fill
     # the HTTP Authorization header.
     #
+    # https://gitlab.com/honeyryderchuck/httpx/wikis/Authentication#authentication
+    #
     module Authentication
       module InstanceMethods
         def authentication(token)

data/lib/httpx/plugins/basic_authentication.rb

@@ -3,11 +3,12 @@
 module HTTPX
   module Plugins
     #
-    # This plugin adds helper methods to implement HTTP Basic Auth
-    # https://tools.ietf.org/html/rfc7617
+    # This plugin adds helper methods to implement HTTP Basic Auth (https://tools.ietf.org/html/rfc7617)
+    #
+    # https://gitlab.com/honeyryderchuck/httpx/wikis/Authentication#basic-authentication
     #
     module BasicAuthentication
-      def self.load_dependencies(klass, *)
+      def self.load_dependencies(klass)
         require "base64"
         klass.plugin(:authentication)
       end

data/lib/httpx/plugins/compression.rb

@@ -10,9 +10,11 @@ module HTTPX
     #
     # It supports both *gzip* and *deflate*.
     #
+    # https://gitlab.com/honeyryderchuck/httpx/wikis/Compression
+    #
     module Compression
       extend Registry
-      def self.load_dependencies(klass, *)
+      def self.load_dependencies(klass)
         klass.plugin(:"compression/gzip")
         klass.plugin(:"compression/deflate")
       end

data/lib/httpx/plugins/compression/brotli.rb

@@ -4,7 +4,7 @@ module HTTPX
   module Plugins
     module Compression
       module Brotli
-        def self.load_dependencies(klass, *)
+        def self.load_dependencies(klass)
           klass.plugin(:compression)
           require "brotli"
         end

data/lib/httpx/plugins/cookies.rb

@@ -9,6 +9,8 @@ module HTTPX
     #
     # It also adds a *#cookies* helper, so that you can pre-fill the cookies of a session.
     #
+    # https://gitlab.com/honeyryderchuck/httpx/wikis/Cookies
+    #
     module Cookies
       using URIExtensions
 

data/lib/httpx/plugins/digest_authentication.rb

@@ -3,8 +3,9 @@
 module HTTPX
   module Plugins
     #
-    # This plugin adds helper methods to implement HTTP Digest Auth
-    # https://tools.ietf.org/html/rfc7616
+    # This plugin adds helper methods to implement HTTP Digest Auth (https://tools.ietf.org/html/rfc7616)
+    #
+    # https://gitlab.com/honeyryderchuck/httpx/wikis/Authentication#authentication
     #
     module DigestAuthentication
       DigestError = Class.new(Error)

data/lib/httpx/plugins/follow_redirects.rb

@@ -11,6 +11,8 @@ module HTTPX
     #
     # It also doesn't follow insecure redirects (https -> http) by default (see *follow_insecure_redirects*).
     #
+    # https://gitlab.com/honeyryderchuck/httpx/wikis/Follow-Redirects
+    #
     module FollowRedirects
       MAX_REDIRECTS = 3
       REDIRECT_STATUS = (300..399).freeze
@@ -54,7 +56,7 @@ module HTTPX
              retry_request.uri.scheme == "http"
             error = InsecureRedirectError.new(retry_request.uri.to_s)
             error.set_backtrace(caller)
-            return ErrorResponse.new(error, options)
+            return ErrorResponse.new(request, error, options)
           end
 
           connection = find_connection(retry_request, connections, options)

data/lib/httpx/plugins/h2c.rb

@@ -3,9 +3,10 @@
 module HTTPX
   module Plugins
     #
-    # This plugin adds support for upgrading a plaintext HTTP/1.1 connection to HTTP/2.
+    # This plugin adds support for upgrading a plaintext HTTP/1.1 connection to HTTP/2
+    # (https://tools.ietf.org/html/rfc7540#section-3.2)
     #
-    # https://tools.ietf.org/html/rfc7540#section-3.2
+    # https://gitlab.com/honeyryderchuck/httpx/wikis/Follow-Redirects
     #
     module H2C
       def self.load_dependencies(*)

data/lib/httpx/plugins/multipart.rb

@@ -7,6 +7,8 @@ module HTTPX
     #
     #   HTTPX.post(URL, form: form: { image: HTTP::FormData::File.new("path/to/file")})
     #
+    # https://gitlab.com/honeyryderchuck/httpx/wikis/Multipart-Uploads
+    #
     module Multipart
       module FormTranscoder
         module_function

data/lib/httpx/plugins/persistent.rb

@@ -15,9 +15,11 @@ module HTTPX
     # This plugin is also not recommendable when connecting to >9000 (like, a lot) different origins.
     # So when you use this, make sure that you don't fall into this trap.
     #
+    # https://gitlab.com/honeyryderchuck/httpx/wikis/Persistent
+    #
     module Persistent
-      def self.load_dependencies(klass, *)
-        klass.plugin(:retries) # TODO: pass default max_retries -> 1 as soon as this is a parameter
+      def self.load_dependencies(klass)
+        klass.plugin(:retries, max_retries: 1, retry_change_requests: true)
       end
 
       def self.extra_options(options)

data/lib/httpx/plugins/proxy.rb

@@ -14,6 +14,8 @@ module HTTPX
     # * Socks4/4a proxies
     # * Socks5 proxies
     #
+    # https://gitlab.com/honeyryderchuck/httpx/wikis/Proxy
+    #
     module Proxy
       Error = Class.new(Error)
       PROXY_ERRORS = [TimeoutError, IOError, SystemCallError, Error].freeze
@@ -47,7 +49,7 @@ module HTTPX
       end
 
       class << self
-        def configure(klass, *)
+        def configure(klass)
           klass.plugin(:"proxy/http")
           klass.plugin(:"proxy/socks4")
           klass.plugin(:"proxy/socks5")

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

@@ -6,8 +6,7 @@ module HTTPX
   module Plugins
     module Proxy
       module SSH
-        def self.load_dependencies(_klass, *)
-          # klass.plugin(:proxy)
+        def self.load_dependencies(*)
           require "net/ssh/gateway"
         end
 
@@ -74,6 +73,21 @@ module HTTPX
             end
           end
         end
+
+        module ConnectionMethods
+          def match?(uri, options)
+            return super unless @options.proxy
+
+            super && @options.proxy == options.proxy
+          end
+
+          # should not coalesce connections here, as the IP is the IP of the proxy
+          def coalescable?(*)
+            return super unless @options.proxy
+
+            false
+          end
+        end
       end
     end
     register_plugin :"proxy/ssh", Proxy::SSH

data/lib/httpx/plugins/push_promise.rb

@@ -8,6 +8,8 @@ module HTTPX
     # In order to benefit from this, requests are sent one at a time, so that
     # no push responses are received after corresponding request has been sent.
     #
+    # https://gitlab.com/honeyryderchuck/httpx/wikis/Server-Push
+    #
     module PushPromise
       def self.extra_options(options)
         options.merge(http2_settings: { settings_enable_push: 1 },

data/lib/httpx/plugins/retries.rb

@@ -5,6 +5,8 @@ module HTTPX
     #
     # This plugin adds support for retrying requests when certain errors happen.
     #
+    # https://gitlab.com/honeyryderchuck/httpx/wikis/Retries
+    #
     module Retries
       MAX_RETRIES = 3
       # TODO: pass max_retries in a configure/load block
@@ -31,7 +33,7 @@ module HTTPX
           end
 
           def_option(:retry_change_requests)
-        end.new(options)
+        end.new(options).merge(max_retries: MAX_RETRIES)
       end
 
       module InstanceMethods
@@ -71,7 +73,7 @@ module HTTPX
 
         def initialize(*args)
           super
-          @retries = @options.max_retries || MAX_RETRIES
+          @retries = @options.max_retries
         end
       end
     end

data/lib/httpx/resolver/native.rb

@@ -76,13 +76,22 @@ module HTTPX
         consume
       end
       nil
-    rescue Errno::EHOSTUNREACH => e
+    rescue Errno::EHOSTUNREACH,
+           NativeResolveError => e
       @ns_index += 1
       if @ns_index < @nameserver.size
+        log(label: "resolver: ") do
+          "failed resolving on nameserver #{@nameserver[@ns_index - 1]} (#{e.message})"
+        end
         transition(:idle)
       else
-        @queries.each do |host, connection|
+        if e.respond_to?(:connection) &&
+           e.respond_to?(:host)
           emit_resolve_error(connection, host, e)
+        else
+          @queries.each do |host, connection|
+            emit_resolve_error(connection, host, e)
+          end
         end
       end
     end
@@ -141,8 +150,7 @@ module HTTPX
         @timeouts[host].shift
         if @timeouts[host].empty?
           @timeouts.delete(host)
-          emit_resolve_error(connection, host)
-          return
+          raise NativeResolveError.new(connection, host)
         else
           connections << connection
           log(label: "resolver: ") do
@@ -188,8 +196,9 @@ module HTTPX
       rescue Resolv::DNS::DecodeError => e
         hostname, connection = @queries.first
         if @_record_types[hostname].empty?
-          emit_resolve_error(connection, hostname, e)
-          return
+          ex = NativeResolveError.new(connection, hostname, e.message)
+          ex.set_backtrace(e.backtrace)
+          raise ex
         end
       end
 
@@ -198,8 +207,7 @@ module HTTPX
         @_record_types[hostname].shift
         if @_record_types[hostname].empty?
           @_record_types.delete(hostname)
-          emit_resolve_error(connection, hostname)
-          return
+          raise NativeResolveError.new(connection, hostname)
         end
       else
         address = addresses.first

data/lib/httpx/response.rb

@@ -238,9 +238,10 @@ module HTTPX
   class ErrorResponse
     include Loggable
 
-    attr_reader :error
+    attr_reader :request, :error
 
-    def initialize(error, options)
+    def initialize(request, error, options)
+      @request = request
       @error = error
       @options = Options.new(options)
       log_exception(@error)

data/lib/httpx/session.rb

@@ -203,14 +203,15 @@ module HTTPX
         klass.instance_variable_set(:@plugins, @plugins.dup)
       end
 
-      def plugin(pl, *args, &block)
+      def plugin(pl, options = nil, &block)
         # raise Error, "Cannot add a plugin to a frozen config" if frozen?
         pl = Plugins.load_plugin(pl) if pl.is_a?(Symbol)
         unless @plugins.include?(pl)
           @plugins << pl
-          pl.load_dependencies(self, *args, &block) if pl.respond_to?(:load_dependencies)
+          pl.load_dependencies(self, &block) if pl.respond_to?(:load_dependencies)
           @default_options = @default_options.dup
-          @default_options = pl.extra_options(@default_options) if pl.respond_to?(:extra_options)
+          @default_options = pl.extra_options(@default_options, &block) if pl.respond_to?(:extra_options)
+          @default_options = @default_options.merge(options) if options
 
           include(pl::InstanceMethods) if defined?(pl::InstanceMethods)
           extend(pl::ClassMethods) if defined?(pl::ClassMethods)
@@ -227,7 +228,7 @@ module HTTPX
           opts.response_body_class.__send__(:include, pl::ResponseBodyMethods) if defined?(pl::ResponseBodyMethods)
           opts.response_body_class.extend(pl::ResponseBodyClassMethods) if defined?(pl::ResponseBodyClassMethods)
           opts.connection_class.__send__(:include, pl::ConnectionMethods) if defined?(pl::ConnectionMethods)
-          pl.configure(self, *args, &block) if pl.respond_to?(:configure)
+          pl.configure(self, &block) if pl.respond_to?(:configure)
 
           @default_options.freeze
         end

data/lib/httpx/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httpx
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Tiago Cardoso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-20 00:00:00.000000000 Z
+date: 2019-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-2