elasticsearch 8.13.0 → 8.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81edddb9e4103d40bc3b06bb4fd1db49e8a62f17fab3fa914d737069d681d526
-  data.tar.gz: 29f8aa207a8e7e5a446a0fa0c6bc1bdb408f49020c53fbdaeba0066d4807306f
+  metadata.gz: 829c510c4fb0664f58d4be87a7d0d8eed2906b68e659f63b33a7e082cba6c1ee
+  data.tar.gz: bafb973a40c4eda2a5de4fb0abe5a7f4308efbe8105f531545953a405d2cb83f
 SHA512:
-  metadata.gz: 00e2fd8d54aa598c24e5b3e8f1452b117f65c951e30988b1927e8e504eda77027557d5963bdbec22d3e747c53f32eec3aae8a44e7a6b4f37edb336d894c01ce1
-  data.tar.gz: aa738720a203ddf228ce4835e2aaa3ad5b1bf2ed7380d7ba6f451630b831219cd7dfd17b016489350d12a7e62f2bad456a3a82368fbb53fa27720f92f79f4945
+  metadata.gz: 4c98e9e0c6cc219b281da17019021ce7bd7e28120c9390b05dd71550bf2527c99570002f779f504f10820effe1fc2cd0b2824213bb445184fb7b77eabc69532b
+  data.tar.gz: 6178b702bd1077554debcf12783ffd1cda149c507c87284cbe60028a0f06fe0db8f2c140f3c29fd19fca23ec456012087ff25f6dcec34553e63d550146248ede

data/elasticsearch.gemspec

@@ -46,7 +46,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.5'
 
   s.add_dependency 'elastic-transport', '~> 8.3'
-  s.add_dependency 'elasticsearch-api', '8.13.0'
+  s.add_dependency 'elasticsearch-api', '8.14.0'
   
   s.add_development_dependency 'base64'
   s.add_development_dependency 'bundler'

data/lib/elasticsearch/helpers/bulk_helper.rb

@@ -48,7 +48,9 @@ module Elasticsearch
       def ingest(docs, params = {}, body = {}, &block)
         ingest_docs = docs.map { |doc| { index: { _index: @index, data: doc} } }
         if (slice = params.delete(:slice))
-          ingest_docs.each_slice(slice) { |items| ingest(items, params, &block) }
+          ingest_docs.each_slice(slice) do |items|
+            ingest(items.map { |item| item[:index][:data] }, params, &block)
+          end
         else
           bulk_request(ingest_docs, params, &block)
         end

data/lib/elasticsearch/helpers/esql_helper.rb

@@ -57,11 +57,12 @@ module Elasticsearch
       #
       def self.query(client, query, params = {}, parser: {})
         response = client.esql.query({ body: { query: query }, format: 'json' }.merge(params))
+
         columns = response['columns']
         response['values'].map do |value|
           (value.length - 1).downto(0).map do |index|
             key = columns[index]['name']
-            value[index] = parser[key].call value[index] if parser[key]
+            value[index] = parser[key].call(value[index]) if value[index] && parser[key]
             { key => value[index] }
           end.reduce({}, :merge)
         end

data/lib/elasticsearch/version.rb

@@ -16,5 +16,5 @@
 # under the License.
 
 module Elasticsearch
-  VERSION = '8.13.0'.freeze
+  VERSION = '8.14.0'.freeze
 end

data/spec/integration/characters_escaping_spec.rb

@@ -14,11 +14,11 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+require 'spec_helper'
+
 ELASTICSEARCH_URL = ENV['TEST_ES_SERVER'] || "http://localhost:#{(ENV['PORT'] || 9200)}"
 raise URI::InvalidURIError unless ELASTICSEARCH_URL =~ /\A#{URI::DEFAULT_PARSER.make_regexp}\z/
 
-require 'spec_helper'
-
 context 'Elasticsearch client' do
   let(:client) do
     Elasticsearch::Client.new(host: ELASTICSEARCH_URL, user: 'elastic', password: 'changeme')

data/spec/integration/client_integration_spec.rb

@@ -14,12 +14,13 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-ELASTICSEARCH_URL = ENV['TEST_ES_SERVER'] || "http://localhost:#{(ENV['PORT'] || 9200)}"
-raise URI::InvalidURIError unless ELASTICSEARCH_URL =~ /\A#{URI::DEFAULT_PARSER.make_regexp}\z/
 
 require 'spec_helper'
 require 'logger'
 
+ELASTICSEARCH_URL = ENV['TEST_ES_SERVER'] || "http://localhost:#{(ENV['PORT'] || 9200)}"
+raise URI::InvalidURIError unless ELASTICSEARCH_URL =~ /\A#{URI::DEFAULT_PARSER.make_regexp}\z/
+
 context 'Elasticsearch client' do
   let(:logger) { Logger.new($stderr) }
 

data/spec/integration/helpers/bulk_helper_spec.rb

@@ -21,6 +21,7 @@ require 'tempfile'
 context 'Elasticsearch client helpers' do
   context 'Bulk helper' do
     let(:index) { 'bulk_animals' }
+    let(:index_slice) { 'bulk_animals_slice' }
     let(:params) { { refresh: 'wait_for' } }
     let(:bulk_helper) { Elasticsearch::Helpers::BulkHelper.new(client, index, params) }
     let(:docs) do
@@ -40,6 +41,7 @@ context 'Elasticsearch client helpers' do
 
     after do
       client.indices.delete(index: index, ignore: 404)
+      client.indices.delete(index: index_slice, ignore: 404)
     end
 
     it 'Ingests documents' do
@@ -76,10 +78,13 @@ context 'Elasticsearch client helpers' do
 
     it 'Ingests documents and yields response and docs' do
       slice = 2
+      bulk_helper = Elasticsearch::Helpers::BulkHelper.new(client, index_slice, params)
       response = bulk_helper.ingest(docs, {slice: slice}) do |response, docs|
         expect(response).to be_an_instance_of Elasticsearch::API::Response
         expect(docs.count).to eq slice
       end
+      response = client.search(index: index_slice, size: 200)
+      expect(response['hits']['hits'].map { |a| a['_source'].transform_keys(&:to_sym) }).to eq docs
     end
 
     context 'JSON File helper' do

data/spec/integration/helpers/esql_helper_spec.rb

@@ -16,6 +16,7 @@
 # under the License.
 require_relative 'helpers_spec_helper'
 require 'elasticsearch/helpers/esql_helper'
+require 'ipaddr'
 
 context 'Elasticsearch client helpers' do
   let(:index) { 'esql_helper_test' }
@@ -76,8 +77,6 @@ context 'Elasticsearch client helpers' do
   end
 
   it 'parses iterated objects when procs are passed in' do
-    require 'ipaddr'
-
     parser = {
       '@timestamp' => Proc.new { |t| DateTime.parse(t) },
       'client.ip' => Proc.new { |i| IPAddr.new(i) },
@@ -91,4 +90,29 @@ context 'Elasticsearch client helpers' do
       expect(r['event.duration']).to be_a String
     end
   end
+
+  it 'parser does not error when value is nil, leaves nil' do
+    client.index(
+      index: index,
+      body: {
+        '@timestamp' => nil,
+        'client.ip' => nil,
+        message: 'Connected to 10.1.0.1',
+        'event.duration' => 1756465
+      },
+      refresh: true
+    )
+    parser = {
+      '@timestamp' => Proc.new { |t| DateTime.parse(t) },
+      'client.ip' => Proc.new { |i| IPAddr.new(i) },
+      'event.duration' => Proc.new { |d| d.to_s }
+    }
+    response = esql_helper.query(client, query, parser: parser)
+    response.each do |r|
+      expect [DateTime, NilClass].include?(r['@timestamp'].class)
+      expect [IPAddr, NilClass].include?(r['client.ip'].class)
+      expect(r['message']).to be_a String
+      expect(r['event.duration']).to be_a String
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch
 version: !ruby/object:Gem::Version
-  version: 8.13.0
+  version: 8.14.0
 platform: ruby
 authors:
 - Elastic Client Library Maintainers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-03 00:00:00.000000000 Z
+date: 2024-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elastic-transport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.13.0
+        version: 8.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.13.0
+        version: 8.14.0
 - !ruby/object:Gem::Dependency
   name: base64
   requirement: !ruby/object:Gem::Requirement
@@ -257,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.9
 signing_key: 
 specification_version: 4
 summary: Ruby integrations for Elasticsearch