elastic-transport 8.2.3 → 8.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f666d1e77cc7d01dcb75db01ae517ee1645e6630b02c32f7052f79a4c77de48
-  data.tar.gz: 4a6af2555238d92045f6d22a15000d4a8666813602d5f3486d3f1f627ceecf58
+  metadata.gz: f216469707e9c57ce1ef8c9285504300763bc3603b95bb25d434c4d4cb584fec
+  data.tar.gz: 6ae9924b648db98d0a5d7d2f6770f0d3ff18a766b9f93545d11a5239dc3ae8c6
 SHA512:
-  metadata.gz: 1e17397db6f79a278db371ec799b15ce366e160e19c13d1fbdbb7b3bad8b36c0cefa77e0b5086083faba9348f42d79f52c3cb77d4554a653ac707a0bb505d435
-  data.tar.gz: 82ec2214beaae1a0423c09016140359e16b482fbc1c311906c96cb3cb8d2be54a1602cb6778c1fe624259fea92d2baf02932af223454eca4eba1403705813ba0
+  metadata.gz: d5e73feba635548e4109cf1c95c62cc1a12a04f46817e2edcc180cd54f0147ca1e200e5a7eb4278fa1a851fcde61ead7e9407b78adcdb81bec85569112733269
+  data.tar.gz: 666785c03ab0fc8d4f21636bc0856669c838ea546c983d8d2d9e41d20ea04e274ae3991261ddcdd101d64aef6db288c6da5c76fa5ec0e1002a61660b0e3f6dc9

data/.github/workflows/tests.yml

@@ -1,11 +1,11 @@
-name: main tests
+name: 8.2 tests
 on:
   push:
     branches:
-      - main
+      - 8.2
   pull_request:
     branches:
-      - main
+      - 8.2
 jobs:
   test:
     name: 'Main tests'
@@ -15,8 +15,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '3.0', '3.1', '3.2', 'jruby-9.3', 'jruby-9.4' ]
-        es_version: ['8.7-SNAPSHOT', '8.8-SNAPSHOT', '8.9-SNAPSHOT']
+        ruby: [ '3.0', '3.1', '3.2', '3.3', 'jruby-9.3', 'jruby-9.4' ]
+        es_version: ['8.11-SNAPSHOT', '8.12-SNAPSHOT']
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
@@ -53,8 +53,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '3.0', '3.1', '3.2', 'jruby-9.3' ]
-        es_version: ['8.9-SNAPSHOT']
+        ruby: [ '3.0', '3.1', '3.2', '3.3', 'jruby-9.3' ]
+        es_version: ['8.12-SNAPSHOT']
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 8.2.5
+
+Tested versions of Ruby: (MRI) 3.0, 3.1, 3.2, 3.3, JRuby 9.3 and JRuby 9.4
+
+- Removes unneccessary `require 'base64'` found thanks to warning in Ruby 3.3. So this removes the warning too if you were using Ruby 3.3.
+
+## 8.2.4
+
+Tested versions of Ruby: (MRI) 3.0, 3.1, 3.2, JRuby 9.3 and JRuby 9.4
+
+- Fixes [#66](https://github.com/elastic/elastic-transport-ruby/issues/66) - Manticore transport unable to send custom headers with perform_request [Pull Request](https://github.com/elastic/elastic-transport-ruby/pull/69)
+- Fixes [#67](https://github.com/elastic/elastic-transport-ruby/issues/67) - Float with many digits automatically becomes BigDecimal when using Oj. [Pull Request](https://github.com/elastic/elastic-transport-ruby/pull/68), thank you @kyoshidajp!
+
 ## 8.2.3
 
 Tested versions of Ruby: (MRI) 3.0, 3.1, 3.2, JRuby 9.3 and JRuby 9.4

data/Gemfile

@@ -26,6 +26,7 @@ group :development, :test do
   gem 'faraday-patron' unless defined? JRUBY_VERSION
   gem 'faraday-typhoeus'
   gem 'rspec'
+  gem 'oj' unless defined? JRUBY_VERSION
   if defined?(JRUBY_VERSION)
     gem 'pry-nav'
   else

data/Gemfile-faraday1.gemfile

@@ -31,6 +31,7 @@ group :development, :test do
   gem 'patron' unless defined? JRUBY_VERSION
   gem 'rspec'
   gem 'typhoeus'
+  gem 'oj' unless defined? JRUBY_VERSION
   if defined?(JRUBY_VERSION)
     gem 'pry-nav'
   else

data/lib/elastic/transport/client.rb

@@ -15,7 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-require 'base64'
 require 'elastic/transport/meta_header'
 
 module Elastic

data/lib/elastic/transport/meta_header.rb

@@ -15,8 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-require 'base64'
-
 module Elastic
   module Transport
     # Methods for the Elastic meta header used by Cloud.

data/lib/elastic/transport/transport/base.rb

@@ -346,10 +346,17 @@ module Elastic
             __raise_transport_error response unless ignore.include?(response.status.to_i)
           end
 
-          json = serializer.load(response.body) if response.body &&
-                                                       !response.body.empty? &&
-                                                       response.headers &&
-                                                       response.headers["content-type"] =~ /json/
+          if response.body &&
+            !response.body.empty? &&
+            response.headers &&
+            response.headers["content-type"] =~ /json/
+
+            # Prevent Float value from automatically becoming BigDecimal when using Oj
+            load_options = {}
+            load_options[:mode] = :compat if ::MultiJson.adapter.to_s == "MultiJson::Adapters::Oj"
+
+            json = serializer.load(response.body, load_options)
+          end
           took = (json['took'] ? sprintf('%.3fs', json['took'] / 1000.0) : 'n/a') rescue 'n/a'
           __log_response(method, path, params, body, url, response, json, took, duration) unless ignore.include?(response.status.to_i)
           __trace(method, path, params, connection_headers(connection), body, url, response, nil, 'N/A', duration) if tracer

data/lib/elastic/transport/transport/http/manticore.rb

@@ -90,11 +90,10 @@ module Elastic
           def perform_request(method, path, params = {}, body = nil, headers = nil, opts = {})
             super do |connection, url|
               body = body ? __convert_to_json(body) : nil
-              body, headers = compress_request(body, @request_options[:headers])
-
+              body, headers = compress_request(body, parse_headers(headers))
               params[:body] = body if body
               params[:headers] = headers if headers
-              params = params.merge @request_options
+
               case method
               when 'GET'
                 resp = connection.connection.get(url, params)
@@ -161,6 +160,12 @@ module Elastic
 
           private
 
+          def parse_headers(headers)
+            request_headers = @request_options.fetch(:headers, {})
+            headers = request_headers.merge(headers || {})
+            headers.empty? ? nil : headers
+          end
+
           def apply_headers(options)
             headers = options[:headers].clone || options.dig(:transport_options, :headers).clone || {}
             headers[CONTENT_TYPE_STR] = find_value(headers, CONTENT_TYPE_REGEX) || DEFAULT_CONTENT_TYPE

data/lib/elastic/transport/version.rb

@@ -17,6 +17,6 @@
 
 module Elastic
   module Transport
-    VERSION = '8.2.3'.freeze
+    VERSION = '8.2.5'.freeze
   end
 end

data/spec/elastic/transport/client_spec.rb

@@ -1190,6 +1190,49 @@ describe Elastic::Transport::Client do
         expect(logger).to have_received(:warn).with(warning)
       end
     end
+
+    context 'when Elasticsearch response includes long precision Float' do
+      let(:client) do
+        Elastic::Transport::Client.new(hosts: hosts)
+      end
+      before do
+        expect_any_instance_of(Faraday::Connection).to receive(:run_request) do
+          Elastic::Transport::Transport::Response.new(200, "{\"score\":1.11111111111111111}", { 'content-type' => 'application/json; charset=UTF-8' })
+        end
+      end
+
+      context 'when default JSON engine is used' do
+        after do
+          # Clear MultiJson's adapter
+          ::MultiJson.instance_variable_set(:@adapter, nil)
+        end
+        it 'returns as a Float' do
+          response = client.perform_request('GET', '/')
+          score = response.body['score']
+          expect(score).to eq 1.11111111111111111
+          expect(score.class).to eq Float
+        end
+      end
+
+      unless defined?(JRUBY_VERSION)
+        context 'when Oj is used as a JSON engine' do
+          before do
+            require 'oj'
+          end
+          after do
+            # Clear MultiJson's adapter
+            ::MultiJson.instance_variable_set(:@adapter, nil)
+          end
+
+          it 'returns as a Float' do
+            response = client.perform_request('GET', '/')
+            score = response.body['score']
+            expect(score).to eq 1.11111111111111111
+            expect(score.class).to eq Float
+          end
+        end
+      end
+    end
   end
 
   context 'when the client connects to Elasticsearch' do

data/spec/elastic/transport/http/manticore_spec.rb

@@ -53,7 +53,7 @@ if defined?(JRUBY_VERSION)
         expect(perform_request).to be_kind_of(Elastic::Transport::Transport::Response)
       end
 
-      it 'run body with preper params' do
+      it 'runs body with proper params' do
         expect(
           client.transport.connections.first.connection
         ).to receive(:post).with(
@@ -121,7 +121,7 @@ if defined?(JRUBY_VERSION)
           gzip.close.string
         end
 
-        it 'run body with preper params' do
+        it 'runs body with proper params' do
           expect(
             client.transport.connections.first.connection
           ).to receive(:post).with(*request_params).and_return(response)
@@ -141,6 +141,24 @@ if defined?(JRUBY_VERSION)
           end
         end
       end
+
+      context 'headers' do
+        it 'sends custom headers' do
+          client = Elastic::Transport::Client.new(
+            transport_class: described_class,
+            transport_options: { headers: { 'Elastic-Api-Version'=>'2023-10-31' } }
+          )
+          expect(
+            client.transport.connections.first.connection
+          ).to receive(:get).with(
+                 'http://localhost:9200/',
+                 {
+                   headers: expected_headers.merge({ 'Elastic-Api-Version'=>'2023-10-31' })
+                 }
+               ).and_return(response)
+          client.perform_request('GET', '/', {}, nil, headers)
+        end
+      end
     end
   end
 end

data/test/test_helper.rb

@@ -83,4 +83,4 @@ def is_faraday_v2?
   Gem::Version.new(Faraday::VERSION) >= Gem::Version.new(2)
 end
 
-Minitest::Reporters.use! FixedMinitestSpecReporter.new
+Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new(print_failure_summary: true)

data/test/unit/transport_manticore_test.rb

@@ -111,7 +111,7 @@ if JRUBY
                     {
                       body: '{"foo":"bar"}',
                       headers: {
-                        'Content-Type' => 'application/json',
+                        'Content-Type' => 'application/x-ndjson',
                         'User-Agent' => @transport.send(:user_agent_header)
                       }
                     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic-transport
 version: !ruby/object:Gem::Version
-  version: 8.2.3
+  version: 8.2.5
 platform: ruby
 authors:
 - Elastic Client Library Maintainers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-31 00:00:00.000000000 Z
+date: 2024-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -337,7 +337,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
 summary: Low level Ruby client for Elastic services.