elastomer-client 6.2.3 → 6.3.0

data/lib/elastomer_client/client.rb

@@ -2,7 +2,7 @@
 
 require "addressable/template"
 require "faraday"
-require "faraday_middleware"
+require "faraday/gzip"
 require "multi_json"
 require "semantic"
 require "zlib"
@@ -132,7 +132,7 @@ module ElastomerClient
       @connection ||= Faraday.new(url) do |conn|
         conn.response(:parse_json)
         # Request compressed responses from ES and decompress them
-        conn.use(:gzip)
+        conn.request(:gzip)
         conn.request(:encode_json)
         conn.request(:limit_size, max_request_size:) if max_request_size
         conn.request(:elastomer_compress, compression:) if compress_body
@@ -140,10 +140,14 @@ module ElastomerClient
         conn.options[:timeout]      = read_timeout
         conn.options[:open_timeout] = open_timeout
 
+        # Faraday 2 removed the Connection#token_auth and #basic_auth helpers, and the
+        # :authorization middleware emits different header formats across Faraday majors.
+        # Set the Authorization header directly so the output is identical on 1.x and 2.x.
         if token_auth?
-          conn.token_auth(@token_auth)
+          conn.headers["Authorization"] = %(Token token="#{@token_auth}")
         elsif basic_auth?
-          conn.basic_auth(@basic_auth[:username], @basic_auth[:password])
+          credentials = ["#{@basic_auth[:username]}:#{@basic_auth[:password]}"].pack("m0")
+          conn.headers["Authorization"] = "Basic #{credentials}"
         end
 
         @connection_block&.call(conn)

data/lib/elastomer_client/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module ElastomerClient
-  VERSION = "6.2.3"
+  VERSION = "6.3.0"
 
   def self.version
     VERSION

data/test/client_test.rb

@@ -13,15 +13,15 @@ describe ElastomerClient::Client do
   end
 
   it "allows configuring the Faraday when a block is given" do
-    assert ElastomerClient::Client.new.connection.builder.handlers.none? { |handler| handler.klass == FaradayMiddleware::Instrumentation }
+    assert ElastomerClient::Client.new.connection.builder.handlers.none? { |handler| handler.klass == ElastomerClient::Middleware::OpaqueId }
 
     c = ElastomerClient::Client.new do |connection|
       assert_kind_of(Faraday::Connection, connection)
 
-      connection.use :instrumentation
+      connection.request :opaque_id
     end
 
-    assert c.connection.builder.handlers.any? { |handler| handler.klass == FaradayMiddleware::Instrumentation }
+    assert c.connection.builder.handlers.any? { |handler| handler.klass == ElastomerClient::Middleware::OpaqueId }
   end
 
   it "use Faraday's default adapter if none is specified" do
@@ -145,14 +145,9 @@ describe ElastomerClient::Client do
       })
       client = ElastomerClient::Client.new(**client_params)
 
-      connection = Faraday::Connection.new
-      basic_auth_spy = Spy.on(connection, :basic_auth).and_return(nil)
+      expected = "Basic #{["my_user:my_secret_password"].pack("m0")}"
 
-      Faraday.stub(:new, $client_params[:url], connection) do
-        client.ping
-      end
-
-      assert basic_auth_spy.has_been_called_with?("my_user", "my_secret_password")
+      assert_equal expected, client.connection.headers["Authorization"]
     end
 
     it "ignores basic authentication if password is missing" do
@@ -161,14 +156,7 @@ describe ElastomerClient::Client do
       })
       client = ElastomerClient::Client.new(**client_params)
 
-      connection = Faraday::Connection.new
-      basic_auth_spy = Spy.on(connection, :basic_auth).and_return(nil)
-
-      Faraday.stub(:new, $client_params[:url], connection) do
-        client.ping
-      end
-
-      refute_predicate basic_auth_spy, :has_been_called?
+      refute client.connection.headers.key?("Authorization")
     end
 
     it "ignores basic authentication if username is missing" do
@@ -177,28 +165,14 @@ describe ElastomerClient::Client do
       })
       client = ElastomerClient::Client.new(**client_params)
 
-      connection = Faraday::Connection.new
-      basic_auth_spy = Spy.on(connection, :basic_auth).and_return(nil)
-
-      Faraday.stub(:new, $client_params[:url], connection) do
-        client.ping
-      end
-
-      refute_predicate basic_auth_spy, :has_been_called?
+      refute client.connection.headers.key?("Authorization")
     end
 
     it "can use token authentication" do
       client_params = $client_params.merge(token_auth: "my_secret_token")
       client = ElastomerClient::Client.new(**client_params)
 
-      connection = Faraday::Connection.new
-      token_auth_spy = Spy.on(connection, :token_auth).and_return(nil)
-
-      Faraday.stub(:new, $client_params[:url], connection) do
-        client.ping
-      end
-
-      assert token_auth_spy.has_been_called_with?("my_secret_token")
+      assert_equal %(Token token="my_secret_token"), client.connection.headers["Authorization"]
     end
 
     it "prefers token authentication over basic" do
@@ -208,16 +182,7 @@ describe ElastomerClient::Client do
       }, token_auth: "my_secret_token")
       client = ElastomerClient::Client.new(**client_params)
 
-      connection = Faraday::Connection.new
-      basic_auth_spy = Spy.on(connection, :basic_auth).and_return(nil)
-      token_auth_spy = Spy.on(connection, :token_auth).and_return(nil)
-
-      Faraday.stub(:new, $client_params[:url], connection) do
-        client.ping
-      end
-
-      refute_predicate basic_auth_spy, :has_been_called?
-      assert token_auth_spy.has_been_called_with?("my_secret_token")
+      assert_equal %(Token token="my_secret_token"), client.connection.headers["Authorization"]
     end
   end
 
@@ -372,11 +337,15 @@ describe ElastomerClient::Client do
     it "adding retry logic retries up to 2 times" do
       retry_count = 0
 
+      # :retry maps to Faraday::Request::Retry on Faraday 1.x and Faraday::Retry::Middleware
+      # on Faraday 2.x (via faraday-retry). Look up whichever the running Faraday registers.
+      retry_klass = Faraday::Request.lookup_middleware(:retry)
+
       retry_options = {
         max: 2,
         interval: 0.05,
         methods: [:get],
-        exceptions: Faraday::Request::Retry::DEFAULT_EXCEPTIONS + [Faraday::ConnectionFailed],
+        exceptions: retry_klass::DEFAULT_EXCEPTIONS + [Faraday::ConnectionFailed],
         retry_block: proc { |env, options, retries, exc| retry_count += 1 }
       }
       retry_client = ElastomerClient::Client.new(port: 9205) do |connection|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastomer-client
 version: !ruby/object:Gem::Version
-  version: 6.2.3
+  version: 6.3.0
 platform: ruby
 authors:
 - Tim Pease
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-06-09 00:00:00.000000000 Z
+date: 2026-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -31,28 +31,34 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: faraday-gzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -120,6 +126,8 @@ files:
 - docs/snapshots.md
 - docs/templates.md
 - elastomer-client.gemspec
+- gemfiles/faraday_1.gemfile
+- gemfiles/faraday_2.gemfile
 - lib/elastomer_client/client.rb
 - lib/elastomer_client/client/bulk.rb
 - lib/elastomer_client/client/ccr.rb
@@ -141,6 +149,7 @@ files:
 - lib/elastomer_client/client/rest_api_spec/api_spec_v8_13.rb
 - lib/elastomer_client/client/rest_api_spec/api_spec_v8_17.rb
 - lib/elastomer_client/client/rest_api_spec/api_spec_v8_18.rb
+- lib/elastomer_client/client/rest_api_spec/api_spec_v8_19.rb
 - lib/elastomer_client/client/rest_api_spec/api_spec_v8_7.rb
 - lib/elastomer_client/client/rest_api_spec/rest_api.rb
 - lib/elastomer_client/client/scroller.rb
@@ -212,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: A library for interacting with Elasticsearch