elasticsearch 7.14.1 → 7.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eeb9b8e4fea7d4902ba4133cd06f4bc07f8e47bf6a4fa34cf22c9e631c71ee39
-  data.tar.gz: 2b4f36b5a32a9b43ac43ae4128595905d7ad76d561eabc7cef2263c5beebd094
+  metadata.gz: 1ea82287d3f188a99c931c7d9f7a9b85ba249fd7bada5a2634be5ac547243d7f
+  data.tar.gz: f699d2dde8df851cd99b5e05e4663057219e9f99350aa36634dd4edfa8453816
 SHA512:
-  metadata.gz: af4069218616fe06d7b005632503860613b5f224a1e15d24c2375ad458c01bef0a2c5a93b25807f2df1010bb80bd1c7a88f51dc278a7c8e1db8a27a2f3332876
-  data.tar.gz: 4b1555a7c6c781c4a6eb74b5dbd343e25af9216d11eb571d9c80b57036d062e1f35fa8454f8ad4cca60f74623967e2d8f5c2604ced71d06f8db175d1a33b23ee
+  metadata.gz: 2ec0ff600a3a150fef2f7d1c4f73d2aefe38a07a9771b0232dcf0c08396b43a38bf60407c9a1e1861e379b99f7e327b910dc2ffad687eda9c9631a9ce63388e9
+  data.tar.gz: 260fadf2c1043c66c272910def2afcc75fe9bc8b59a0cc941e1458c5ec4cffc07bc53d58e0aad5b18f7ccd9bf7ade6d6df391462e3c15638beaa6aace13c8c2d

data/elasticsearch.gemspec

@@ -25,12 +25,12 @@ Gem::Specification.new do |s|
   s.authors       = ['Karel Minarik']
   s.email         = ['karel.minarik@elasticsearch.org']
   s.summary       = 'Ruby integrations for Elasticsearch'
-  s.homepage      = 'https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/7.x/index.html'
+  s.homepage      = 'https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/7.16/index.html'
   s.license       = 'Apache-2.0'
   s.metadata = {
-    'homepage_uri' => 'https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/7.x/index.html',
-    'changelog_uri' => 'https://github.com/elastic/elasticsearch-ruby/blob/7.x/CHANGELOG.md',
-    'source_code_uri' => 'https://github.com/elastic/elasticsearch-ruby/tree/7.x',
+    'homepage_uri' => 'https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/7.16/index.html',
+    'changelog_uri' => 'https://github.com/elastic/elasticsearch-ruby/blob/7.16/CHANGELOG.md',
+    'source_code_uri' => 'https://github.com/elastic/elasticsearch-ruby/tree/7.16',
     'bug_tracker_uri' => 'https://github.com/elastic/elasticsearch-ruby/issues'
   }
   s.files         = `git ls-files`.split($/)
@@ -45,8 +45,8 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.4'
 
-  s.add_dependency 'elasticsearch-transport', '7.14.1'
-  s.add_dependency 'elasticsearch-api',       '7.14.1'
+  s.add_dependency 'elasticsearch-transport', '7.16.3'
+  s.add_dependency 'elasticsearch-api',       '7.16.3'
 
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'byebug' unless defined?(JRUBY_VERSION) || defined?(Rubinius)

data/lib/elasticsearch/version.rb

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

data/spec/integration/characters_escaping_spec.rb

@@ -0,0 +1,94 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# 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'
+
+context 'Elasticsearch client' do
+  let(:client) do
+    Elasticsearch::Client.new(host: ELASTICSEARCH_URL, user: 'elastic', password: 'changeme')
+  end
+  let(:index) { 'tvs' }
+
+  after do
+    client.indices.delete(index: index)
+  end
+
+  context 'escaping spaces in ids' do
+    it 'escapes spaces for id when using index' do
+      response = client.index(index: index, id: 'a test 1', body: { name: 'A test 1' }, refresh: true)
+      expect(response['_id']).to eq 'a test 1'
+
+      response = client.search(index: index)
+      expect(response['hits']['hits'].first['_id']).to eq 'a test 1'
+
+      # Raises exception, _id is unrecognized
+      expect do
+        client.index(index: index, _id: 'a test 2', body: { name: 'A test 2' })
+      end.to raise_exception ArgumentError
+
+      # Raises exception, id is a query parameter
+      expect do
+        client.index(index: index, body: { name: 'A test 3', _id: 'a test 3' })
+      end.to raise_exception Elasticsearch::Transport::Transport::Errors::BadRequest
+    end
+
+    it 'escapes spaces for id when using create' do
+      # Works with create
+      response = client.create(index: index, id: 'a test 4', body: { name: 'A test 4' })
+      expect(response['_id']).to eq 'a test 4'
+    end
+
+    it 'escapes spaces for id when using bulk' do
+      body = [
+        { create: { _index: index, _id: 'a test 5', data: { name: 'A test 5' } } }
+      ]
+      expect(client.bulk(body: body, refresh: true))
+
+      response = client.search(index: index)
+      expect(
+        response['hits']['hits'].select { |a| a['_id'] == 'a test 5' }.size
+      ).to eq 1
+    end
+  end
+
+  context 'it doesnae escape plus signs in id' do
+    it 'escapes spaces for id when using index' do
+      response = client.index(index: index, id: 'a+test+1', body: { name: 'A test 1' })
+      expect(response['_id']).to eq 'a+test+1'
+    end
+
+    it 'escapes spaces for id when using create' do
+      # Works with create
+      response = client.create(index: index, id: 'a+test+2', body: { name: 'A test 2' })
+      expect(response['_id']).to eq 'a+test+2'
+    end
+
+    it 'escapes spaces for id when using bulk' do
+      body = [
+        { create: { _index: index, _id: 'a+test+3', data: { name: 'A test 3' } } }
+      ]
+      expect(client.bulk(body: body, refresh: true))
+
+      response = client.search(index: index)
+      expect(
+        response['hits']['hits'].select { |a| a['_id'] == 'a+test+3' }.size
+      ).to eq 1
+    end
+  end
+end

data/spec/integration/client_integration_spec.rb

@@ -51,7 +51,7 @@ context 'Elasticsearch client' do
   context 'Reports the right meta header' do
     it 'Reports es service name and gem version' do
       headers = client.transport.transport.connections.first.connection.headers
-      expect(headers['x-elastic-client-meta']).to match /^es=#{Elasticsearch::VERSION}/
+      expect(headers['x-elastic-client-meta']).to match Elastic.client_meta_version
     end
   end
 end

data/spec/unit/elasticsearch_product_validation_spec.rb

@@ -25,7 +25,7 @@ describe 'Elasticsearch: Validation' do
       .to_return(status: status, body: body, headers: headers)
   end
   let(:count_request_stub) do
-    stub_request(:post, "#{host}/_count")
+    stub_request(:get, "#{host}/_count")
       .to_return(status: 200, body: nil, headers: {})
   end
   let(:status) { 200 }
@@ -38,7 +38,7 @@ describe 'Elasticsearch: Validation' do
   def error_requests_and_expectations(message = Elasticsearch::NOT_ELASTICSEARCH_WARNING)
     expect { client.count }.to raise_error Elasticsearch::UnsupportedProductError, message
     assert_requested :get, host
-    assert_not_requested :post, "#{host}/_count"
+    assert_not_requested :get, "#{host}/_count"
     expect { client.cluster.health }.to raise_error Elasticsearch::UnsupportedProductError, message
     expect(client.instance_variable_get('@verified')).to be false
     expect { client.cluster.health }.to raise_error Elasticsearch::UnsupportedProductError, message
@@ -51,7 +51,7 @@ describe 'Elasticsearch: Validation' do
     client.count
     expect(client.instance_variable_get('@verified'))
     assert_requested :get, host
-    assert_requested :post, "#{host}/_count"
+    assert_requested :get, "#{host}/_count"
   end
 
   context 'When Elasticsearch replies with status 401' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch
 version: !ruby/object:Gem::Version
-  version: 7.14.1
+  version: 7.16.3
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-06 00:00:00.000000000 Z
+date: 2022-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch-transport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.14.1
+        version: 7.16.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.14.1
+        version: 7.16.3
 - !ruby/object:Gem::Dependency
   name: elasticsearch-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.14.1
+        version: 7.16.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.14.1
+        version: 7.16.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -200,18 +200,19 @@ files:
 - lib/elasticsearch-ruby.rb
 - lib/elasticsearch.rb
 - lib/elasticsearch/version.rb
+- spec/integration/characters_escaping_spec.rb
 - spec/integration/client_integration_spec.rb
 - spec/integration/validation_integration_spec.rb
 - spec/spec_helper.rb
 - spec/unit/elasticsearch_product_validation_spec.rb
 - spec/unit/wrapper_gem_spec.rb
-homepage: https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/7.x/index.html
+homepage: https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/7.16/index.html
 licenses:
 - Apache-2.0
 metadata:
-  homepage_uri: https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/7.x/index.html
-  changelog_uri: https://github.com/elastic/elasticsearch-ruby/blob/7.x/CHANGELOG.md
-  source_code_uri: https://github.com/elastic/elasticsearch-ruby/tree/7.x
+  homepage_uri: https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/7.16/index.html
+  changelog_uri: https://github.com/elastic/elasticsearch-ruby/blob/7.16/CHANGELOG.md
+  source_code_uri: https://github.com/elastic/elasticsearch-ruby/tree/7.16
   bug_tracker_uri: https://github.com/elastic/elasticsearch-ruby/issues
 post_install_message: 
 rdoc_options:
@@ -229,11 +230,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: Ruby integrations for Elasticsearch
 test_files:
+- spec/integration/characters_escaping_spec.rb
 - spec/integration/client_integration_spec.rb
 - spec/integration/validation_integration_spec.rb
 - spec/spec_helper.rb