httpx 1.3.1 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0162427fe818aafee88a35a12a821cf4f1016701f4513835c91556a7e8579e9e
-  data.tar.gz: f559d77efcdbf0e557c28c9a012cb67f45a95de8f8c2fac521800679ea30dc31
+  metadata.gz: 8829f986611d6b07d5c8b14ed0a51152e7f9303d01d1ec9469263f78843ce339
+  data.tar.gz: 8e55596dd065b9b3d352a0ad3173577556ea5bfb7963ea85287bb58d9018160b
 SHA512:
-  metadata.gz: 1dd2fa825bdaef26137e8c5d993dcb426eab7897adc8570a343863e7842f3732948bdc827c58e1e361bb35b2c1d549b02d89051a592a836a51f39afb95a77263
-  data.tar.gz: 8a64f6fc512fd8fa60d7feeffff6447d3c8a4081fe6494873b4a527f425dad090ca84b810a2a91477b051a4dfeb0bbb12e0563ef37c20e8d5daab05f2a208138
+  metadata.gz: b46a5f9f27b7571051fc95ef5d11d03cdaaa822cd08684ad1b1cf2605aacabc42ea1762f152303932bdd1e1f41c89447017ffcfaee8f995f04fdd908cbe69444
+  data.tar.gz: 57c5407473eb1fa8bbe7e4f3e3fef3288e8a8074776378a130894e72931833acf7bd30cd235f904fcd96cda810a3ec7118a3de9a66b28124ffd18de6b2fc1c42

data/doc/release_notes/1_3_2.md

@@ -0,0 +1,6 @@
+# 1.3.2
+
+## Bugfixes
+
+* Prevent `NoMethodError` in an edge case when the `:proxy` plugin is autoloaded via env vars and webmock adapter are used in tandem, and a real request fails.
+* raise invalid uri error if passed request uri does not contain the host part (ex: `"https:/get"`)

data/doc/release_notes/1_3_3.md

@@ -0,0 +1,5 @@
+# 1.3.2
+
+## Bugfixes
+
+* fixing a regression introduced in 1.3.2 associated with the webmock adapter, which expects matchable request bodies to be strings

data/lib/httpx/adapters/webmock.rb

@@ -20,7 +20,7 @@ module WebMock
           WebMock::RequestSignature.new(
             request.verb.downcase.to_sym,
             uri.to_s,
-            body: request.body.each.to_a.join,
+            body: request.body.to_s,
             headers: request.headers.to_h
           )
         end

data/lib/httpx/plugins/proxy.rb

@@ -166,6 +166,8 @@ module HTTPX
           response = super
 
           if response.is_a?(ErrorResponse) && proxy_error?(request, response)
+            return response unless @_proxy_uris
+
             @_proxy_uris.shift
 
             # return last error response if no more proxies to try

data/lib/httpx/request.rb

@@ -83,7 +83,7 @@ module HTTPX
 
       @options = @body.options
 
-      if @uri.relative?
+      if @uri.relative? || @uri.host.nil?
         origin = @options.origin
         raise(Error, "invalid URI: #{@uri}") unless origin
 

data/lib/httpx/session2.rb

@@ -3,7 +3,7 @@
 require_relative "session"
 module HTTPX
   class Session
-    def initialize(options = EMPTY_HASH, &blk)
+    def initialize(options = EMPTY, &blk)
       @options = self.class.default_options.merge(options)
       @responses = {}
       @persistent = @options.persistent

data/lib/httpx/transcoder/body.rb

@@ -13,6 +13,8 @@ module HTTPX::Transcoder
 
       def_delegator :@raw, :to_s
 
+      def_delegator :@raw, :==
+
       def initialize(body)
         @raw = body
       end

data/lib/httpx/transcoder/form.rb

@@ -20,6 +20,8 @@ module HTTPX
 
         def_delegator :@raw, :bytesize
 
+        def_delegator :@raw, :==
+
         def initialize(form)
           @raw = form.each_with_object("".b) do |(key, val), buf|
             HTTPX::Transcoder.normalize_keys(key, val) do |k, v|

data/lib/httpx/transcoder/json.rb

@@ -15,6 +15,8 @@ module HTTPX::Transcoder
 
       def_delegator :@raw, :bytesize
 
+      def_delegator :@raw, :==
+
       def initialize(json)
         @raw = JSON.json_dump(json)
         @charset = @raw.encoding.name.downcase

data/lib/httpx/transcoder/multipart/encoder.rb

@@ -18,6 +18,12 @@ module HTTPX
         "multipart/form-data; boundary=#{@boundary}"
       end
 
+      def to_s
+        read
+      ensure
+        rewind
+      end
+
       def read(length = nil, outbuf = nil)
         data   = String(outbuf).clear.force_encoding(Encoding::BINARY) if outbuf
         data ||= "".b

data/lib/httpx/version.rb

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

data/sig/transcoder/multipart.rbs

@@ -28,6 +28,8 @@ module HTTPX
 
         def content_type: () -> String
 
+        def to_s: () -> String
+
         def read: (?int? length, ?string? buffer) -> String?
 
         def rewind: () -> void

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httpx
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.3
 platform: ruby
 authors:
 - Tiago Cardoso
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-20 00:00:00.000000000 Z
+date: 2024-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-2
@@ -146,6 +146,8 @@ extra_rdoc_files:
 - doc/release_notes/1_2_6.md
 - doc/release_notes/1_3_0.md
 - doc/release_notes/1_3_1.md
+- doc/release_notes/1_3_2.md
+- doc/release_notes/1_3_3.md
 files:
 - LICENSE.txt
 - README.md
@@ -263,6 +265,8 @@ files:
 - doc/release_notes/1_2_6.md
 - doc/release_notes/1_3_0.md
 - doc/release_notes/1_3_1.md
+- doc/release_notes/1_3_2.md
+- doc/release_notes/1_3_3.md
 - lib/httpx.rb
 - lib/httpx/adapters/datadog.rb
 - lib/httpx/adapters/faraday.rb
@@ -335,7 +339,6 @@ files:
 - lib/httpx/plugins/webdav.rb
 - lib/httpx/pmatch_extensions.rb
 - lib/httpx/pool.rb
-- lib/httpx/pool/synch_pool.rb
 - lib/httpx/punycode.rb
 - lib/httpx/request.rb
 - lib/httpx/request/body.rb
@@ -480,7 +483,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: HTTPX, to the future, and beyond

data/lib/httpx/pool/synch_pool.rb

@@ -1,93 +0,0 @@
-# frozen_string_literal: true
-
-require "thread"
-
-module HTTPX
-  class SynchPool < Pool
-    def initialize(options)
-      super
-
-      @connections = ConnectionStore.new(options)
-    end
-
-    # TODO: #wrap
-    def find_or_new_connection(uri, options, &blk)
-      @connections.find_or_new(uri, options) do |new_conn|
-        catch(:coalesced) do
-          init_connection(new_conn, options)
-          blk.call(new_conn) if blk
-          new_conn
-        end
-      end
-      find_connection(uri, options) || new_connection(uri, options, &blk)
-    end
-
-    class ConnectionManager
-      include Enumerable
-
-      def initialize(limit = 3)
-        @connections = []
-        @used = 0
-        @limit = limit
-      end
-
-      def each(*args, &blk)
-        @connections.each(*args, &blk)
-      end
-
-      def find_or_new(uri, options, &blk)
-        raise "over limit" if @used >= @limit
-
-        @used += 1
-        conn = @connections.find do |connection|
-          connection.match?(uri, options)
-        end
-
-        if conn
-          @connections.delete(conn)
-        else
-          conn = options.connection_class.new(uri, options)
-          blk[conn]
-        end
-
-        conn
-      end
-    end
-
-    class ConnectionStore
-      include Enumerable
-
-      def initialize(options)
-        @connections = Hash.new { |hs, k| hs[k] ||= ConnectionManager.new }
-        @conn_mtx = Thread::Mutex.new
-        @conn_waiter = ConditionVariable.new
-        @timeout = Float(options.fetch(:pool_timeout, 5))
-      end
-
-      def each(&block)
-        return enum_for(__meth__) unless block
-
-        @conn_mtx.synchronize do
-          @connections.each_value do |conns|
-            conns.each(&block)
-          end
-        end
-      end
-
-      def find_or_new(uri, options, &blk)
-        @connections[uri.origin].find_or_new(uri, options, &blk)
-      end
-
-      # def <<(conn)
-      #   @conn_mtx.synchronize do
-      #     origin, conns = @connections.find { |_orig, _| conn.origins.include?(origin) }
-      #     (conns || @connections[conn.origin.to_s]) << conn
-      #   end
-      # end
-
-      def empty?
-        @conn_mtx.synchronize { super }
-      end
-    end
-  end
-end