elasticsearch-api 5.0.5 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01b21ab7020339d01811c0e1efdbdc55e9d04133
-  data.tar.gz: c27e856e07e1bb3e949b5bf6bb3016a26066fa5b
+  metadata.gz: 63bde47c1cc7d46fc4c79164a9a42e04e400b335
+  data.tar.gz: 6c4edd90ed5a8ab829f86e29118cf886d188a0ca
 SHA512:
-  metadata.gz: 8123766736b77e7d78332094d3fbb17ea84a6b0ded615ecdff059bc4016327f68c8dc1a25c2e02a719b6837793ad30fcbcd190507d9b0998b3b263f3e562e5d1
-  data.tar.gz: 0664d1723bf50d485be46d60ff456f80c17fc13d34c14bbe2790ca795882838c874b6d9a3799f8ef446ef9b857ac263dea4cd5de2cc87e387a4f210d8b960b29
+  metadata.gz: a77fa034cc384ac7ed0b930584f6e7f744fe5e67a8a762a3a0984f7ee5229afad99f108815527ffa5d933e9031903382086bfe9d7abb59fd50e100c5295705c5
+  data.tar.gz: 35a7de732e056b4be4517785557d9ed527c57987dc46ff3e765891d36d9eedcb949a38107d17acc735e89565cfb58db59f98975468317b6f2e55f2d6c05c9632

data/Rakefile

@@ -21,19 +21,7 @@ namespace :test do
     git_specs "fetch origin --verbose", :verbose => true
   end
 
-  task :ci_reporter do
-    ENV['CI_REPORTS'] ||= 'tmp/reports'
-    if defined?(RUBY_VERSION) && RUBY_VERSION < '1.9'
-      require 'ci/reporter/rake/test_unit'
-      Rake::Task['ci:setup:testunit'].invoke
-    else
-      require 'ci/reporter/rake/minitest'
-      Rake::Task['ci:setup:minitest'].invoke
-    end
-  end
-
   Rake::TestTask.new(:unit) do |test|
-    Rake::Task['test:ci_reporter'].invoke if ENV['CI']
     test.libs << 'lib' << 'test'
     test.test_files = FileList["test/unit/**/*_test.rb"]
     # test.verbose = true
@@ -60,9 +48,10 @@ namespace :test do
 
     # Define the task
     t = Rake::TestTask.new(:integration) do |test|
-      Rake::Task['test:ci_reporter'].invoke if ENV['CI']
       test.libs << 'lib' << 'test'
       test.test_files = FileList["test/integration/yaml_test_runner.rb", "test/integration/**/*_test.rb"]
+      test.verbose = false
+      test.warning = false
     end
 
     # Check if a test cluster is running
@@ -116,7 +105,6 @@ namespace :test do
 
   desc "Run unit and integration tests"
   task :all do
-    Rake::Task['test:ci_reporter'].invoke if ENV['CI']
     Rake::Task['test:unit'].invoke
     Rake::Task['test:integration'].invoke
   end

data/elasticsearch-api.gemspec

@@ -44,7 +44,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "turn"
   s.add_development_dependency "yard"
   s.add_development_dependency "pry"
-  s.add_development_dependency "ci_reporter", "~> 1.9"
 
   # Gems for testing integrations
   s.add_development_dependency "jsonify"

data/lib/elasticsearch/api/actions/indices/delete.rb

@@ -26,11 +26,21 @@ module Elasticsearch
         # @option arguments [List] :index A comma-separated list of indices to delete;
         #                                 use `_all` to delete all indices
         # @option arguments [Time] :timeout Explicit operation timeout
+        # @option arguments [Time] :master_timeout Specify timeout for connection to master
+        # @option arguments [Boolean] :ignore_unavailable Ignore unavailable indexes (default: false)
+        # @option arguments [Boolean] :allow_no_indices Ignore if a wildcard expression resolves to no concrete indices (default: false)
+        # @option arguments [List] :expand_wildcards Whether wildcard expressions should get expanded to open or closed indices (options: open, closed, none, all) (default: open)
         #
         # @see http://www.elasticsearch.org/guide/reference/api/admin-indices-delete-index/
         #
         def delete(arguments={})
-          valid_params = [ :timeout ]
+          valid_params = [
+            :timeout,
+            :master_timeout,
+            :ignore_unavailable,
+            :allow_no_indices,
+            :expand_wildcards
+           ]
 
           method = HTTP_DELETE
           path   = Utils.__pathify Utils.__listify(arguments[:index])

data/lib/elasticsearch/api/actions/indices/flush.rb

@@ -12,15 +12,14 @@ module Elasticsearch
         #
         # @option arguments [List] :index A comma-separated list of index names; use `_all` or empty string for all indices
         # @option arguments [Boolean] :force Whether a flush should be forced even if it is not necessarily needed ie.
-        #                                    if no changes will be committed to the index. (Internal)
         # @option arguments [Boolean] :allow_no_indices Whether to ignore if a wildcard indices expression resolves into
         #                                               no concrete indices. (This includes `_all` string or when no
         #                                               indices have been specified)
         # @option arguments [String] :expand_wildcards Whether to expand wildcard expression to concrete indices that
         #                                              are open, closed or both. (options: open, closed)
-        # @option arguments [Boolean] :wait_if_ongoing If set to true the flush operation will block until the flush can be executed if another flush operation is already executing. The default is true. If set to false the flush will be skipped iff if another flush operation is already running.
         # @option arguments [Boolean] :ignore_unavailable Whether specified concrete indices should be ignored when
         #                                                 unavailable (missing, closed, etc)
+        # @option arguments [Boolean] :wait_if_ongoing If set to true the flush operation will block until the flush can be executed if another flush operation is already executing. If set to false the flush will be skipped if another flush operation is already running. (Default: true)
         #
         # @see http://www.elasticsearch.org/guide/reference/api/admin-indices-flush/
         #
@@ -30,8 +29,7 @@ module Elasticsearch
             :wait_if_ongoing,
             :ignore_unavailable,
             :allow_no_indices,
-            :expand_wildcards
-          ]
+            :expand_wildcards ]
 
           method = HTTP_POST
           path   = Utils.__pathify Utils.__listify(arguments[:index]), '_flush'

data/lib/elasticsearch/api/actions/msearch_template.rb

@@ -0,0 +1,45 @@
+module Elasticsearch
+  module API
+    module Actions
+
+      # Execute several search requests using templates (inline, indexed or stored in a file)
+      #
+      # @example Search with an inline script
+      #
+      #     client.msearch_template body: [
+      #       { index: 'test' },
+      #       { inline: { query: { match: { title: '{{q}}' } } }, params: { q: 'foo'} }
+      #     ]
+      #
+      # @option arguments [List] :index A comma-separated list of index names to use as default
+      # @option arguments [List] :type A comma-separated list of document types to use as default
+      # @option arguments [Hash] :body The request definitions (metadata-search request definition pairs), separated by newlines (*Required*)
+      # @option arguments [String] :search_type Search operation type (options: query_then_fetch, query_and_fetch, dfs_query_then_fetch, dfs_query_and_fetch)
+      #
+      # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/multi-search-template.html
+      #
+      def msearch_template(arguments={})
+        raise ArgumentError, "Required argument 'body' missing" unless arguments[:body]
+
+        valid_params = [ :search_type ]
+        method = HTTP_GET
+        path   = Utils.__pathify Utils.__listify(arguments[:index]),
+                                 Utils.__listify(arguments[:type]),
+                                 '_msearch/template'
+        params = Utils.__validate_and_extract_params arguments, valid_params
+        body   = arguments[:body]
+
+        case
+          when body.is_a?(Array)
+            payload = body.map { |d| d.is_a?(String) ? d : Elasticsearch::API.serializer.dump(d) }
+            payload << "" unless payload.empty?
+            payload = payload.join("\n")
+          else
+            payload = body
+        end
+
+        perform_request(method, path, params, payload).body
+      end
+    end
+  end
+end

data/lib/elasticsearch/api/actions/percolate.rb

@@ -7,11 +7,48 @@ module Elasticsearch
       # Percolator allows you to register queries and then evaluate a document against them:
       # the IDs of matching queries are returned in the response.
       #
-      # @deprecated The `_percolate` API has been deprecated in favour of a special field mapping and the
-      #             `percolate` query;
-      #             see https://www.elastic.co/guide/en/elasticsearch/reference/5.5/breaking_50_percolator.html
+      # @example Register queries named "alert-1" and "alert-2" for the "my-index" index
       #
-      # See full example for Elasticsearch 5.x and higher in <https://github.com/elastic/elasticsearch-ruby/blob/master/examples/percolator/percolator_alerts.rb>
+      #     client.index index: 'my-index',
+      #                  type: '.percolator',
+      #                  id: 'alert-1',
+      #                  body: { query: { query_string: { query: 'foo' } } }
+      #
+      #     client.index index: 'my-index',
+      #                  type: '.percolator',
+      #                  id: 'alert-2',
+      #                  body: { query: { query_string: { query: 'bar' } } }
+      #
+      # @example Evaluate a custom document (passed as `:doc`) against the queries
+      #
+      #     client.percolate index: 'my-index', type: 'my-type', body: { doc: { title: "Foo" } }
+      #     # => {..., matches: [ {_index: 'my-index', _id: 'alert-1'} ]}
+      #
+      #     client.percolate index: 'my-index', type: 'my-type', body: { doc: { title: "Foo Bar" } }
+      #     # => {..., matches: [ {_index: 'my-index', _id: 'alert-2'}, {_index: 'my-index', _id: 'alert-1'} ] }
+      #
+      # @example Evaluate an existing document against the queries
+      #
+      #     client.index index: 'my-index', type: 'my-type', id: 123, body: { title: "Foo Bar" }
+      #
+      #     client.percolate index: 'my-index', type: 'my-type', id: '123'
+      #     # => { ..., matches: [ {_index: 'my-index', _id: 'alert-2'}, { _index: 'my-index', _id: 'alert-1'} ] }
+      #
+      # @example Register a query with custom `priority` property
+      #
+      #     client.index index: 'my-index',
+      #                  type: '.percolator',
+      #                  id: 'alert-high-1',
+      #                  body: { query: { query_string: { query: 'foo' } },
+      #                          priority: 'high' }
+      #
+      # @example Evaluate a document against "high priority" percolator queries
+      #
+      #     client.percolate index: 'my-index', type: 'my-type', body: {
+      #         doc:    { title: "Foo" },
+      #         filter: { term: { priority: 'high' } }
+      #       }
+      #     # => {..., matches: [ {_index: 'my-index', _id: 'alert-high-1'} ]}
       #
       # @option arguments [String] :index The index of the document being percolated. (*Required*)
       # @option arguments [String] :type The type of the document being percolated. (*Required*)
@@ -38,8 +75,6 @@ module Elasticsearch
       # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/search-percolate.html
       #
       def percolate(arguments={})
-        Utils.__report_unsupported_method :percolate
-
         raise ArgumentError, "Required argument 'index' missing" unless arguments[:index]
         raise ArgumentError, "Required argument 'type' missing"  unless arguments[:type]
 

data/lib/elasticsearch/api/actions/reindex.rb

@@ -43,11 +43,9 @@ module Elasticsearch
       # @option arguments [String] :consistency Explicit write consistency setting for the operation
       #                                        (Options: one, quorum, all)
       # @option arguments [Boolean] :wait_for_completion Whether the request should block and wait until
-      #                                                  the operation has completed
+        #                                                the operation has completed
       # @option arguments [Float] :requests_per_second The throttling for this request in sub-requests per second.
       #                                                0 means set no throttling (default)
-      # @option arguments [Integer] :slices The number of slices this request should be divided into.
-      #                                     Defaults to 1 meaning the request isn't sliced into sub-requests.
       #
       # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-reindex.html
       #
@@ -58,8 +56,7 @@ module Elasticsearch
           :timeout,
           :consistency,
           :wait_for_completion,
-          :requests_per_second,
-          :slices ]
+          :requests_per_second ]
         method = 'POST'
         path   = "_reindex"
         params = Utils.__validate_and_extract_params arguments, valid_params

data/lib/elasticsearch/api/actions/search.rb

@@ -116,6 +116,8 @@ module Elasticsearch
       # @option arguments [Boolean] :typed_keys Specify whether aggregation and suggester names should be prefixed by their respective types in the response
       # @option arguments [Boolean] :version Specify whether to return document version as part of a hit
       # @option arguments [Number] :batched_reduce_size The number of shard results that should be reduced at once on the coordinating node. This value should be used as a protection mechanism to reduce the memory overhead per search request if the potential number of shards in the request can be large.
+      # @option arguments [Number] :max_concurrent_shard_requests The number of concurrent shard requests this search executes concurrently. This value should be used to limit the impact of the search on the cluster in order to limit the number of concurrent shard requests. The default grows with the number of nodes in the cluster but is at most 256.
+      # @option arguments [Number] :pre_filter_shard_size A threshold that enforces a pre-filter roundtrip to prefilter search shards based on query rewriting if the number of shards the search request expands to exceeds the threshold. This filter roundtrip can limit the number of shards significantly if for instance a shard can not match any documents based on it's rewrite method ie. if date filters are mandatory to match but the shard bounds and the query are disjoint. (Default: 128)
       #
       # @return [Hash]
       #
@@ -165,7 +167,9 @@ module Elasticsearch
           :timeout,
           :typed_keys,
           :version,
-          :batched_reduce_size ]
+          :batched_reduce_size,
+          :max_concurrent_shard_requests,
+          :pre_filter_shard_size ]
 
         method = HTTP_GET
         path   = Utils.__pathify( Utils.__listify(arguments[:index]), Utils.__listify(arguments[:type]), UNDERSCORE_SEARCH )

data/lib/elasticsearch/api/actions/snapshot/get.rb

@@ -21,7 +21,7 @@ module Elasticsearch
         # @option arguments [List] :snapshot A comma-separated list of snapshot names (*Required*)
         # @option arguments [Boolean] :ignore_unavailable Whether to ignore unavailable snapshots, defaults to #                                                 false which means a SnapshotMissingException is thrown
         # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
-        # @option arguments [Number,List] :ignore The list of HTTP errors to ignore
+        # @option arguments [Boolean] :verbose Whether to show verbose snapshot info or only show the basic info found in the repository index blob
         #
         # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/modules-snapshots.html
         #
@@ -31,7 +31,8 @@ module Elasticsearch
 
           valid_params = [
             :ignore_unavailable,
-            :master_timeout ]
+            :master_timeout,
+            :verbose ]
 
           repository = arguments.delete(:repository)
           snapshot   = arguments.delete(:snapshot)

data/lib/elasticsearch/api/utils.rb

@@ -235,12 +235,10 @@ module Elasticsearch
         end
 
         unless messages.empty?
-          messages << "Suppress this warning by the `-WO` command line flag."
-
           if STDERR.tty?
-            Kernel.warn messages.map { |m| "\e[31;1m#{m}\e[0m" }.join("\n")
+            STDERR.puts messages.map { |m| "\e[31;1m#{m}\e[0m" }.join("\n")
           else
-            Kernel.warn messages.join("\n")
+            STDERR.puts messages.join("\n")
           end
         end
       end
@@ -251,12 +249,12 @@ module Elasticsearch
           message += " in `#{source}`"
         end
 
-        message += ". This method is not supported in the version you're using: #{Elasticsearch::API::VERSION}, and will be removed in the next release. Suppress this warning by the `-WO` command line flag."
+        message += ". This method is not supported in the version you're using: #{Elasticsearch::API::VERSION}, and will be removed in the next release."
 
         if STDERR.tty?
-          Kernel.warn "\e[31;1m#{message}\e[0m"
+          STDERR.puts "\e[31;1m#{message}\e[0m"
         else
-          Kernel.warn message
+          STDERR.puts message
         end
       end
 

data/lib/elasticsearch/api/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module API
-    VERSION = "5.0.5"
+    VERSION = "6.0.0"
   end
 end

data/test/integration/yaml_test_runner.rb

@@ -332,7 +332,13 @@ suites.each do |suite|
 
     files = Dir[suite.join('*.{yml,yaml}')]
     files.each do |file|
-      tests = YAML.load_documents File.new(file)
+      begin
+        tests = YAML.load_documents File.new(file)
+      rescue Exception => e
+        $stderr.puts "ERROR [#{e.class}] while loading [#{file}] file".ansi(:red)
+        # raise e
+        next
+      end
 
       # Extract setup actions
       setup_actions = tests.select { |t| t['setup'] }.first['setup'] rescue []

data/test/unit/msearch_template_test.rb

@@ -0,0 +1,60 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    class MsearchTemplateTest < ::Test::Unit::TestCase
+
+      context "Msearch Template" do
+        subject { FakeClient.new }
+
+        should "require the :body argument" do
+          assert_raise ArgumentError do
+            subject.msearch
+          end
+        end
+
+        should "serialize and post header/data pairs" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'GET', method
+            assert_equal '_msearch/template', url
+            assert_equal Hash.new, params
+            assert_equal <<-PAYLOAD.gsub(/^\s+/, ''), body
+            {"index":"foo"}
+            {"inline":{"query":{"match":{"foo":"{{q}}"}}},"params":{"q":"foo"}}
+            {"index":"bar"}
+            {"id":"query_foo","params":{"q":"foo"}}
+            PAYLOAD
+            true
+          end.returns(FakeResponse.new)
+
+          subject.msearch_template :body => [
+            { :index => 'foo' },
+            { :inline => { :query => { :match => { :foo => '{{q}}' } } }, :params => { :q => 'foo' } },
+            { :index => 'bar' },
+            { :id => 'query_foo', :params => { :q => 'foo' } }
+          ]
+        end
+
+        should "post a string payload intact" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal %Q|{"foo":"bar"}\n{"moo":"lam"}|, body
+            true
+          end.returns(FakeResponse.new)
+
+          subject.msearch_template :body => %Q|{"foo":"bar"}\n{"moo":"lam"}|
+        end
+
+        should "perform request against an index" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'foo/_msearch/template', url
+            true
+          end.returns(FakeResponse.new)
+
+          subject.msearch_template :index => 'foo', :body => []
+        end
+
+      end
+
+    end
+  end
+end

data/test/unit/utils_test.rb

@@ -253,8 +253,8 @@ module Elasticsearch
             arguments = { :foo => 'bar', :moo => 'bam', :baz => 'qux' }
             unsupported_params = [:foo, :moo]
 
-            Kernel.expects(:warn).with do |message|
-              assert_equal 2, message.split("\n").reject { |l| l.include? 'Suppress this warning' }.size
+            STDERR.expects(:puts).with do |message|
+              assert_equal 2, message.split("\n").size
               true
             end
 
@@ -265,9 +265,9 @@ module Elasticsearch
             arguments = { :foo => 'bar', :moo => 'bam', :baz => 'qux' }
             unsupported_params = [ { :foo => { :explanation => 'NOT_SUPPORTED' } } ]
 
-            Kernel.expects(:warn).with do |message|
+            STDERR.expects(:puts).with do |message|
               assert_match /NOT_SUPPORTED/, message
-              assert_equal 1, message.split("\n").reject { |l| l.include? 'Suppress this warning' }.size
+              assert_equal 1, message.split("\n").size
               true
             end
 
@@ -278,9 +278,9 @@ module Elasticsearch
             arguments = { :foo => 'bar', :moo => 'bam', :baz => 'qux' }
             unsupported_params = [ { :foo => { :explanation => 'NOT_SUPPORTED'} }, :moo ]
 
-            Kernel.expects(:warn).with do |message|
+            STDERR.expects(:puts).with do |message|
               assert_match /NOT_SUPPORTED/, message
-              assert_equal 2, message.split("\n").reject { |l| l.include? 'Suppress this warning' }.size
+              assert_equal 2, message.split("\n").size
               true
             end
 
@@ -291,7 +291,7 @@ module Elasticsearch
             arguments = { :moo => 'bam', :baz => 'qux' }
             unsupported_params = [:foo]
 
-            Kernel.expects(:warn).never
+            STDERR.expects(:puts).never
 
             __report_unsupported_parameters(arguments, unsupported_params)
           end
@@ -299,7 +299,7 @@ module Elasticsearch
 
         context "__report_unsupported_method" do
           should "print the warning" do
-            Kernel.expects(:warn).with do |message|
+            STDERR.expects(:puts).with do |message|
               assert_match /foo/, message
               true
             end

data/utils/thor/generate_source.rb

@@ -62,7 +62,7 @@ module Elasticsearch
           @namespace_depth  = @full_namespace.size > 0 ? @full_namespace.size-1 : 0
           @module_namespace = @full_namespace[0, @namespace_depth]
           @method_name      = @full_namespace.last
-          @http_method      = "HTTP_#{@spec['methods'].first}"
+          @http_method      = "Elasticsearch::API::HTTP_#{@spec['methods'].first}"
           @http_path        = unless @spec['url']['parts'].empty?
                                 @spec['url']['path']
                                   .split('/')
@@ -111,7 +111,7 @@ module Elasticsearch
 
         # -- Tree output
 
-        if options[:verbose] && `which tree > /dev/null 2>&1`
+        if options[:verbose] && `which tree > /dev/null 2>&1; echo $?`.to_i < 1
           lines = `tree #{@output}`.split("\n")
           say_status 'tree',
                      lines.first  + "\n" + lines[1, lines.size].map { |l| ' '*14 + l }.join("\n")

data/utils/thor/templates/ruby/method.erb

@@ -10,20 +10,20 @@ module Elasticsearch
 <%# URL parts -%>
       <%- @spec['url']['parts'].each do |name,info| -%>
       <%- info['type'] = 'String' if info['type'] == 'enum' # Rename 'enums' to 'strings' -%>
-      <%= '  '*@namespace_depth + "# @option arguments [#{info['type'] ? info['type'].capitalize : 'String'}] :#{name} #{info['description']}" + ( info['required'] ? ' (*Required*)' : '' ) -%><%= " (options: #{info['options'].join(', ')})" if info['options'] -%>
+      <%= '  '*@namespace_depth + "# @option arguments [#{info['type'] ? info['type'].capitalize : 'String'}] :#{name} #{info['description'] ? info['description'].strip : '[TODO]'}" + ( info['required'] ? ' (*Required*)' : '' ) -%><%= " (options: #{info['options'].join(', '.strip)})" if info['options'] -%>
       <%= "\n" -%>
       <%- end -%>
 <%# Body -%>
-<%= '  '*(@namespace_depth+3) + '# @option arguments [Hash] :body ' + (@spec['body']['description'] || 'TODO: Description') + (@spec['body']['required'] ? ' (*Required*)' : '') + "\n" if @spec['body'] -%>
+<%= '  '*(@namespace_depth+3) + '# @option arguments [Hash] :body ' + (@spec['body']['description'] ? @spec['body']['description'].strip : 'TODO: Description') + (@spec['body']['required'] ? ' (*Required*)' : '') + "\n" if @spec['body'] -%>
 <%# URL parameters -%>
       <%- @spec['url']['params'].each do |name,info| -%>
       <%- info['type'] = 'String' if info['type'] == 'enum' # Rename 'enums' to 'strings' -%>
-      <%= '  '*@namespace_depth + "# @option arguments [#{info['type'] ? info['type'].capitalize : 'String'}] :#{name} #{info['description']}" -%><%= " (options: #{info['options'].join(', ')})" if info['options'] -%>
+      <%= '  '*@namespace_depth + "# @option arguments [#{info['type'] ? info['type'].capitalize : 'String'}] :#{name} #{info['description'] ? info['description'].strip : '[TODO]'}" -%><%= " (options: #{info['options'].join(', ')})" if info['options'] -%>
       <%=  "\n" -%>
       <%- end if @spec['url']['parts'] -%>
       <%= '  '*@namespace_depth -%>#
 <%# Documentation link -%>
-      <%= '  '*@namespace_depth %># @see <%= @spec['documentation'] %>
+      <%= '  '*@namespace_depth %># @see <%= @spec['documentation'] ? @spec['documentation'] : "[TODO]" %>
       <%= '  '*@namespace_depth %>#
 <%# Method definition -%>
       <%= '  '*@namespace_depth -%>def <%= @method_name %>(arguments={})
@@ -42,7 +42,7 @@ module Elasticsearch
       <%= '  '*@namespace_depth %>  method = <%= @http_method %>
       <%= '  '*@namespace_depth %>  path   = "<%= @http_path %>"
       <%- unless @spec['url']['params'].empty? -%>
-      <%= '  '*@namespace_depth %>  params = Utils.__validate_and_extract_params arguments, valid_params
+      <%= '  '*@namespace_depth %>  params = Elasticsearch::API::Utils.__validate_and_extract_params arguments, valid_params
       <%- else -%>
       <%= '  '*@namespace_depth %>  params = {}
       <%- end -%>

data/utils/thor/templates/ruby/test.erb

@@ -16,7 +16,7 @@ module Elasticsearch
             true
           end.returns(FakeResponse.new)
 
-          subject.<%= @full_namespace.join('.') %> <%= @spec['url']['parts'].select { |name, info| info['required'] }.keys.map { |d| ":#{d} => 'foo'" }.join(', ') %>
+          subject.<%= @full_namespace.join('.') %> <%= @spec['url']['parts'].select { |name, info| info['required'] }.keys.map { |d| ":#{d} => 'foo'" }.join(', ') rescue '' %>
         end
 
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-api
 version: !ruby/object:Gem::Version
-  version: 5.0.5
+  version: 6.0.0
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-25 00:00:00.000000000 Z
+date: 2017-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -192,20 +192,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: ci_reporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: jsonify
   requirement: !ruby/object:Gem::Requirement
@@ -467,6 +453,7 @@ files:
 - lib/elasticsearch/api/actions/mlt.rb
 - lib/elasticsearch/api/actions/mpercolate.rb
 - lib/elasticsearch/api/actions/msearch.rb
+- lib/elasticsearch/api/actions/msearch_template.rb
 - lib/elasticsearch/api/actions/mtermvectors.rb
 - lib/elasticsearch/api/actions/nodes/hot_threads.rb
 - lib/elasticsearch/api/actions/nodes/info.rb
@@ -618,6 +605,7 @@ files:
 - test/unit/mget_test.rb
 - test/unit/mlt_test.rb
 - test/unit/mpercolate_test.rb
+- test/unit/msearch_template_test.rb
 - test/unit/msearch_test.rb
 - test/unit/mtermvectors_test.rb
 - test/unit/nodes/hot_threads_test.rb
@@ -682,7 +670,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Ruby API for Elasticsearch.
@@ -794,6 +782,7 @@ test_files:
 - test/unit/mget_test.rb
 - test/unit/mlt_test.rb
 - test/unit/mpercolate_test.rb
+- test/unit/msearch_template_test.rb
 - test/unit/msearch_test.rb
 - test/unit/mtermvectors_test.rb
 - test/unit/nodes/hot_threads_test.rb