httpx 1.1.3 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88e35920c570a12032835c1c67c9ffde6119b0f5e26e357ba58dbe385e1483a5
-  data.tar.gz: e421a0532b92e6a1e689c1d907ef0b87d98e6589093d791ce9a905d475b0c638
+  metadata.gz: d95b9f470645015a3308ade4ab2349375eddd0598f6919fbf063d4feba61926c
+  data.tar.gz: 95518fc5601eb0ba9a22e13814f9f0a339addca71e94c33122ed211780049ca4
 SHA512:
-  metadata.gz: e01adb8c3974497b091c72d8b9848dd02973c19924c910be4649f83c3430b579a6ea0889f0f27a348cabbddd6ed56cc1b682be0ae984b4dd0ef5dbf76543ba8e
-  data.tar.gz: 343ace24f2a3be6ce420b4c5f8fbe919ad84dabdc8f3b97bbafc3bda8466fef6dfa48a1985478fd7ec6056678818a60b9cfb158f4423569086f42d4c27c696f6
+  metadata.gz: 729bfc7fc5888f6872ecf9dfdcaefa6df68ba96b705cf1ccd1e8b9b866d25bf2c3081577b3c1828b99556009fc686c0705eb30dcb6fd5f2a3fb951128e0c621e
+  data.tar.gz: 1173ae3cd242caf251c099e14db090efc3ac3524d8e3f63e04c331f2938a6d747c9874999d79dbc4790894fc8c447c900740235a62cb0376f2b124dad3674acc

data/doc/release_notes/1_1_3.md

@@ -1,4 +1,4 @@
-# 1.1.2
+# 1.1.3
 
 ## improvements
 

data/doc/release_notes/1_1_4.md

@@ -0,0 +1,6 @@
+# 1.1.4
+
+## bugfixes
+
+* datadog adapter: use `Gem::Version` to invoke the correct configuration API.
+* stream plugin: do not preempt request enqueuing (this was making integration with the `:follow_redirects` plugin fail when set up with `webmock`).

data/doc/release_notes/1_1_5.md

@@ -0,0 +1,12 @@
+# 1.1.5
+
+## improvements
+
+* pattern matching support for responses has been backported to ruby 2.7 as well.
+
+## bugfixes
+
+* `stream` plugin: fix for `HTTPX::StreamResponse#each_line` not yielding the last line of the payload when not delimiter-terminated.
+* `stream` plugin: fix `webmock` adapter integration when methods calls would happen in the `HTTPX::StreamResponse#each` block.
+* `stream` plugin: fix `:follow_redirects` plugin integration which was caching the redirect response and using it for method calls inside the `HTTPX::StreamResponse#each` block.
+* "103 early hints" responses will be ignored when processing the response (it was causing the response returned by sesssions to hold its headers, instead of the following 200 response, while keeping the 200 response body).

data/lib/httpx/adapters/datadog.rb

@@ -126,7 +126,7 @@ module Datadog::Tracing
           option :distributed_tracing, default: true
           option :split_by_domain, default: false
 
-          if DDTrace::VERSION::STRING >= "1.13.0"
+          if Gem::Version.new(DDTrace::VERSION::STRING) >= Gem::Version.new("1.13.0")
             option :enabled do |o|
               o.type :bool
               o.env "DD_TRACE_HTTPX_ENABLED"
@@ -182,12 +182,12 @@ module Datadog::Tracing
 
           option :distributed_tracing, default: true
 
-          if DDTrace::VERSION::STRING >= "1.15.0"
+          if Gem::Version.new(DDTrace::VERSION::STRING) >= Gem::Version.new("1.15.0")
             option :error_handler do |o|
               o.type :proc
               o.default_proc(&DEFAULT_ERROR_HANDLER)
             end
-          elsif DDTrace::VERSION::STRING >= "1.13.0"
+          elsif Gem::Version.new(DDTrace::VERSION::STRING) >= Gem::Version.new("1.13.0")
             option :error_handler do |o|
               o.type :proc
               o.experimental_default_proc(&DEFAULT_ERROR_HANDLER)

data/lib/httpx/adapters/webmock.rb

@@ -38,12 +38,10 @@ module WebMock
 
           return build_error_response(request, webmock_response.exception) if webmock_response.exception
 
-          response = request.options.response_class.new(request,
-                                                        webmock_response.status[0],
-                                                        "2.0",
-                                                        webmock_response.headers)
-          response << webmock_response.body.dup
-          response
+          request.options.response_class.new(request,
+                                             webmock_response.status[0],
+                                             "2.0",
+                                             webmock_response.headers)
         end
 
         def build_error_response(request, exception)
@@ -90,6 +88,7 @@ module WebMock
             log { "mocking #{request.uri} with #{mock_response.inspect}" }
             request.response = response
             request.emit(:response, response)
+            response << mock_response.body.dup unless response.is_a?(HTTPX::ErrorResponse)
           elsif WebMock.net_connect_allowed?(request_signature.uri)
             if WebMock::CallbackRegistry.any_callbacks?
               request.on(:response) do |resp|

data/lib/httpx/plugins/auth.rb

@@ -7,7 +7,7 @@ module HTTPX
     # the HTTP Authorization header, and another, +bearer_auth+, which fill the "Bearer " prefix
     # in its value.
     #
-    # https://gitlab.com/os85/httpx/wikis/Auth#authorization
+    # https://gitlab.com/os85/httpx/wikis/Auth#auth
     #
     module Auth
       module InstanceMethods

data/lib/httpx/plugins/basic_auth.rb

@@ -5,7 +5,7 @@ module HTTPX
     #
     # This plugin adds helper methods to implement HTTP Basic Auth (https://tools.ietf.org/html/rfc7617)
     #
-    # https://gitlab.com/os85/httpx/wikis/Authorization#basic-auth
+    # https://gitlab.com/os85/httpx/wikis/Auth#basic-auth
     #
     module BasicAuth
       class << self

data/lib/httpx/plugins/digest_auth.rb

@@ -5,7 +5,7 @@ module HTTPX
     #
     # This plugin adds helper methods to implement HTTP Digest Auth (https://tools.ietf.org/html/rfc7616)
     #
-    # https://gitlab.com/os85/httpx/wikis/Authorization#digest-auth
+    # https://gitlab.com/os85/httpx/wikis/Auth#digest-auth
     #
     module DigestAuth
       DigestError = Class.new(Error)

data/lib/httpx/plugins/grpc/call.rb

@@ -11,6 +11,7 @@ module HTTPX
           @response = response
           @decoder = ->(z) { z }
           @consumed = false
+          @grpc_response = nil
         end
 
         def inspect
@@ -34,9 +35,7 @@ module HTTPX
         private
 
         def grpc_response
-          return @grpc_response if defined?(@grpc_response)
-
-          @grpc_response = if @response.respond_to?(:each)
+          @grpc_response ||= if @response.respond_to?(:each)
             Enumerator.new do |y|
               Message.stream(@response).each do |message|
                 y << @decoder.call(message)

data/lib/httpx/plugins/grpc/grpc_encoding.rb

@@ -36,8 +36,8 @@ module HTTPX
 
       class Inflater
         def initialize(response)
-          @encodings = response.headers.get("grpc-encoding")
           @response = response
+          @grpc_encodings = nil
         end
 
         def call(message, &blk)
@@ -49,7 +49,7 @@ module HTTPX
             encoded_data = message.byteslice(5..size + 5 - 1)
 
             if compressed == 1
-              @encodings.reverse_each do |encoding|
+              grpc_encodings.reverse_each do |encoding|
                 decoder = @response.body.class.initialize_inflater_by_encoding(encoding, @response, bytesize: encoded_data.bytesize)
                 encoded_data = decoder.call(encoded_data)
 
@@ -68,6 +68,12 @@ module HTTPX
 
           data
         end
+
+        private
+
+        def grpc_encodings
+          @grpc_encodings ||= @response.headers.get("grpc-encoding")
+        end
       end
 
       def self.encode(*args, **kwargs)

data/lib/httpx/plugins/grpc.rb

@@ -215,7 +215,7 @@ module HTTPX
                     **opts)
           grpc_request = build_grpc_request(rpc_method, input, deadline: deadline, metadata: metadata, **opts)
           response = request(grpc_request, **opts)
-          response.raise_for_status
+          response.raise_for_status unless opts[:stream]
           GRPC::Call.new(response)
         end
 

data/lib/httpx/plugins/ntlm_auth.rb

@@ -3,7 +3,7 @@
 module HTTPX
   module Plugins
     #
-    # https://gitlab.com/os85/httpx/wikis/Authorization#ntlm-auth
+    # https://gitlab.com/os85/httpx/wikis/Auth#ntlm-auth
     #
     module NTLMAuth
       class << self

data/lib/httpx/plugins/stream.rb

@@ -2,10 +2,10 @@
 
 module HTTPX
   class StreamResponse
-    def initialize(request, session, connections)
+    def initialize(request, session)
       @request = request
       @session = session
-      @connections = connections
+      @response = nil
     end
 
     def each(&block)
@@ -16,19 +16,9 @@ module HTTPX
       begin
         @on_chunk = block
 
-        if @request.response
-          # if we've already started collecting the payload, yield it first
-          # before proceeding
-          body = @request.response.body
-
-          body.each do |chunk|
-            on_chunk(chunk)
-          end
-        end
-
         response.raise_for_status
-        response.close
       ensure
+        response.close if @response
         @on_chunk = nil
       end
     end
@@ -36,7 +26,7 @@ module HTTPX
     def each_line
       return enum_for(__method__) unless block_given?
 
-      line = +""
+      line = "".b
 
       each do |chunk|
         line << chunk
@@ -47,6 +37,8 @@ module HTTPX
           line = line.byteslice(idx + 1..-1)
         end
       end
+
+      yield line unless line.empty?
     end
 
     # This is a ghost method. It's to be used ONLY internally, when processing streams
@@ -69,9 +61,11 @@ module HTTPX
     private
 
     def response
-      @session.__send__(:receive_requests, [@request], @connections) until @request.response
+      return @response if @response
 
-      @request.response
+      @request.response || begin
+        @response = @session.request(@request)
+      end
     end
 
     def respond_to_missing?(meth, *args)
@@ -105,9 +99,7 @@ module HTTPX
 
           request = requests.first
 
-          connections = _send_requests(requests)
-
-          StreamResponse.new(request, self, connections)
+          StreamResponse.new(request, self)
         end
       end
 

data/lib/httpx/request.rb

@@ -119,10 +119,21 @@ module HTTPX
     def response=(response)
       return unless response
 
-      if response.is_a?(Response) && response.status == 100 && @headers.key?("expect")
-        @informational_status = response.status
-        return
+      if response.is_a?(Response) && response.status < 200
+        # deal with informational responses
+
+        if response.status == 100 && @headers.key?("expect")
+          @informational_status = response.status
+          return
+        end
+
+        if response.status >= 103
+          # 103 Early Hints advertises resources in document to browsers.
+          # not very relevant for an HTTP client, discard.
+          return
+        end
       end
+
       @response = response
 
       emit(:response_started, response)

data/lib/httpx/response.rb

@@ -264,4 +264,4 @@ end
 
 require_relative "response/body"
 require_relative "response/buffer"
-require_relative "pmatch_extensions" if RUBY_VERSION >= "3.0.0"
+require_relative "pmatch_extensions" if RUBY_VERSION >= "2.7.0"

data/lib/httpx/version.rb

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

data/sig/plugins/grpc/grpc_encoding.rbs

@@ -21,11 +21,15 @@ module HTTPX
 
       class Inflater
         @response: Response
-        @encodings: Array[String]
+        @grpc_encodings: Array[String]
 
         def initialize: (Response | StreamResponse response) -> void
 
         def call: (String message) ?{ (String) -> void } -> String
+
+        private
+
+        def grpc_encodings: () -> Array[String]
       end
 
     end

data/sig/plugins/stream.rbs

@@ -1,21 +1,4 @@
 module HTTPX
-  class StreamResponse
-    include _ToS
-
-    def each: () { (String) -> void } -> void
-            | () -> Enumerable[String]
-
-    def each_line: () { (String) -> void } -> void
-                 | () -> Enumerable[String]
-
-    def on_chunk: (string) -> void
-
-    private
-
-    def response: () -> response
-    def initialize: (Request, Session, Array[Connection]) -> untyped
-  end
-
   module Plugins
     module Stream
       module InstanceMethods
@@ -37,4 +20,28 @@ module HTTPX
 
     type sessionStream = Session & Stream::InstanceMethods
   end
+
+  class StreamResponse
+    include _ToS
+
+    type streamRequest = Request & Plugins::Stream::RequestMethods
+
+    @request: streamRequest
+    @session: Plugins::sessionStream
+    @on_chunk: ^(String) -> void | nil
+
+    def each: () { (String) -> void } -> void
+            | () -> Enumerable[String]
+
+    def each_line: () { (String) -> void } -> void
+                 | () -> Enumerable[String]
+
+    def on_chunk: (string) -> void
+
+    def initialize: (streamRequest, Plugins::sessionStream) -> void
+
+    private
+
+    def response: () -> response
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httpx
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.5
 platform: ruby
 authors:
 - Tiago Cardoso
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-17 00:00:00.000000000 Z
+date: 2023-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-2-next
@@ -135,6 +135,8 @@ extra_rdoc_files:
 - doc/release_notes/1_1_1.md
 - doc/release_notes/1_1_2.md
 - doc/release_notes/1_1_3.md
+- doc/release_notes/1_1_4.md
+- doc/release_notes/1_1_5.md
 files:
 - LICENSE.txt
 - README.md
@@ -241,6 +243,8 @@ files:
 - doc/release_notes/1_1_1.md
 - doc/release_notes/1_1_2.md
 - doc/release_notes/1_1_3.md
+- doc/release_notes/1_1_4.md
+- doc/release_notes/1_1_5.md
 - lib/httpx.rb
 - lib/httpx/adapters/datadog.rb
 - lib/httpx/adapters/faraday.rb