httpx 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88e35920c570a12032835c1c67c9ffde6119b0f5e26e357ba58dbe385e1483a5
-  data.tar.gz: e421a0532b92e6a1e689c1d907ef0b87d98e6589093d791ce9a905d475b0c638
+  metadata.gz: d8999f3068b60027a01d29f4d840ff77828a151eaf377bec3959c26fcc0b2e25
+  data.tar.gz: cb1490afe5522a3c77c0a1f5ef44267d60d7e23993718c58f18525e971bf70d9
 SHA512:
-  metadata.gz: e01adb8c3974497b091c72d8b9848dd02973c19924c910be4649f83c3430b579a6ea0889f0f27a348cabbddd6ed56cc1b682be0ae984b4dd0ef5dbf76543ba8e
-  data.tar.gz: 343ace24f2a3be6ce420b4c5f8fbe919ad84dabdc8f3b97bbafc3bda8466fef6dfa48a1985478fd7ec6056678818a60b9cfb158f4423569086f42d4c27c696f6
+  metadata.gz: 5d29a339eb2781a8d8c1ff9b3c95f03717034eb32210639e355f8687129d80b614290d699d00e6bd5781998f14564a8dec4e1750545841e30dd53eaba58d3a9c
+  data.tar.gz: d9e0dd9966132648aa4ded10fe71cb94496337328575d0c99d6b861536401820c354742d5a923d79e2a7eff77a8649e7f1630e7c895e6f14fdbcf6e5e48bd828

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
+
+## bug reports
+
+* 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/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/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/grpc_encoding.rb

@@ -36,7 +36,6 @@ module HTTPX
 
       class Inflater
         def initialize(response)
-          @encodings = response.headers.get("grpc-encoding")
           @response = response
         end
 
@@ -49,7 +48,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 +67,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,9 @@
 
 module HTTPX
   class StreamResponse
-    def initialize(request, session, connections)
+    def initialize(request, session)
       @request = request
       @session = session
-      @connections = connections
     end
 
     def each(&block)
@@ -16,19 +15,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
@@ -69,9 +58,9 @@ module HTTPX
     private
 
     def response
-      @session.__send__(:receive_requests, [@request], @connections) until @request.response
-
-      @request.response
+      @response ||= begin
+        @request.response || @session.request(@request)
+      end
     end
 
     def respond_to_missing?(meth, *args)
@@ -105,9 +94,7 @@ module HTTPX
 
           request = requests.first
 
-          connections = _send_requests(requests)
-
-          StreamResponse.new(request, self, connections)
+          StreamResponse.new(request, self)
         end
       end
 

data/lib/httpx/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HTTPX
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 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

@@ -2,6 +2,10 @@ module HTTPX
   class StreamResponse
     include _ToS
 
+    @request: Request & RequestMethods
+    @session: sessionStream
+    @on_chunk: ^(String) -> void | nil
+
     def each: () { (String) -> void } -> void
             | () -> Enumerable[String]
 
@@ -10,10 +14,11 @@ module HTTPX
 
     def on_chunk: (string) -> void
 
+    def initialize: (Request, Session) -> void
+
     private
 
     def response: () -> response
-    def initialize: (Request, Session, Array[Connection]) -> untyped
   end
 
   module Plugins

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httpx
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Tiago Cardoso
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-17 00:00:00.000000000 Z
+date: 2023-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-2-next
@@ -135,6 +135,7 @@ 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
 files:
 - LICENSE.txt
 - README.md
@@ -241,6 +242,7 @@ 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
 - lib/httpx.rb
 - lib/httpx/adapters/datadog.rb
 - lib/httpx/adapters/faraday.rb