elastic-enterprise-search 7.14.0 → 7.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1eef7550b4a936e514eb9b0eb52272a2b445b3e54c301c7cec29039c789561ee
-  data.tar.gz: 47ab2fcbb9b00a3cbb219e713ee9308642345b72dcc6af5b9f0f1f334edd7c09
+  metadata.gz: 862dd17061e11215dd63c1be695e9757f06acc7f09ef6fc0d55719dcd174f213
+  data.tar.gz: 3ebefa23f22d0a4cb002d9ad533d88810ba3ed2053028c7678487a7e478cf4f8
 SHA512:
-  metadata.gz: 38a4519bfa5d4b3ea04507468b0c5ddb7122d8c5c928943b45d3d1ce120d3a1652ac7c2aff217082aaca4cdc3124b732e4f31c265bf5c6f0cdc0173672e020f0
-  data.tar.gz: 7cd26fe0a7fc874ccbcfb16ef443d5c9ddd69b0a882690dcbfc0b90d698a10bd89d942530ba93aae78531cddc6960721edd8d2a410728be87aacd018e1aeed31
+  metadata.gz: f1b0a6cce0c8e8615ee8bd4dba0c8e339b76c8870831fc19f494c9d976b0f8f4529a80fb735201995f0f09b9f70c0f5ae6a47e88a5ca5171fb9515d401d1d3c7
+  data.tar.gz: 1fcb83403aaaf344fabe4363573022ddcd0156b6095eef6759e58bbf2592df279251df96065b7ff80cdca193a4e08cef1247827ad4ca9ca42dc96e81cd6b7d5b

data/.ci/jobs/{elastic+enterprise-search-ruby+master.yml → elastic+enterprise-search-ruby+main.yml}

@@ -1,12 +1,12 @@
 ---
 - job:
-    name: elastic+enterprise-search-ruby+master
-    display-name: 'elastic / enterprise-search-ruby # master'
-    description: Testing the enterprise-search-ruby master branch.
+    name: elastic+enterprise-search-ruby+main
+    display-name: 'elastic / enterprise-search-ruby # main'
+    description: Testing the enterprise-search-ruby main branch.
     junit_results: "*-junit.xml"
     parameters:
     - string:
         name: branch_specifier
-        default: refs/heads/master
+        default: refs/heads/main
         description: the Git branch specifier to build (<branchName>, <tagName>,
           <commitId>, etc.)

data/.github/compatibility/Gemfile

@@ -0,0 +1,23 @@
+# 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.
+
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gem 'elasticsearch', ENV['es-version']
+gem 'elastic-enterprise-search', path: File.expand_path('../../', __dir__)

data/.github/workflows/compatibility.yml

@@ -0,0 +1,20 @@
+name: Compatibility with Elasticsearch
+on: [push, pull_request]
+
+jobs:
+  elasticsearch:
+    env:
+      ES_VERSION: ${{ matrix.es_version }}
+    strategy:
+      matrix:
+        es_version: [ 7.11, 7.12, 7.13, 7.14, 7.15 ]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 3.0
+    - name: Build Gemfile with Elasticsearch gem
+      run: |
+        ruby -v
+        cd ./.github/compatibility/ && bundle

data/CONTRIBUTING.md

@@ -22,7 +22,7 @@
 
 3. Rebase your changes. Update your local repository with the most recent code
    from the main `enterprise-search-ruby` repository and rebase your branch
-   on top of the latest `master` branch. All of your changes will be squashed
+   on top of the latest `main` branch. All of your changes will be squashed
    into a single commit so don't worry about pushing multiple times.
    
 4. Submit a pull request. Push your local changes to your forked repository

data/README.md

@@ -1,6 +1,6 @@
 # Elastic Enterprise Search Client
 
-![build](https://github.com/elastic/enterprise-search-ruby/workflows/master/badge.svg)
+![build](https://github.com/elastic/enterprise-search-ruby/workflows/main/badge.svg)
 ![rubocop](https://github.com/elastic/enterprise-search-ruby/workflows/rubocop/badge.svg)
 [![Ruby Style Guide](https://img.shields.io/badge/code_style-rubocop-brightgreen.svg)](https://github.com/rubocop-hq/rubocop)
 

data/docs/guide/overview.asciidoc

@@ -6,7 +6,7 @@ This is the official Ruby client for Elastic Enterprise Search.
 [discrete]
 === Compatibility
 
-Current development happens in the master branch.
+Current development happens in the main branch.
 
 The library is compatible with all Elastic Enterprise Search versions since `7.x` but you **have to use a matching major version**:
 
@@ -14,11 +14,11 @@ For **Elastic Enterprise Search 7.0** and later, use the major version 7 (`7.x.y
 
 [discrete]
 === HTTP Library
-This library uses https://github.com/elastic/elasticsearch-ruby/tree/master/elasticsearch-transport[elasticsearch-transport], the low-level Ruby client for connecting to an Elasticsearch cluster - also used in the official https://github.com/elastic/elasticsearch-ruby[Elasticsearch Ruby Client].
+This library uses https://github.com/elastic/elasticsearch-ruby/tree/main/elasticsearch-transport[elasticsearch-transport], the low-level Ruby client for connecting to an Elasticsearch cluster - also used in the official https://github.com/elastic/elasticsearch-ruby[Elasticsearch Ruby Client].
 
 All requests, if successful, will return an `Elasticsearch::Transport::Transport::Response` instance. You can access the response `body`, `headers` and `status`.
 
-`elasticsearch-transport` defines a https://github.com/elasticsearch/elasticsearch-ruby/blob/master/elasticsearch-transport/lib/elasticsearch/transport/transport/errors.rb[number of exception classes] for various client and server errors, as well as unsuccessful HTTP responses, making it possible to rescue specific exceptions with desired granularity. More details https://github.com/elastic/elasticsearch-ruby/tree/master/elasticsearch-transport#exception-handling[here]. You can find the full documentation for `elasticsearch-transport` at https://rubydoc.info/gems/elasticsearch-transport[RubyDoc].
+`elasticsearch-transport` defines a https://github.com/elasticsearch/elasticsearch-ruby/blob/main/elasticsearch-transport/lib/elasticsearch/transport/transport/errors.rb[number of exception classes] for various client and server errors, as well as unsuccessful HTTP responses, making it possible to rescue specific exceptions with desired granularity. More details https://github.com/elastic/elasticsearch-ruby/tree/main/elasticsearch-transport#exception-handling[here]. You can find the full documentation for `elasticsearch-transport` at https://rubydoc.info/gems/elasticsearch-transport[RubyDoc].
 
 The clients pass different options to transport, you can check them out https://rubydoc.info/github/elastic/enterprise-search-ruby/Elastic/EnterpriseSearch/Client[on RubyDocs].
 

data/docs/guide/release_notes/714.asciidoc

@@ -1,4 +1,16 @@
 [[release_notes_714]]
+=== 7.14 Release notes
+
+[discrete]
+[[release_notes_7141]]
+=== 7.14.1 Release notes
+
+==== Dependency fix
+
+Updates dependency on `elasticsearch-transport` to be more open. At least 7.11 is required, but this way it can be used with different versions of the `elasticsearch` gem (bigger than or equal to `7.11`) in the same project, without a conflict in `elasticsearch-transport`. When instantiating transport, we now check if version is `< 7.14` so we use the right class.
+
+[discrete]
+[[release_notes_7140]]
 === 7.14.0 Release notes
 
 [discrete]

data/elastic-enterprise-search.gemspec

@@ -47,7 +47,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_dependency 'elasticsearch-transport', '~> 7.13.0'
+  s.add_dependency 'elasticsearch-transport', '>= 7.11'
   s.add_runtime_dependency 'jwt', '>= 1.5', '< 3.0'
   s.add_development_dependency 'awesome_print'
   s.add_development_dependency 'byebug' unless defined?(JRUBY_VERSION)

data/lib/elastic/enterprise-search/client.rb

@@ -67,7 +67,7 @@ module Elastic
 
       def transport
         @options[:transport] ||
-          Elasticsearch::Client.new(
+          transport_klass.new(
             host: host,
             log: log,
             logger: logger,
@@ -110,6 +110,17 @@ module Elastic
 
         @options[:host]
       end
+
+      private
+
+      def transport_klass
+        case Elasticsearch::Transport::VERSION
+        when /7\.1[123]/
+          Elasticsearch::Client
+        else
+          Elasticsearch::Transport::Client
+        end
+      end
     end
   end
 end

data/lib/elastic/enterprise-search/version.rb

@@ -19,6 +19,6 @@
 
 module Elastic
   module EnterpriseSearch
-    VERSION = '7.14.0'
+    VERSION = '7.14.1'
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: elastic-enterprise-search
 version: !ruby/object:Gem::Version
-  version: 7.14.0
+  version: 7.14.1
 platform: ruby
 authors:
 - Fernando Briano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-10 00:00:00.000000000 Z
+date: 2021-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch-transport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 7.13.0
+        version: '7.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 7.13.0
+        version: '7.11'
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -165,7 +165,7 @@ files:
 - ".ci/functions/wait-for-container.sh"
 - ".ci/jobs/defaults.yml"
 - ".ci/jobs/elastic+enterprise-search-ruby+7.10.0.beta.1.yml"
-- ".ci/jobs/elastic+enterprise-search-ruby+master.yml"
+- ".ci/jobs/elastic+enterprise-search-ruby+main.yml"
 - ".ci/jobs/elastic+enterprise-search-ruby+pull-request.yml"
 - ".ci/make.sh"
 - ".ci/run-elasticsearch.sh"
@@ -175,7 +175,9 @@ files:
 - ".ci/run-tests"
 - ".ci/test-matrix.yml"
 - ".github/check_license_headers.rb"
+- ".github/compatibility/Gemfile"
 - ".github/license-header.txt"
+- ".github/workflows/compatibility.yml"
 - ".github/workflows/license.yml"
 - ".github/workflows/rubocop.yml"
 - ".github/workflows/testing.yml"
@@ -386,7 +388,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Official API client for Elastic Enterprise Search