elasticsearch-api 7.8.0 → 7.9.0.pre

data/spec/elasticsearch/api/actions/mget_spec.rb

@@ -18,14 +18,13 @@
 require 'spec_helper'
 
 describe 'client#mget' do
-
   let(:expected_args) do
     [
-        'GET',
-        url,
-        params,
-        body,
-        {}
+      'POST',
+      url,
+      params,
+      body,
+      {}
     ]
   end
 

data/spec/elasticsearch/api/actions/msearch_spec.rb

@@ -18,14 +18,13 @@
 require 'spec_helper'
 
 describe 'client#msearch' do
-
   let(:expected_args) do
     [
-        'GET',
-        url,
-        params,
-        body,
-        headers
+      'POST',
+      url,
+      params,
+      body,
+      headers
     ]
   end
 

data/spec/elasticsearch/api/actions/msearch_template_spec.rb

@@ -18,14 +18,13 @@
 require 'spec_helper'
 
 describe 'client#msearch_template' do
-
   let(:expected_args) do
     [
-        'GET',
-        url,
-        params,
-        body,
-        headers
+      'POST',
+      url,
+      params,
+      body,
+      headers
     ]
   end
 

data/spec/elasticsearch/api/actions/mtermvectors_spec.rb

@@ -18,16 +18,16 @@
 require 'spec_helper'
 
 describe 'client#mtermvectors' do
-
   let(:expected_args) do
     [
-        'GET',
-        'my-index/my-type/_mtermvectors',
-        {},
-        body,
-        {}
+      method,
+      'my-index/my-type/_mtermvectors',
+      {},
+      body,
+      {}
     ]
   end
+  let(:method) { 'POST' }
 
   let(:body) do
     { ids: [1, 2, 3] }
@@ -38,7 +38,7 @@ describe 'client#mtermvectors' do
   end
 
   context 'when a list of ids is passed instead of a body' do
-
+    let(:method) { 'GET' }
     it 'performs the request' do
       expect(client_double.mtermvectors(index: 'my-index', type: 'my-type', ids: [1, 2, 3])).to eq({})
     end

data/spec/elasticsearch/api/actions/render_search_template_spec.rb

@@ -21,7 +21,7 @@ describe 'client#render_search_template' do
   context 'when no id is specified' do
     let(:expected_args) do
       [
-        'GET',
+        'POST',
         '_render/template',
         {},
         { foo: 'bar' },
@@ -37,7 +37,7 @@ describe 'client#render_search_template' do
   context 'when id is specified' do
     let(:expected_args) do
       [
-        'GET',
+        'POST',
         '_render/template/foo',
         {},
         { foo: 'bar' },

data/spec/elasticsearch/api/actions/scroll_spec.rb

@@ -37,7 +37,7 @@ describe 'client#scroll' do
   context 'with scroll_id in the body' do
     let(:expected_args) do
       [
-        'GET',
+        'POST',
         '_search/scroll',
         {},
         { scroll_id: 'cXVlcn...' },

data/spec/elasticsearch/api/actions/search_spec.rb

@@ -18,16 +18,16 @@
 require 'spec_helper'
 
 describe 'client#search' do
-
   let(:expected_args) do
     [
-        'GET',
-        url,
-        params,
-        body,
-        {}
+      method,
+      url,
+      params,
+      body,
+      {}
     ]
   end
+  let(:method) { 'GET' }
 
   let(:body) do
     nil
@@ -46,10 +46,10 @@ describe 'client#search' do
   end
 
   context 'when a request definition is specified' do
-
     let(:body) do
       { query: { match: {} } }
     end
+    let(:method) { 'POST' }
 
     let(:url) do
       '_search'

data/spec/elasticsearch/api/actions/search_template_spec.rb

@@ -18,14 +18,13 @@
 require 'spec_helper'
 
 describe 'client#search_template' do
-
   let(:expected_args) do
     [
-        'GET',
-        'foo/_search/template',
-        { },
-        { foo: 'bar' },
-        {}
+      'POST',
+      'foo/_search/template',
+      { },
+      { foo: 'bar' },
+      {}
     ]
   end
 

data/spec/elasticsearch/api/actions/termvectors_spec.rb

@@ -18,14 +18,13 @@
 require 'spec_helper'
 
 describe 'client#termvectors' do
-
   let(:expected_args) do
     [
-        'GET',
-        url,
-        params,
-        body,
-        {}
+      'POST',
+      url,
+      params,
+      body,
+      {}
     ]
   end
 
@@ -56,7 +55,6 @@ describe 'client#termvectors' do
   end
 
   context 'when the older api name \'termvector\' is used' do
-
     let(:url) do
       'foo/bar/123/_termvector'
     end

data/spec/elasticsearch/api/rest_api_yaml_spec.rb

@@ -52,7 +52,6 @@ describe 'Rest API YAML tests' do
                   end
                 end
               else
-
                 # 'match' is in the task group definition
                 if task_group.has_match_clauses?
                   task_group.match_clauses.each do |match|

data/utils/thor/.rubocop.yml

@@ -0,0 +1,2 @@
+Layout/EndAlignment:
+  AutoCorrect: true

data/utils/thor/generate_source.rb

@@ -50,6 +50,7 @@ module Elasticsearch
       method_option :verbose, type: :boolean, default: false,  desc: 'Output more information'
       method_option :tests,   type: :boolean, default: false,  desc: 'Generate test files'
       method_option :api,     type: :array,   default: %w[oss xpack], desc: 'APIs to generate (oss, x-pack)'
+
       def generate
         self.class.source_root File.expand_path(__dir__)
         @xpack = options[:api].include? 'xpack'
@@ -113,12 +114,13 @@ module Elasticsearch
         names = @endpoint_name.split('.')
         if @current_api == :xpack
           names = (names.first == 'xpack' ? names : ['xpack', names].flatten)
-          # Return an array with 'ml' renamed to 'machine_learning' and 'ilm' to
-          # 'index_lifecycle_management'
+          # Return an array to expand 'ccr', 'ilm', 'ml' and 'slm'
           names.map do |name|
             name
               .gsub(/^ml$/, 'machine_learning')
               .gsub(/^ilm$/, 'index_lifecycle_management')
+              .gsub(/^ccr/, 'cross_cluster_replication')
+              .gsub(/^slm/, 'snapshot_lifecycle_management')
           end
         else
           names
@@ -146,19 +148,24 @@ module Elasticsearch
       end
 
       def __http_method
-        case @endpoint_name
-        when 'index'
-          '_id ? Elasticsearch::API::HTTP_PUT : Elasticsearch::API::HTTP_POST'
-        when 'count'
-          <<~SRC
-            if arguments[:body]
-              Elasticsearch::API::HTTP_POST
-            else
-              Elasticsearch::API::HTTP_GET
-            end
-          SRC
+        return '_id ? Elasticsearch::API::HTTP_PUT : Elasticsearch::API::HTTP_POST' if @endpoint_name == 'index'
+
+        default_method = @spec['url']['paths'].map { |a| a['methods'] }.flatten.first
+        if @spec['body'] && default_method == 'GET'
+          # When default method is GET and body is required, we should always use POST
+          if @spec['body']['required']
+            'Elasticsearch::API::HTTP_POST'
+          else
+            <<~SRC
+              if arguments[:body]
+                Elasticsearch::API::HTTP_POST
+              else
+                Elasticsearch::API::HTTP_GET
+              end
+            SRC
+          end
         else
-          "Elasticsearch::API::HTTP_#{@spec['url']['paths'].map { |a| a['methods'] }.flatten.first}"
+          "Elasticsearch::API::HTTP_#{default_method}"
         end
       end
 
@@ -260,7 +267,7 @@ module Elasticsearch
       end
 
       def run_rubocop(api)
-        system("rubocop --format autogenconf -x #{FilesHelper::output_dir(api)}")
+        system("rubocop -c ./thor/.rubocop.yml --format autogenconf -x #{FilesHelper::output_dir(api)}")
       end
     end
   end

data/utils/thor/generator/endpoint_specifics.rb

@@ -78,7 +78,7 @@ module Elasticsearch
       def module_name_helper(name)
         return name.upcase if %w[sql ssl].include? name
 
-        name.split("_").map(&:capitalize).join
+        name.split('_').map(&:capitalize).join
       end
 
       def termvectors_path
@@ -169,6 +169,13 @@ module Elasticsearch
           end
         SRC
       end
+
+      def bulk_doc_helper(info)
+        <<~SRC
+          # @option arguments [String|Array] :body #{info}. Array of Strings, Header/Data pairs,
+          # or the conveniency "combined" format can be passed, refer to Elasticsearch::API::Utils.__bulkify documentation.
+        SRC
+      end
     end
   end
 end

data/utils/thor/templates/_documentation_top.erb

@@ -14,7 +14,17 @@
   <%= docs_helper(name, info) -%>
 <%- end -%>
 # @option arguments [Hash] :headers Custom HTTP headers
-<%= '  '*(@namespace_depth+3) + '# @option arguments [Hash] :body ' + (@spec['body']['description'] ? @spec['body']['description'].strip : 'TODO: Description') + (@spec['body']['required'] ? ' (*Required*)' : '') + "\n" if @spec['body'] -%>
+<%- if @spec['body'] -%>
+  <%- if @method_name == 'bulk' -%>
+    <%= bulk_doc_helper(@spec['body']['description']) -%>
+  <%- else -%>
+    <%= '  '*(@namespace_depth+1) +
+    '# @option arguments [Hash] :body ' + (@spec['body']['description'] ?
+                                           @spec['body']['description'].strip : 'TODO: Description') +
+                                           (@spec['body']['required'] ? ' (*Required*)' : '') + "\n"
+    -%>
+  <%- end -%>
+<%- end -%>
 <% if @deprecation_note -%>
   #
   # *Deprecation notice*:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-api
 version: !ruby/object:Gem::Version
-  version: 7.8.0
+  version: 7.9.0.pre
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-18 00:00:00.000000000 Z
+date: 2020-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -400,6 +400,10 @@ files:
 - lib/elasticsearch/api/actions/cluster/stats.rb
 - lib/elasticsearch/api/actions/count.rb
 - lib/elasticsearch/api/actions/create.rb
+- lib/elasticsearch/api/actions/dangling_indices/delete_dangling_index.rb
+- lib/elasticsearch/api/actions/dangling_indices/import_dangling_index.rb
+- lib/elasticsearch/api/actions/dangling_indices/list_dangling_indices.rb
+- lib/elasticsearch/api/actions/dangling_indices/params_registry.rb
 - lib/elasticsearch/api/actions/delete.rb
 - lib/elasticsearch/api/actions/delete_by_query.rb
 - lib/elasticsearch/api/actions/delete_by_query_rethrottle.rb
@@ -415,12 +419,14 @@ files:
 - lib/elasticsearch/api/actions/get_script_languages.rb
 - lib/elasticsearch/api/actions/get_source.rb
 - lib/elasticsearch/api/actions/index.rb
+- lib/elasticsearch/api/actions/indices/add_block.rb
 - lib/elasticsearch/api/actions/indices/analyze.rb
 - lib/elasticsearch/api/actions/indices/clear_cache.rb
 - lib/elasticsearch/api/actions/indices/clone.rb
 - lib/elasticsearch/api/actions/indices/close.rb
 - lib/elasticsearch/api/actions/indices/create.rb
 - lib/elasticsearch/api/actions/indices/create_data_stream.rb
+- lib/elasticsearch/api/actions/indices/data_streams_stats.rb
 - lib/elasticsearch/api/actions/indices/delete.rb
 - lib/elasticsearch/api/actions/indices/delete_alias.rb
 - lib/elasticsearch/api/actions/indices/delete_data_stream.rb
@@ -437,7 +443,7 @@ files:
 - lib/elasticsearch/api/actions/indices/freeze.rb
 - lib/elasticsearch/api/actions/indices/get.rb
 - lib/elasticsearch/api/actions/indices/get_alias.rb
-- lib/elasticsearch/api/actions/indices/get_data_streams.rb
+- lib/elasticsearch/api/actions/indices/get_data_stream.rb
 - lib/elasticsearch/api/actions/indices/get_field_mapping.rb
 - lib/elasticsearch/api/actions/indices/get_index_template.rb
 - lib/elasticsearch/api/actions/indices/get_mapping.rb
@@ -453,11 +459,13 @@ files:
 - lib/elasticsearch/api/actions/indices/put_template.rb
 - lib/elasticsearch/api/actions/indices/recovery.rb
 - lib/elasticsearch/api/actions/indices/refresh.rb
+- lib/elasticsearch/api/actions/indices/resolve_index.rb
 - lib/elasticsearch/api/actions/indices/rollover.rb
 - lib/elasticsearch/api/actions/indices/segments.rb
 - lib/elasticsearch/api/actions/indices/shard_stores.rb
 - lib/elasticsearch/api/actions/indices/shrink.rb
 - lib/elasticsearch/api/actions/indices/simulate_index_template.rb
+- lib/elasticsearch/api/actions/indices/simulate_template.rb
 - lib/elasticsearch/api/actions/indices/split.rb
 - lib/elasticsearch/api/actions/indices/stats.rb
 - lib/elasticsearch/api/actions/indices/unfreeze.rb
@@ -517,6 +525,7 @@ files:
 - lib/elasticsearch/api/namespace/cat.rb
 - lib/elasticsearch/api/namespace/cluster.rb
 - lib/elasticsearch/api/namespace/common.rb
+- lib/elasticsearch/api/namespace/dangling_indices.rb
 - lib/elasticsearch/api/namespace/indices.rb
 - lib/elasticsearch/api/namespace/ingest.rb
 - lib/elasticsearch/api/namespace/nodes.rb
@@ -525,7 +534,6 @@ files:
 - lib/elasticsearch/api/namespace/tasks.rb
 - lib/elasticsearch/api/utils.rb
 - lib/elasticsearch/api/version.rb
-- spec/README.md
 - spec/elasticsearch/api/actions/abort_benchmark_spec.rb
 - spec/elasticsearch/api/actions/benchmark_spec.rb
 - spec/elasticsearch/api/actions/bulk_spec.rb
@@ -561,6 +569,9 @@ files:
 - spec/elasticsearch/api/actions/cluster/stats_spec.rb
 - spec/elasticsearch/api/actions/count_spec.rb
 - spec/elasticsearch/api/actions/create_document_spec.rb
+- spec/elasticsearch/api/actions/dangling_indices/delete_dangling_indices_spec.rb
+- spec/elasticsearch/api/actions/dangling_indices/import_dangling_indices_spec.rb
+- spec/elasticsearch/api/actions/dangling_indices/list_dangling_indices_spec.rb
 - spec/elasticsearch/api/actions/delete_by_query_spec.rb
 - spec/elasticsearch/api/actions/delete_document_spec.rb
 - spec/elasticsearch/api/actions/delete_script_spec.rb
@@ -572,11 +583,13 @@ files:
 - spec/elasticsearch/api/actions/get_script_spec.rb
 - spec/elasticsearch/api/actions/hashie_spec.rb
 - spec/elasticsearch/api/actions/index_document_spec.rb
+- spec/elasticsearch/api/actions/indices/add_block_spec.rb
 - spec/elasticsearch/api/actions/indices/analyze_spec.rb
 - spec/elasticsearch/api/actions/indices/clear_cache_spec.rb
 - spec/elasticsearch/api/actions/indices/clone_spec.rb
 - spec/elasticsearch/api/actions/indices/close_spec.rb
 - spec/elasticsearch/api/actions/indices/create_spec.rb
+- spec/elasticsearch/api/actions/indices/data_streams_stats_spec.rb
 - spec/elasticsearch/api/actions/indices/delete_alias_spec.rb
 - spec/elasticsearch/api/actions/indices/delete_spec.rb
 - spec/elasticsearch/api/actions/indices/delete_template_spec.rb
@@ -655,11 +668,10 @@ files:
 - spec/elasticsearch/api/utils_spec.rb
 - spec/rest_yaml_tests_helper.rb
 - spec/spec_helper.rb
-- test/integration/yaml_test_runner.rb
-- test/test_helper.rb
 - utils/Gemfile
 - utils/README.md
 - utils/Thorfile
+- utils/thor/.rubocop.yml
 - utils/thor/generate_source.rb
 - utils/thor/generator/endpoint_specifics.rb
 - utils/thor/generator/files_helper.rb
@@ -691,16 +703,15 @@ 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.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Ruby API for Elasticsearch.
 test_files:
-- spec/README.md
 - spec/elasticsearch/api/actions/abort_benchmark_spec.rb
 - spec/elasticsearch/api/actions/benchmark_spec.rb
 - spec/elasticsearch/api/actions/bulk_spec.rb
@@ -736,6 +747,9 @@ test_files:
 - spec/elasticsearch/api/actions/cluster/stats_spec.rb
 - spec/elasticsearch/api/actions/count_spec.rb
 - spec/elasticsearch/api/actions/create_document_spec.rb
+- spec/elasticsearch/api/actions/dangling_indices/delete_dangling_indices_spec.rb
+- spec/elasticsearch/api/actions/dangling_indices/import_dangling_indices_spec.rb
+- spec/elasticsearch/api/actions/dangling_indices/list_dangling_indices_spec.rb
 - spec/elasticsearch/api/actions/delete_by_query_spec.rb
 - spec/elasticsearch/api/actions/delete_document_spec.rb
 - spec/elasticsearch/api/actions/delete_script_spec.rb
@@ -747,11 +761,13 @@ test_files:
 - spec/elasticsearch/api/actions/get_script_spec.rb
 - spec/elasticsearch/api/actions/hashie_spec.rb
 - spec/elasticsearch/api/actions/index_document_spec.rb
+- spec/elasticsearch/api/actions/indices/add_block_spec.rb
 - spec/elasticsearch/api/actions/indices/analyze_spec.rb
 - spec/elasticsearch/api/actions/indices/clear_cache_spec.rb
 - spec/elasticsearch/api/actions/indices/clone_spec.rb
 - spec/elasticsearch/api/actions/indices/close_spec.rb
 - spec/elasticsearch/api/actions/indices/create_spec.rb
+- spec/elasticsearch/api/actions/indices/data_streams_stats_spec.rb
 - spec/elasticsearch/api/actions/indices/delete_alias_spec.rb
 - spec/elasticsearch/api/actions/indices/delete_spec.rb
 - spec/elasticsearch/api/actions/indices/delete_template_spec.rb
@@ -830,5 +846,3 @@ test_files:
 - spec/elasticsearch/api/utils_spec.rb
 - spec/rest_yaml_tests_helper.rb
 - spec/spec_helper.rb
-- test/integration/yaml_test_runner.rb
-- test/test_helper.rb