httpx 0.14.4 → 0.15.3

data/lib/httpx/request.rb

@@ -45,7 +45,7 @@ module HTTPX
     def initialize(verb, uri, options = {})
       @verb    = verb.to_s.downcase.to_sym
       @options = Options.new(options)
-      @uri     = Utils.uri(uri)
+      @uri     = Utils.to_uri(uri)
       if @uri.relative?
         raise(Error, "invalid URI: #{@uri}") unless @options.origin
 

data/lib/httpx/response.rb

@@ -296,3 +296,5 @@ module HTTPX
     # rubocop:enable Style/MissingRespondToMissing
   end
 end
+
+require "httpx/pmatch_extensions" if RUBY_VERSION >= "3.0.0"

data/lib/httpx/selector.rb

@@ -52,41 +52,41 @@ class HTTPX::Selector
     # first, we group IOs based on interest type. On call to #interests however,
     # things might already happen, and new IOs might be registered, so we might
     # have to start all over again. We do this until we group all selectables
-    loop do
-      begin
-        r = nil
-        w = nil
-
-        selectables = @selectables
-        @selectables = []
-
-        selectables.each do |io|
-          interests = io.interests
-
-          (r ||= []) << io if READ_INTERESTS.include?(interests)
-          (w ||= []) << io if WRITE_INTERESTS.include?(interests)
-        end
-
-        if @selectables.empty?
-          @selectables = selectables
-
-          # do not run event loop if there's nothing to wait on.
-          # this might happen if connect failed and connection was unregistered.
-          return if (!r || r.empty?) && (!w || w.empty?)
-
-          break
-        else
-          @selectables = [*selectables, @selectables]
+    begin
+      loop do
+        begin
+          r = nil
+          w = nil
+
+          selectables = @selectables
+          @selectables = []
+
+          selectables.each do |io|
+            interests = io.interests
+
+            (r ||= []) << io if READ_INTERESTS.include?(interests)
+            (w ||= []) << io if WRITE_INTERESTS.include?(interests)
+          end
+
+          if @selectables.empty?
+            @selectables = selectables
+
+            # do not run event loop if there's nothing to wait on.
+            # this might happen if connect failed and connection was unregistered.
+            return if (!r || r.empty?) && (!w || w.empty?)
+
+            break
+          else
+            @selectables.concat(selectables)
+          end
+        rescue StandardError
+          @selectables = selectables if selectables
+          raise
         end
-      rescue StandardError
-        @selectables = selectables if selectables
-        raise
       end
-    end
 
-    # TODO: what to do if there are no selectables?
+      # TODO: what to do if there are no selectables?
 
-    begin
       readers, writers = IO.select(r, w, nil, interval)
 
       raise HTTPX::TimeoutError.new(interval, "timed out while waiting on select") if readers.nil? && writers.nil?
@@ -95,14 +95,18 @@ class HTTPX::Selector
       retry
     end
 
-    readers.each do |io|
-      yield io
+    if writers
+      readers.each do |io|
+        yield io
 
-      # so that we don't yield 2 times
-      writers.delete(io)
-    end if readers
+        # so that we don't yield 2 times
+        writers.delete(io)
+      end if readers
 
-    writers.each(&block) if writers
+      writers.each(&block)
+    else
+      readers.each(&block) if readers
+    end
   end
 
   def select_one(interval)

data/lib/httpx/utils.rb

@@ -18,14 +18,16 @@ module HTTPX
     end
 
     if RUBY_VERSION < "2.3"
-      def uri(*args)
-        URI(*args)
+
+      def to_uri(uri)
+        URI(uri)
       end
+
     else
 
       URIParser = URI::RFC2396_Parser.new
 
-      def uri(uri)
+      def to_uri(uri)
         return Kernel.URI(uri) unless uri.is_a?(String) && !uri.ascii_only?
 
         uri = Kernel.URI(URIParser.escape(uri))
@@ -34,7 +36,7 @@ module HTTPX
 
         non_ascii_hostname.force_encoding(Encoding::UTF_8)
 
-        idna_hostname = DomainName.new(non_ascii_hostname).hostname
+        idna_hostname = Punycode.encode_hostname(non_ascii_hostname)
 
         uri.host = idna_hostname
         uri.non_ascii_hostname = non_ascii_hostname

data/lib/httpx/version.rb

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

data/sig/chainable.rbs

@@ -14,6 +14,8 @@ module HTTPX
     def plugin: (:authentication) -> Plugins::sessionAuthentication
               | (:basic_authentication) -> Plugins::sessionBasicAuthentication
               | (:digest_authentication) -> Plugins::sessionDigestAuthentication
+              | (:ntlm_authentication) -> Plugins::sessionNTLMAuthentication
+              | (:aws_sdk_authentication) -> Plugins::sessionAwsSdkAuthentication
               | (:compression) -> Session
               | (:cookies) -> Plugins::sessionCookies
               | (:expect) -> Session
@@ -25,7 +27,10 @@ module HTTPX
               | (:proxy) -> Plugins::sessionProxy
               | (:push_promise) -> Plugins::sessionPushPromise
               | (:retries) -> Plugins::sessionRetries
+              | (:rate_limiter) -> Session
               | (:stream) -> Plugins::sessionStream
+              | (:aws_sigv4) -> Plugins::awsSigV4Session
+              | (:grpc) -> Plugins::grpcSession
               | (Symbol | Module, ?options?) { (Class) -> void } -> Session
               | (Symbol | Module, ?options?) -> Session
 

data/sig/connection/http1.rbs

@@ -42,6 +42,8 @@ module HTTPX
 
     def ping: () -> void
 
+    def timeout: () -> Integer
+
     private
 
     def initialize: (Buffer, options) -> untyped

data/sig/connection/http2.rbs

@@ -35,6 +35,8 @@ module HTTPX
 
     alias reset init_connection
 
+    def timeout: () -> Integer
+
     private
 
     def initialize: (Buffer, options) -> untyped

data/sig/options.rbs

@@ -5,7 +5,7 @@ module HTTPX
     WINDOW_SIZE: Integer
     MAX_BODY_THRESHOLD_SIZE: Integer
 
-    type timeout_type = :connect_timeout  | :operation_timeout | :keep_alive_timeout | :total_timeout
+    type timeout_type = :connect_timeout | :settings_timeout | :operation_timeout | :keep_alive_timeout | :total_timeout
     type timeout = Hash[timeout_type, Numeric?]
 
     def self.new: (options) -> instance

data/sig/plugins/aws_sdk_authentication.rbs

@@ -15,5 +15,7 @@ module HTTPX
         def aws_sdk_authentication: (**untyped) -> instance
       end
     end
+
+    type sessionAwsSdkAuthentication = Session & Plugins::AwsSdkAuthentication::InstanceMethods
   end
 end

data/sig/plugins/basic_authentication.rbs

@@ -10,6 +10,6 @@ module HTTPX
       end
     end
 
-    type sessionBasicAuthentication = Plugins::sessionAuthentication & Plugins::Authentication::InstanceMethods
+    type sessionBasicAuthentication = Plugins::sessionAuthentication & Plugins::BasicAuthentication::InstanceMethods
   end
 end

data/sig/plugins/digest_authentication.rbs

@@ -27,6 +27,6 @@ module HTTPX
       end
     end
 
-    type sessionDigestAuthentication = Plugins::sessionAuthentication & Plugins::Authentication::InstanceMethods
+    type sessionDigestAuthentication = Plugins::sessionAuthentication & Plugins::DigestAuthentication::InstanceMethods
   end
 end

data/sig/plugins/follow_redirects.rbs

@@ -30,6 +30,6 @@ module HTTPX
       end
     end
 
-    type sessionFollowRedirects = Session & Plugins::Authentication::InstanceMethods
+    type sessionFollowRedirects = Session & Plugins::FollowRedirects::InstanceMethods
   end
 end

data/sig/plugins/grpc.rbs

@@ -0,0 +1,93 @@
+module HTTPX
+  class GRPCError < Error
+    attr_reader status: Integer
+    attr_reader details: String
+    attr_reader metadata: headers
+  end
+
+  module Plugins
+    module GRPC
+      type compression_option = bool | String
+      type rpc_def = [String, untyped, untyped, Hash[Symbol, untyped]]
+
+      type grpc_message = String | _Each[String]
+
+      type grpc_request = untyped | _Each[untyped]
+      type grpc_response = untyped | _Each[untyped]
+
+      class Call
+        attr_writer decoder: _Callable
+
+        def metadata: () -> headers
+
+        def trailing_metadata: () -> headers?
+
+        private
+
+        def initialize: (Response | StreamResponse response) -> untyped
+
+        def grpc_response: () -> grpc_response
+      end
+
+      module Message
+        def self?.unary: (response) -> grpc_message
+
+        def self?.stream: (StreamResponse) { (String) -> void } -> void
+                        | (StreamResponse) -> Enumerable[String]
+
+        def self?.encode: (String bytes, ?deflater: Compression::_Deflater?) -> String
+
+        def self?.decode: (String message, encodings: Array[String], encoders: Compression::encodings_registry) -> String
+                        | (String message, encodings: Array[String], encoders: Compression::encodings_registry) { (String) -> void } -> void
+        
+        def self?.cancel: (Request) -> void
+
+        def self?.verify_status: (StreamResponse | response) -> void
+      end
+
+      interface _GRPCOptions
+        def grpc_service: () -> String?
+        def grpc_service=: (string) -> String
+
+        def grpc_compression: () -> compression_option?
+        def grpc_compression=: (compression_option) -> compression_option
+
+        def grpc_rpcs: () -> Hash[String, rpc_def]?
+        def grpc_rpcs=: (Hash[String, rpc_def]) -> Hash[String, rpc_def]
+
+        def grpc_deadline: () -> Integer?
+        def grpc_deadline=: (Integer) -> Integer
+
+        def call_credentials: () -> credentials?
+        def call_credentials=: (credentials) -> credentials
+      end
+
+      def self.extra_options: (Options) -> (Options & _GRPCOptions)
+      def self.load_dependencies: (singleton(Session)) -> void
+
+      module ResponseMethods
+        def merge_headers: (headers_input trailers) -> void
+
+        def encoders: () -> Compression::encodings_registry
+      end
+
+      module InstanceMethods
+        def with_channel_credentials: (String ca_path, ?String? key, ?String? cert, **untyped) -> instance
+
+        def rpc: (_ToS rpc_name, untyped input, untyped output, **untyped) -> instance
+
+        def build_stub: (string origin, ?service: _ToS, ?compression: compression_option) -> instance
+
+        def execute:  (_ToS rpc_method, grpc_message input, ?deadline: Integer, ?metadata: headers_input, **untyped) -> Call
+
+        private
+
+        def rpc_execute: (_ToS rpc_method, grpc_request input, **untyped) -> Call
+
+        def build_grpc_request: (string rpc_method, grpc_message input, ?deadline: Integer, ?metadata?: headers_input, **untyped) -> Request
+      end
+    end
+
+    type grpcSession = Session & Plugins::GRPC::InstanceMethods
+  end
+end

data/sig/plugins/multipart.rbs

@@ -23,7 +23,7 @@ module HTTPX
 
         private
 
-        def initialize: (Hash[Symbol | string, multipart_nested_value] multipart_data) -> untyped
+        def initialize: (_Each[Symbol | string, multipart_nested_value] multipart_data) -> untyped
 
         def header_part: (string key, String content_type, String? filename) -> StringIO
 

data/sig/plugins/ntlm_authentication.rbs

@@ -0,0 +1,27 @@
+module HTTPX
+  module Plugins
+    module NTLMAuthentication
+
+      interface _NTLMOptions
+        def ntlm: () -> NTLMParams?
+        def ntlm=: (NTLMParams) -> NTLMParams
+      end
+ 
+      def self.extra_options: (Options) -> (Options & _NTLMOptions)
+
+      def self.load_dependencies: (*untyped) -> void
+
+      module InstanceMethods
+        def ntlm_authentication: (string user, string password, ?string? domain) -> instance
+      end
+
+      class NTLMParams
+        attr_reader user: String
+        attr_reader password: String
+        attr_reader domain: String?
+      end
+    end
+
+    type sessionNTLMAuthentication = Plugins::sessionAuthentication & Plugins::NTLMAuthentication::InstanceMethods
+  end
+end

data/sig/plugins/proxy/socks4.rbs

@@ -14,6 +14,7 @@ module HTTPX
         class SocksParser
           include Callbacks
 
+          def timeout: () -> Integer
           def close: () -> void
           def consume: (*untyped) -> void
           def empty: () -> bool

data/sig/plugins/proxy/socks5.rbs

@@ -15,6 +15,7 @@ module HTTPX
         class SocksParser
           include Callbacks
 
+          def timeout: () -> Integer
           def close: () -> void
           def consume: (*untyped) -> void
           def empty: () -> bool

data/sig/selector.rbs

@@ -2,6 +2,7 @@ module HTTPX
   class Selector
     READABLE: :r | :rw
     WRITABLE: :w | :rw
+    @selectables: Array[_ToIO]
 
     def register: (_ToIO) -> void
     def deregister: (_ToIO) -> void

data/sig/utils.rbs

@@ -0,0 +1,7 @@
+module HTTPX
+  module Utils
+    def self?.parse_retry_after: (String) -> Numeric
+
+    def self?.to_uri: (generic_uri uri) -> URI::Generic
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httpx
 version: !ruby/object:Gem::Version
-  version: 0.14.4
+  version: 0.15.3
 platform: ruby
 authors:
 - Tiago Cardoso
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-01 00:00:00.000000000 Z
+date: 2021-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-2-next
@@ -67,6 +67,11 @@ extra_rdoc_files:
 - doc/release_notes/0_14_2.md
 - doc/release_notes/0_14_3.md
 - doc/release_notes/0_14_4.md
+- doc/release_notes/0_14_5.md
+- doc/release_notes/0_15_0.md
+- doc/release_notes/0_15_1.md
+- doc/release_notes/0_15_2.md
+- doc/release_notes/0_15_3.md
 - doc/release_notes/0_1_0.md
 - doc/release_notes/0_2_0.md
 - doc/release_notes/0_2_1.md
@@ -113,6 +118,11 @@ files:
 - doc/release_notes/0_14_2.md
 - doc/release_notes/0_14_3.md
 - doc/release_notes/0_14_4.md
+- doc/release_notes/0_14_5.md
+- doc/release_notes/0_15_0.md
+- doc/release_notes/0_15_1.md
+- doc/release_notes/0_15_2.md
+- doc/release_notes/0_15_3.md
 - doc/release_notes/0_1_0.md
 - doc/release_notes/0_2_0.md
 - doc/release_notes/0_2_1.md
@@ -150,7 +160,6 @@ files:
 - lib/httpx/errors.rb
 - lib/httpx/extensions.rb
 - lib/httpx/headers.rb
-- lib/httpx/idna.rb
 - lib/httpx/io.rb
 - lib/httpx/io/ssl.rb
 - lib/httpx/io/tcp.rb
@@ -187,6 +196,7 @@ files:
 - lib/httpx/plugins/multipart/encoder.rb
 - lib/httpx/plugins/multipart/mime_type_detector.rb
 - lib/httpx/plugins/multipart/part.rb
+- lib/httpx/plugins/ntlm_authentication.rb
 - lib/httpx/plugins/persistent.rb
 - lib/httpx/plugins/proxy.rb
 - lib/httpx/plugins/proxy/http.rb
@@ -199,7 +209,9 @@ files:
 - lib/httpx/plugins/stream.rb
 - lib/httpx/plugins/upgrade.rb
 - lib/httpx/plugins/upgrade/h2.rb
+- lib/httpx/pmatch_extensions.rb
 - lib/httpx/pool.rb
+- lib/httpx/punycode.rb
 - lib/httpx/registry.rb
 - lib/httpx/request.rb
 - lib/httpx/resolver.rb
@@ -244,8 +256,10 @@ files:
 - sig/plugins/digest_authentication.rbs
 - sig/plugins/expect.rbs
 - sig/plugins/follow_redirects.rbs
+- sig/plugins/grpc.rbs
 - sig/plugins/h2c.rbs
 - sig/plugins/multipart.rbs
+- sig/plugins/ntlm_authentication.rbs
 - sig/plugins/persistent.rbs
 - sig/plugins/proxy.rbs
 - sig/plugins/proxy/http.rbs
@@ -273,6 +287,7 @@ files:
 - sig/transcoder/chunker.rbs
 - sig/transcoder/form.rbs
 - sig/transcoder/json.rbs
+- sig/utils.rbs
 homepage: https://gitlab.com/honeyryderchuck/httpx
 licenses:
 - Apache 2.0
@@ -281,6 +296,7 @@ metadata:
   changelog_uri: https://honeyryderchuck.gitlab.io/httpx/#release-notes
   documentation_uri: https://honeyryderchuck.gitlab.io/httpx/rdoc/
   source_code_uri: https://gitlab.com/honeyryderchuck/httpx
+  homepage_uri: https://honeyryderchuck.gitlab.io/httpx/
 post_install_message:
 rdoc_options: []
 require_paths: