elasticsearch 7.13.3 → 7.14.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dd904fe3389952a5434f9bdd54e43b085d686146620423f1f55e5e1cfcea9cc
-  data.tar.gz: 8456c08f65bde635e6238f01f6227d4688003c1083ac69c6b45029ba031d7679
+  metadata.gz: 2e005cdbfff8d8486e0cf54d74a9c68173235bd00ea1c42371438ba76433d78b
+  data.tar.gz: 50bd687f7cea41c62e5d53672e438467cb522890a707efe68b228521cf0dd170
 SHA512:
-  metadata.gz: cc9635e7f85dddfec58ea02f18f31a586f0e671abbbfb19038564c976097d982bad0f1777b94798a1f4baca88213d7ac03ca27dc162792903eed1724f3f62289
-  data.tar.gz: c4aeeeb547a5e678ff1421b0fbcdc521662d6606afc359f6e813cf38278b274be320e2b912d09b7e722f2a46f8518fbe0a741748f2f9ff10c8a407b703e11d2b
+  metadata.gz: 2f1641346dca4764402a543fdd86976804137b5bcadb696b306c3bb3683ba3b03f3605e56beaf14c310f72220c52874e973f18980867f83b4244464890f4fcbf
+  data.tar.gz: 02b2e651a97e7f5ffa3ca5548cf56e0e8a3c281728dd8b2ff94f8172f4db36f639860b6b3662d67ded42ec41369152e36cbb38885cf3a349bef5b90f76f704b5

data/README.md

@@ -86,6 +86,10 @@ Please refer to the specific library documentation for details:
    [[README]](https://github.com/elasticsearch/elasticsearch-ruby/blob/master/elasticsearch-api/README.md)
    [[Documentation]](http://rubydoc.info/gems/elasticsearch-api/file/README.markdown)
 
+## Development
+
+You can run `rake -T` to check the test tasks. Use `COVERAGE=true` before running a test task to check the coverage with Simplecov.
+
 ## License
 
 This software is licensed under the [Apache 2 license](./LICENSE).

data/Rakefile

@@ -15,40 +15,35 @@
 # specific language governing permissions and limitations
 # under the License.
 
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 
-desc "Run unit tests"
-task :test    => 'test:unit'
+task(:default) { system 'rake --tasks' }
+
+desc 'Run unit tests'
+task test: 'test:spec'
 
 # ----- Test tasks ------------------------------------------------------------
+require 'rspec/core/rake_task'
 
-require 'rake/testtask'
 namespace :test do
-  desc "Wait for Elasticsearch to be in a green state"
+  desc 'Wait for Elasticsearch to be in a green state'
   task :wait_for_green do
     sh '../scripts/wait-cluster.sh'
   end
 
-  Rake::TestTask.new(:unit) do |test|
-    test.libs << 'lib' << 'test'
-    test.test_files = FileList["test/unit/**/*_test.rb"]
-    test.verbose = false
-    test.warning = false
+  RSpec::Core::RakeTask.new(:integration) do |t|
+    t.pattern = 'spec/integration/**{,/*/**}/*_spec.rb'
   end
 
-  Rake::TestTask.new(:integration) do |test|
-    test.deps = [ :wait_for_green ]
-    test.libs << 'lib' << 'test'
-    test.test_files = FileList["test/integration/**/*_test.rb"]
-    test.verbose = false
-    test.warning = false
+  RSpec::Core::RakeTask.new(:unit) do |t|
+    t.pattern = 'spec/unit/**{,/*/**}/*_spec.rb'
   end
 
-  Rake::TestTask.new(:all) do |test|
-    test.libs << 'lib' << 'test'
-    test.test_files = FileList["test/unit/**/*_test.rb", "test/integration/**/*_test.rb"]
+  desc 'Run unit and integration tests'
+  task :all do
+    Rake::Task['test:unit'].invoke
+    Rake::Task['test:integration'].invoke
   end
-
 end
 
 # ----- Documentation tasks ---------------------------------------------------

data/elasticsearch.gemspec

@@ -45,31 +45,19 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.4'
 
-  s.add_dependency 'elasticsearch-transport', '7.13.3'
-  s.add_dependency 'elasticsearch-api',       '7.13.3'
+  s.add_dependency 'elasticsearch-transport', '7.14.0.pre'
+  s.add_dependency 'elasticsearch-api',       '7.14.0.pre'
 
   s.add_development_dependency 'bundler'
-
-  s.add_development_dependency 'rake', '~> 13'
-
-  s.add_development_dependency 'elasticsearch-extensions'
-
-  s.add_development_dependency 'ansi'
-  s.add_development_dependency 'shoulda-context'
-  s.add_development_dependency 'mocha'
-  s.add_development_dependency 'yard'
+  s.add_development_dependency 'byebug' unless defined?(JRUBY_VERSION) || defined?(Rubinius)
   s.add_development_dependency 'pry'
-
-
-  s.add_development_dependency 'minitest'
-  s.add_development_dependency 'minitest-reporters'
-  s.add_development_dependency 'ruby-prof' unless defined?(JRUBY_VERSION) || defined?(Rubinius)
+  s.add_development_dependency 'rake', '~> 13'
   s.add_development_dependency 'require-prof' unless defined?(JRUBY_VERSION) || defined?(Rubinius)
-  s.add_development_dependency 'simplecov', '~> 0.17', '< 0.18'
-  s.add_development_dependency 'simplecov-rcov'
-  s.add_development_dependency 'cane'
-
-  s.add_development_dependency 'test-unit', '~> 2'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'ruby-prof' unless defined?(JRUBY_VERSION) || defined?(Rubinius)
+  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'webmock'
+  s.add_development_dependency 'yard'
 
   s.description = <<-DESC.gsub(/^    /, '')
     Ruby integrations for Elasticsearch (client, API, etc.)

data/lib/elasticsearch.rb

@@ -15,18 +15,91 @@
 # specific language governing permissions and limitations
 # under the License.
 
-require "elasticsearch/version"
-
+require 'elasticsearch/version'
 require 'elasticsearch/transport'
 require 'elasticsearch/api'
 
 module Elasticsearch
-  module Transport
-    class Client
-      include Elasticsearch::API
+  SECURITY_PRIVILEGES_VALIDATION_WARNING = 'The client is unable to verify that the server is Elasticsearch due to security privileges on the server side.'.freeze
+  NOT_ELASTICSEARCH_WARNING = 'The client noticed that the server is not Elasticsearch and we do not support this unknown product.'.freeze
+  YOU_KNOW_FOR_SEARCH = 'You know, for Search'.freeze
+
+  class Client
+    include Elasticsearch::API
+    attr_accessor :transport
+
+    # See Elasticsearch::Transport::Client for initializer parameters
+    def initialize(arguments = {}, &block)
+      @verified = false
+      @transport = Elasticsearch::Transport::Client.new(arguments, &block)
+    end
+
+    def method_missing(name, *args, &block)
+      if name == :perform_request
+        verify_elasticsearch unless @verified
+        @transport.perform_request(*args, &block)
+      else
+        super
+      end
+    end
+
+    private
+
+    def verify_elasticsearch
+      begin
+        response = elasticsearch_validation_request
+      rescue Elasticsearch::Transport::Transport::Errors::Unauthorized,
+             Elasticsearch::Transport::Transport::Errors::Forbidden
+        @verified = true
+        warn(SECURITY_PRIVILEGES_VALIDATION_WARNING)
+        return
+      end
+
+      body = if response.headers['content-type'] == 'application/yaml'
+               require 'yaml'
+               YAML.load(response.body)
+             else
+               response.body
+             end
+      version = body.dig('version', 'number')
+      verify_with_version_or_header(body, version, response.headers)
+    end
+
+    def verify_with_version_or_header(body, version, headers)
+      raise Elasticsearch::NotElasticsearchError if version.nil? || version < '6.0.0'
+
+      if version == '7.x-SNAPSHOT' || Gem::Version.new(version) >= Gem::Version.new('7.14-SNAPSHOT')
+        raise Elasticsearch::NotElasticsearchError unless headers['x-elastic-product'] == 'Elasticsearch'
+
+        @verified = true
+      elsif Gem::Version.new(version) > Gem::Version.new('6.0.0') &&
+            Gem::Version.new(version) < Gem::Version.new('7.0.0')
+        raise Elasticsearch::NotElasticsearchError unless
+          body['tagline'] == YOU_KNOW_FOR_SEARCH
+
+        @verified = true
+      elsif Gem::Version.new(version) >= Gem::Version.new('7.0.0') &&
+            Gem::Version.new(version) < Gem::Version.new('7.14-SNAPSHOT')
+        raise Elasticsearch::NotElasticsearchError unless
+          body['tagline'] == YOU_KNOW_FOR_SEARCH &&
+          body.dig('version', 'build_flavor') == 'default'
+
+        @verified = true
+      end
+    end
+
+    def elasticsearch_validation_request
+      @transport.perform_request('GET', '/')
+    end
+  end
+
+  class NotElasticsearchError < StandardError
+    def initialize
+      super(NOT_ELASTICSEARCH_WARNING)
     end
   end
 end
+
 module Elastic
   # If the version is X.X.X.pre/alpha/beta, use X.X.Xp for the meta-header:
   def self.client_meta_version

data/lib/elasticsearch/version.rb

@@ -16,5 +16,5 @@
 # under the License.
 
 module Elasticsearch
-  VERSION = '7.13.3'.freeze
+  VERSION = '7.14.0.pre'.freeze
 end

data/spec/integration/client_integration_spec.rb

@@ -0,0 +1,57 @@
+# 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.
+require 'spec_helper'
+require 'logger'
+
+context 'Elasticsearch client' do
+  let(:logger) { Logger.new($stderr) }
+
+  let(:client) do
+    Elasticsearch::Client.new(
+      host: ELASTICSEARCH_URL,
+      logger: logger
+    )
+  end
+
+  context 'Integrates with elasticsearch API' do
+    it 'should perform the API methods' do
+      expect do
+        # Index a document
+        client.index(index: 'test-index', id: '1', body: { title: 'Test' })
+
+        # Refresh the index
+        client.indices.refresh(index: 'test-index')
+
+        # Search
+        response = client.search(index: 'test-index', body: { query: { match: { title: 'test' } } })
+
+        expect(response['hits']['total']['value']).to eq 1
+        expect(response['hits']['hits'][0]['_source']['title']).to eq 'Test'
+
+        # Delete the index
+        client.indices.delete(index: 'test-index')
+      end.not_to raise_error
+    end
+  end
+
+  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 Elastic.client_meta_version
+    end
+  end
+end

data/{test/unit/wrapper_gem_test.rb → spec/integration/validation_integration_spec.rb}

@@ -14,30 +14,17 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-
-require 'test_helper'
-
-module Elasticsearch
-  module Test
-    class WrapperGemTest < Minitest::Test
-
-      context "Wrapper gem" do
-
-        should "require all neccessary subgems" do
-          assert defined? Elasticsearch::Client
-          assert defined? Elasticsearch::API
-        end
-
-        should "mix the API into the client" do
-          client = Elasticsearch::Client.new
-
-          assert_respond_to client, :search
-          assert_respond_to client, :cluster
-          assert_respond_to client, :indices
-        end
-
-      end
-
-    end
+require 'spec_helper'
+require 'logger'
+
+describe 'Elasticsearch validation integration' do
+  it 'Validates for Elasticsearch > 7.14' do
+    client = Elasticsearch::Client.new(
+      host: ELASTICSEARCH_URL,
+      logger: Logger.new($stderr)
+    )
+    expect(client.instance_variable_get('@verified')).to be false
+    client.count
+    expect(client.instance_variable_get('@verified')).to be true
   end
 end

data/spec/spec_helper.rb

@@ -0,0 +1,26 @@
+# 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.
+
+require 'elasticsearch'
+require 'rspec'
+
+ELASTICSEARCH_URL = ENV['TEST_ES_SERVER'] || "http://localhost:#{(ENV['PORT'] || 9200)}"
+raise URI::InvalidURIError unless ELASTICSEARCH_URL =~ /\A#{URI::DEFAULT_PARSER.make_regexp}\z/
+
+RSpec.configure do |config|
+  config.formatter = :documentation
+end

data/spec/unit/elasticsearch_product_validation_spec.rb

@@ -0,0 +1,386 @@
+# 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.
+
+require 'spec_helper'
+require 'webmock/rspec'
+
+describe 'Elasticsearch: Validation' do
+  let(:host) { 'http://localhost:9200' }
+  let(:verify_request_stub) do
+    stub_request(:get, host)
+      .to_return(status: status, body: body, headers: headers)
+  end
+  let(:count_request_stub) do
+    stub_request(:post, "#{host}/_count")
+      .to_return(status: 200, body: nil, headers: {})
+  end
+  let(:status) { 200 }
+  let(:body) { {}.to_json }
+  let(:client) { Elasticsearch::Client.new }
+  let(:headers) do
+    { 'content-type' => 'json' }
+  end
+
+  def error_requests_and_expectations
+    expect { client.count }.to raise_error Elasticsearch::NotElasticsearchError
+    assert_requested :get, host
+    assert_not_requested :post, "#{host}/_count"
+    expect { client.cluster.health }.to raise_error Elasticsearch::NotElasticsearchError
+    expect(client.instance_variable_get('@verified')).to be false
+    expect { client.cluster.health }.to raise_error Elasticsearch::NotElasticsearchError
+  end
+
+  def valid_requests_and_expectations
+    expect(client.instance_variable_get('@verified')).to be false
+    assert_not_requested :get, host
+
+    client.count
+    expect(client.instance_variable_get('@verified'))
+    assert_requested :get, host
+    assert_requested :post, "#{host}/_count"
+  end
+
+  context 'When Elasticsearch replies with status 401' do
+    let(:status) { 401 }
+    let(:body) { {}.to_json }
+
+    it 'Verifies the request but shows a warning' do
+      stderr      = $stderr
+      fake_stderr = StringIO.new
+      $stderr     = fake_stderr
+
+      verify_request_stub
+      count_request_stub
+
+      valid_requests_and_expectations
+
+      fake_stderr.rewind
+      expect(fake_stderr.string).to eq("#{Elasticsearch::SECURITY_PRIVILEGES_VALIDATION_WARNING}\n")
+    ensure
+      $stderr = stderr
+    end
+  end
+
+  context 'When Elasticsearch replies with status 403' do
+    let(:status) { 403 }
+    let(:body) { {}.to_json }
+
+    it 'Verifies the request but shows a warning' do
+      stderr      = $stderr
+      fake_stderr = StringIO.new
+      $stderr     = fake_stderr
+
+      verify_request_stub
+      count_request_stub
+
+      valid_requests_and_expectations
+
+      fake_stderr.rewind
+      expect(fake_stderr.string).to eq("#{Elasticsearch::SECURITY_PRIVILEGES_VALIDATION_WARNING}\n")
+    ensure
+      $stderr = stderr
+    end
+  end
+
+  context 'When the Elasticsearch version is >= 7.14' do
+    context 'With a valid Elasticsearch response' do
+      let(:body) { { 'version' => { 'number' => '7.14.0' } }.to_json }
+      let(:headers) do
+        {
+          'X-Elastic-Product' => 'Elasticsearch',
+          'content-type' => 'json'
+        }
+      end
+      it 'Makes requests and passes validation' do
+        verify_request_stub
+        count_request_stub
+
+        valid_requests_and_expectations
+      end
+    end
+
+    context 'When the header is not present' do
+      it 'Fails validation' do
+        verify_request_stub
+
+        expect(client.instance_variable_get('@verified')).to be false
+        assert_not_requested :get, host
+
+        error_requests_and_expectations
+      end
+    end
+  end
+
+  context 'When the Elasticsearch version is >= 7.14-SNAPSHOT' do
+    context 'With a valid Elasticsearch response' do
+      let(:body) { { 'version' => { 'number' => '7.14-SNAPSHOT' } }.to_json }
+      let(:headers) do
+        {
+          'X-Elastic-Product' => 'Elasticsearch',
+          'content-type' => 'json'
+        }
+      end
+      it 'Makes requests and passes validation' do
+        verify_request_stub
+        count_request_stub
+
+        valid_requests_and_expectations
+      end
+    end
+
+    context 'When the header is not present' do
+      it 'Fails validation' do
+        verify_request_stub
+
+        expect(client.instance_variable_get('@verified')).to be false
+        assert_not_requested :get, host
+
+        error_requests_and_expectations
+      end
+    end
+  end
+
+  context 'When the Elasticsearch version is >= 7.15-SNAPSHOT' do
+    context 'With a valid Elasticsearch response' do
+      let(:body) { { 'version' => { 'number' => '7.15-SNAPSHOT' } }.to_json }
+      let(:headers) do
+        {
+          'X-Elastic-Product' => 'Elasticsearch',
+          'content-type' => 'json'
+        }
+      end
+      it 'Makes requests and passes validation' do
+        verify_request_stub
+        count_request_stub
+
+        valid_requests_and_expectations
+      end
+    end
+
+    context 'When the header is not present' do
+      it 'Fails validation' do
+        verify_request_stub
+
+        expect(client.instance_variable_get('@verified')).to be false
+        assert_not_requested :get, host
+
+        error_requests_and_expectations
+      end
+    end
+  end
+
+  context 'When the version is 7.x-SNAPSHOT' do
+    let(:body) { { 'version' => { 'number' => '7.x-SNAPSHOT' } }.to_json }
+
+    context 'When the header is not present' do
+      it 'Fails validation' do
+        verify_request_stub
+        count_request_stub
+
+        error_requests_and_expectations
+      end
+    end
+
+    context 'With a valid Elasticsearch response' do
+      let(:headers) do
+        {
+          'X-Elastic-Product' => 'Elasticsearch',
+          'content-type' => 'json'
+        }
+      end
+
+      it 'Makes requests and passes validation' do
+        verify_request_stub
+        count_request_stub
+
+        valid_requests_and_expectations
+      end
+    end
+  end
+
+  context 'When Elasticsearch version is 7.4.0' do
+    context 'When tagline is not present' do
+      let(:body) { { 'version' => { 'number' => '7.4.0', 'build_flavor' => 'default' } }.to_json }
+
+      it 'Fails validation' do
+        verify_request_stub
+        count_request_stub
+
+        error_requests_and_expectations
+      end
+    end
+
+    context 'When build flavor is not present' do
+      let(:body) do
+        {
+          'version' => {
+            'number' => '7.4.0'
+          },
+          'tagline' => Elasticsearch::YOU_KNOW_FOR_SEARCH
+        }.to_json
+      end
+
+      it 'Fails validation' do
+        verify_request_stub
+        count_request_stub
+
+        error_requests_and_expectations
+      end
+    end
+
+    context 'With a valid Elasticsearch response' do
+      let(:body) do
+        {
+          'version' => {
+            'number' => '7.4.0',
+            'build_flavor' => 'default'
+          },
+          'tagline' => Elasticsearch::YOU_KNOW_FOR_SEARCH
+        }.to_json
+      end
+
+      it 'Makes requests and passes validation' do
+        verify_request_stub
+        count_request_stub
+
+        valid_requests_and_expectations
+      end
+    end
+  end
+
+  context 'When Elasticsearch version is < 6.0.0' do
+    let(:body) { { 'version' => { 'number' => '5.0.0' } }.to_json }
+
+    it 'Raises an exception and client doesnae work' do
+      verify_request_stub
+      error_requests_and_expectations
+    end
+  end
+
+  context 'When there is no version data' do
+    let(:body) { {}.to_json }
+    it 'Raises an exception and client doesnae work' do
+      verify_request_stub
+      error_requests_and_expectations
+    end
+  end
+
+  context 'When Elasticsearch version is between 6.0.0 and 7.0.0' do
+    context 'With an Elasticsearch valid response' do
+      let(:body) do
+        {
+          'version' => {
+            'number' => '6.8.10'
+          },
+          'tagline' => Elasticsearch::YOU_KNOW_FOR_SEARCH
+        }.to_json
+      end
+
+      it 'Makes requests and passes validation' do
+        verify_request_stub
+        count_request_stub
+
+        valid_requests_and_expectations
+      end
+    end
+
+    context 'With no tagline' do
+      let(:body) do
+        { 'version' => { 'number' => '6.8.10' } }.to_json
+      end
+
+      it 'Fails validation' do
+        verify_request_stub
+        count_request_stub
+
+        error_requests_and_expectations
+      end
+    end
+  end
+
+  context 'When Elasticsearch version is between 7.0.0 and 7.14.0' do
+    context 'With a valid Elasticsearch response' do
+      let(:body) do
+        {
+          'version' => {
+            'number' => '7.10.0',
+            'build_flavor' => 'default'
+          },
+          'tagline' => Elasticsearch::YOU_KNOW_FOR_SEARCH
+        }.to_json
+      end
+
+      it 'Makes requests and passes validation' do
+        verify_request_stub
+        count_request_stub
+
+        valid_requests_and_expectations
+      end
+    end
+
+    context 'When the tagline is not present' do
+      let(:body) do
+        {
+          'version' => {
+            'number' => '7.10.0',
+            'build_flavor' => 'default'
+          }
+        }.to_json
+      end
+
+      it 'Fails validation' do
+        verify_request_stub
+        count_request_stub
+
+        error_requests_and_expectations
+      end
+    end
+
+    context 'When the build_flavor is not present' do
+      let(:body) do
+        {
+          'version' => {
+            'number' => '7.10.0'
+          },
+          'tagline' => Elasticsearch::YOU_KNOW_FOR_SEARCH
+        }.to_json
+      end
+
+      it 'Fails validation' do
+        verify_request_stub
+        count_request_stub
+
+        error_requests_and_expectations
+      end
+    end
+  end
+
+  context 'When doing a yaml content-type request' do
+    let(:client) do
+      Elasticsearch::Client.new(transport_options: {headers: { accept: 'application/yaml', content_type: 'application/yaml' }})
+    end
+
+    let(:headers) { { 'content-type' => 'application/yaml', 'X-Elastic-Product' => 'Elasticsearch' } }
+    let(:body) { "---\nversion:\n  number: \"7.14.0-SNAPSHOT\"\n" }
+
+    it 'validates' do
+      verify_request_stub
+      count_request_stub
+      valid_requests_and_expectations
+    end
+  end
+end

data/spec/unit/wrapper_gem_spec.rb

@@ -0,0 +1,39 @@
+# 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.
+require 'elasticsearch'
+require 'webmock/rspec'
+
+describe 'Elasticsearch: wrapper gem' do
+  it 'requires all neccessary subgems' do
+    expect(defined?(Elasticsearch::Client))
+    expect(defined?(Elasticsearch::API))
+  end
+
+  it 'mixes the API into the client' do
+    client = Elasticsearch::Client.new
+
+    expect(client).to respond_to(:search)
+    expect(client).to respond_to(:cluster)
+    expect(client).to respond_to(:indices)
+  end
+
+  it 'can access the client transport' do
+    client = Elasticsearch::Client.new
+    expect(client.transport).to be_a(Elasticsearch::Transport::Client)
+    expect(client.transport.transport).to be_a(Elasticsearch::Transport::Transport::HTTP::Faraday)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch
 version: !ruby/object:Gem::Version
-  version: 7.13.3
+  version: 7.14.0.pre
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-12 00:00:00.000000000 Z
+date: 2021-07-14 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.13.3
+        version: 7.14.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.13.3
+        version: 7.14.0.pre
 - !ruby/object:Gem::Dependency
   name: elasticsearch-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.13.3
+        version: 7.14.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.13.3
+        version: 7.14.0.pre
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -53,49 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13'
-- !ruby/object:Gem::Dependency
-  name: elasticsearch-extensions
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ansi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: shoulda-context
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,21 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,21 +81,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: require-prof
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-reporters
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -193,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: require-prof
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -207,27 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.17'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.18'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.17'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.18'
-- !ruby/object:Gem::Dependency
-  name: simplecov-rcov
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -241,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cane
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -254,20 +178,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
 description: 'Ruby integrations for Elasticsearch (client, API, etc.)
 
   '
@@ -290,9 +200,11 @@ files:
 - lib/elasticsearch-ruby.rb
 - lib/elasticsearch.rb
 - lib/elasticsearch/version.rb
-- test/integration/client_integration_test.rb
-- test/test_helper.rb
-- test/unit/wrapper_gem_test.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
 licenses:
 - Apache-2.0
@@ -313,15 +225,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: Ruby integrations for Elasticsearch
 test_files:
-- test/integration/client_integration_test.rb
-- test/test_helper.rb
-- test/unit/wrapper_gem_test.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

data/test/integration/client_integration_test.rb

@@ -1,80 +0,0 @@
-# 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.
-
-require 'test_helper'
-require 'logger'
-
-module Elasticsearch
-  module Test
-    class ClientIntegrationTest < Elasticsearch::Test::IntegrationTestCase
-      startup do
-        Elasticsearch::Extensions::Test::Cluster.start(number_of_nodes: 2) if ENV['SERVER'] and not Elasticsearch::Extensions::Test::Cluster.running?(number_of_nodes: 2)
-      end
-
-      shutdown do
-        Elasticsearch::Extensions::Test::Cluster.stop(number_of_nodes: 2) if ENV['SERVER'] and Elasticsearch::Extensions::Test::Cluster.running?(number_of_nodes: 2)
-      end
-
-      context "Elasticsearch client" do
-        setup do
-          system "curl -X DELETE http://#{TEST_HOST}:#{TEST_PORT}/_all > /dev/null 2>&1"
-
-          @logger =  Logger.new(STDERR)
-          @logger.formatter = proc do |severity, datetime, progname, msg|
-            color = case severity
-              when /INFO/ then :green
-              when /ERROR|WARN|FATAL/ then :red
-              when /DEBUG/ then :cyan
-              else :white
-            end
-            ANSI.ansi(severity[0] + ' ', color, :faint) + ANSI.ansi(msg, :white, :faint) + "\n"
-          end
-
-          @client = Elasticsearch::Client.new host: "#{TEST_HOST}:#{TEST_PORT}", logger: (ENV['QUIET'] ? nil : @logger)
-        end
-
-        should "perform the API methods" do
-          assert_nothing_raised do
-            # Index a document
-            #
-            @client.index index: 'test-index', type: 'test-type', id: '1', body: { title: 'Test' }
-
-            # Refresh the index
-            #
-            @client.indices.refresh index: 'test-index'
-
-            # Search
-            #
-            response = @client.search index: 'test-index', body: { query: { match: { title: 'test' } } }
-
-            assert_equal 1,      response['hits']['total']['value']
-            assert_equal 'Test', response['hits']['hits'][0]['_source']['title']
-
-            # Delete the index
-            #
-            @client.indices.delete index: 'test-index'
-          end
-        end
-
-        should 'report the right meta header' do
-          headers = @client.transport.connections.first.connection.headers
-          assert_match /^es=#{Elasticsearch::VERSION}/, headers['x-elastic-client-meta']
-        end
-      end
-    end
-  end
-end

data/test/test_helper.rb

@@ -1,115 +0,0 @@
-# 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_HOSTS = if hosts = ENV['TEST_ES_SERVER'] || ENV['ELASTICSEARCH_HOSTS']
-                        hosts.split(',').map do |host|
-                          /(http\:\/\/)?(\S+)/.match(host)[2]
-                        end
-                      end.freeze
-
-TEST_HOST, TEST_PORT = ELASTICSEARCH_HOSTS.first.split(':') if ELASTICSEARCH_HOSTS
-
-RUBY_1_8 = defined?(RUBY_VERSION) && RUBY_VERSION < '1.9'
-JRUBY    = defined?(JRUBY_VERSION)
-
-if RUBY_1_8 and not ENV['BUNDLE_GEMFILE']
-  require 'rubygems'
-  gem 'test-unit'
-end
-
-if ENV['COVERAGE'] && ENV['CI'].nil? && !RUBY_1_8
-  require 'simplecov'
-  SimpleCov.start { add_filter "/test|test_/" }
-end
-
-if ENV['CI'] && !RUBY_1_8
-  require 'simplecov'
-  require 'simplecov-rcov'
-  SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
-  SimpleCov.start { add_filter "/test|test_" }
-end
-
-# Register `at_exit` handler for integration tests shutdown.
-# MUST be called before requiring `test/unit`.
-if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
-  at_exit { Elasticsearch::Test::IntegrationTestCase.__run_at_exit_hooks }
-end
-
-require 'test/unit' if RUBY_1_8
-
-require 'minitest/autorun'
-require 'minitest/reporters'
-require 'shoulda/context'
-require 'mocha/minitest'
-
-require 'require-prof' if ENV["REQUIRE_PROF"]
-require 'elasticsearch'
-RequireProf.print_timing_infos if ENV["REQUIRE_PROF"]
-
-if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
-  require 'elasticsearch/extensions/test/cluster'
-  require 'elasticsearch/extensions/test/startup_shutdown'
-  require 'elasticsearch/extensions/test/profiling' unless JRUBY
-end
-
-Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
-
-module Minitest
-  module Assertions
-    def assert_nothing_raised(*args)
-      begin
-        line = __LINE__
-        yield
-      rescue RuntimeError => e
-        raise MiniTest::Assertion, "Exception raised:\n<#{e.class}>", e.backtrace
-      end
-      true
-    end
-
-    def assert_not_nil(object, msg=nil)
-      msg = message(msg) { "<#{object.inspect}> expected to not be nil" }
-      assert !object.nil?, msg
-    end
-
-    def assert_block(*msgs)
-      assert yield, *msgs
-    end
-
-    alias :assert_raise :assert_raises
-  end
-end
-
-module Elasticsearch
-  module Test
-    class IntegrationTestCase < ::Minitest::Test
-      extend Elasticsearch::Extensions::Test::StartupShutdown
-
-      shutdown { Elasticsearch::Extensions::Test::Cluster.stop if ENV['SERVER'] && started? && Elasticsearch::Extensions::Test::Cluster.running? }
-      context "IntegrationTest" do; should "noop on Ruby 1.8" do; end; end if RUBY_1_8
-    end if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
-  end
-
-  module Test
-    class ProfilingTest < ::Minitest::Test
-      extend Elasticsearch::Extensions::Test::StartupShutdown
-      extend Elasticsearch::Extensions::Test::Profiling
-
-      shutdown { Elasticsearch::Extensions::Test::Cluster.stop if ENV['SERVER'] && started? && Elasticsearch::Extensions::Test::Cluster.running? }
-      context "IntegrationTest" do; should "noop on Ruby 1.8" do; end; end if RUBY_1_8
-    end unless RUBY_1_8 || JRUBY
-  end
-end