elastomer-client 3.0.1 → 3.1.0

data/lib/elastomer/client/index.rb

@@ -40,7 +40,7 @@ module Elastomer
       #
       # Returns true if the index (or type) exists
       def exists?( params = {} )
-        response = client.head "/{index}{/type}", update_params(params, :action => "index.exists")
+        response = client.head "/{index}{/type}", update_params(params, action: "index.exists", rest_api: "indices.exists")
         response.success?
       end
       alias_method :exist?, :exists?
@@ -54,7 +54,7 @@ module Elastomer
       #
       # Returns the response body as a Hash
       def create( body, params = {} )
-        response = client.put "/{index}", update_params(params, :body => body, :action => "index.create")
+        response = client.put "/{index}", update_params(params, body: body, action: "index.create", rest_api: "indices.create")
         response.body
       end
 
@@ -66,7 +66,7 @@ module Elastomer
       #
       # Returns the response body as a Hash
       def delete( params = {} )
-        response = client.delete "/{index}", update_params(params, :action => "index.delete")
+        response = client.delete "/{index}", update_params(params, action: "index.delete", rest_api: "indices.delete")
         response.body
       end
 
@@ -78,7 +78,7 @@ module Elastomer
       #
       # Returns the response body as a Hash
       def open( params = {} )
-        response = client.post "/{index}/_open", update_params(params, :action => "index.open")
+        response = client.post "/{index}/_open", update_params(params, action: "index.open", rest_api: "indices.open")
         response.body
       end
 
@@ -90,7 +90,7 @@ module Elastomer
       #
       # Returns the response body as a Hash
       def close( params = {} )
-        response = client.post "/{index}/_close", update_params(params, :action => "index.close")
+        response = client.post "/{index}/_close", update_params(params, action: "index.close", rest_api: "indices.close")
         response.body
       end
 
@@ -102,7 +102,7 @@ module Elastomer
       #
       # Returns the response body as a Hash
       def get_settings( params = {} )
-        response = client.get "{/index}/_settings", update_params(params, :action => "index.get_settings")
+        response = client.get "{/index}/_settings", update_params(params, action: "index.get_settings", rest_api: "indices.get_settings")
         response.body
       end
       alias_method :settings, :get_settings
@@ -116,7 +116,7 @@ module Elastomer
       #
       # Returns the response body as a Hash
       def update_settings( body, params = {} )
-        response = client.put "{/index}/_settings", update_params(params, :body => body, :action => "index.update_settings")
+        response = client.put "{/index}/_settings", update_params(params, body: body, action: "index.update_settings", rest_api: "indices.put_settings")
         response.body
       end
 
@@ -130,7 +130,7 @@ module Elastomer
       #
       # Returns the response body as a Hash
       def get_mapping( params = {} )
-        response = client.get "/{index}/_mapping{/type}", update_params(params, :action => "index.get_mapping")
+        response = client.get "/{index}/_mapping{/type}", update_params(params, action: "index.get_mapping", rest_api: "indices.get_mapping")
         response.body
       end
       alias_method :mapping, :get_mapping
@@ -145,7 +145,7 @@ module Elastomer
       #
       # Returns the response body as a Hash
       def update_mapping( type, body, params = {} )
-        response = client.put "/{index}/_mapping/{type}", update_params(params, :body => body, :type => type, :action => "index.update_mapping")
+        response = client.put "/{index}/_mapping/{type}", update_params(params, body: body, type: type, action: "index.update_mapping", rest_api: "indices.put_mapping")
         response.body
       end
       alias_method :put_mapping, :update_mapping
@@ -158,7 +158,7 @@ module Elastomer
       #
       # Returns the response body as a Hash
       def get_aliases( params = {} )
-        response = client.get "/{index}/_aliases", update_params(:action => "index.get_aliases")
+        response = client.get "/{index}/_alias", update_params(action: "index.get_aliases", rest_api: "indices.get_alias")
         response.body
       end
       alias_method :aliases, :get_aliases
@@ -179,7 +179,7 @@ module Elastomer
       #
       # Returns the response body as a Hash
       def get_alias( name, params = {} )
-        response = client.get "/{index}/_alias/{name}", update_params(params, :name => name, :action => "index.get_alias")
+        response = client.get "/{index}/_alias/{name}", update_params(params, name: name, action: "index.get_alias", rest_api: "indices.get_alias")
         response.body
       end
 
@@ -192,13 +192,13 @@ module Elastomer
       #
       # Examples
       #
-      #   index.add_alias("foo", :routing => "foo")
+      #   index.add_alias("foo", routing: "foo")
       #
       # See https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-aliases.html
       #
       # Returns the response body as a Hash
       def add_alias( name, params = {} )
-        response = client.put "/{index}/_alias/{name}", update_params(params, :name => name, :action => "index.add_alias")
+        response = client.put "/{index}/_alias/{name}", update_params(params, name: name, action: "index.add_alias", rest_api: "indices.put_alias")
         response.body
       end
 
@@ -216,7 +216,7 @@ module Elastomer
       #
       # Returns the response body as a Hash
       def delete_alias( name, params = {} )
-        response = client.delete "/{index}/_alias/{name}", update_params(params, :name => name, :action => "index.delete_alias")
+        response = client.delete "/{index}/_alias/{name}", update_params(params, name: name, action: "index.delete_alias", rest_api: "indices.delete_alias")
         response.body
       end
 
@@ -231,7 +231,7 @@ module Elastomer
       # Returns the response body as a Hash
       def analyze( text, params = {} )
         body = text.is_a?(Hash) ? text : {text: text.to_s}
-        response = client.get "{/index}/_analyze", update_params(params, body: body, action: "index.analyze")
+        response = client.get "{/index}/_analyze", update_params(params, body: body, action: "index.analyze", rest_api: "indices.analyze")
         response.body
       end
 
@@ -245,7 +245,7 @@ module Elastomer
       #
       # Returns the response body as a Hash
       def refresh( params = {} )
-        response = client.post "{/index}/_refresh", update_params(params, :action => "index.refresh")
+        response = client.post "{/index}/_refresh", update_params(params, action: "index.refresh", rest_api: "indices.refresh")
         response.body
       end
 
@@ -258,7 +258,7 @@ module Elastomer
       #
       # Returns the response body as a Hash
       def flush( params = {} )
-        response = client.post "{/index}/_flush", update_params(params, :action => "index.flush")
+        response = client.post "{/index}/_flush", update_params(params, action: "index.flush", rest_api: "indices.flush")
         response.body
       end
 
@@ -272,7 +272,7 @@ module Elastomer
       #
       # Returns the response body as a Hash
       def forcemerge( params = {} )
-        response = client.post "{/index}/_forcemerge", update_params(params, :action => "index.forcemerge")
+        response = client.post "{/index}/_forcemerge", update_params(params, action: "index.forcemerge", rest_api: "indices.forcemerge")
         response.body
       end
       # DEPRECATED:  ES 5.X has removed the `/_optimize` endpoint.
@@ -287,7 +287,7 @@ module Elastomer
       #
       # Returns the response body as a Hash
       def recovery( params = {} )
-        response = client.get "{/index}/_recovery", update_params(params, :action => "index.recovery")
+        response = client.get "{/index}/_recovery", update_params(params, action: "index.recovery", rest_api: "indices.recovery")
         response.body
       end
 
@@ -301,7 +301,7 @@ module Elastomer
       #
       # Returns the response body as a Hash
       def clear_cache( params = {} )
-        response = client.post "{/index}/_cache/clear", update_params(params, :action => "index.clear_cache")
+        response = client.post "{/index}/_cache/clear", update_params(params, action: "index.clear_cache", rest_api: "indices.clear_cache")
         response.body
       end
 
@@ -320,7 +320,7 @@ module Elastomer
       #
       # Returns the response body as a Hash
       def stats( params = {} )
-        response = client.get "{/index}/_stats{/stats}", update_params(params, :action => "index.stats")
+        response = client.get "{/index}/_stats{/stats}", update_params(params, action: "index.stats", rest_api: "indices.stats")
         response.body
       end
 
@@ -333,7 +333,7 @@ module Elastomer
       #
       # Returns the response body as a Hash
       def segments( params = {} )
-        response = client.get "{/index}/_segments", update_params(params, :action => "index.segments")
+        response = client.get "{/index}/_segments", update_params(params, action: "index.segments", rest_api: "indices.segments")
         response.body
       end
 
@@ -358,7 +358,7 @@ module Elastomer
       #
       # Returns the response body as a Hash
       def suggest(query, params = {})
-        response = client.post "{/index}/_suggest", update_params(params, :body => query, :action => "index.suggest")
+        response = client.post "{/index}/_suggest", update_params(params, body: query, action: "index.suggest", rest_api: "suggest")
         response.body
       end
 
@@ -387,7 +387,7 @@ module Elastomer
       def bulk( params = {}, &block )
         raise "a block is required" if block.nil?
 
-        params = {:index => self.name}.merge params
+        params = {index: self.name}.merge params
         client.bulk params, &block
       end
 
@@ -413,7 +413,7 @@ module Elastomer
       #
       # Returns a new Scroller instance
       def scroll( query, opts = {} )
-        opts = {:index => name}.merge opts
+        opts = {index: name}.merge opts
         client.scroll query, opts
       end
 
@@ -442,7 +442,7 @@ module Elastomer
       #
       # Returns a new Scroller instance
       def scan( query, opts = {} )
-        opts = {:index => name}.merge opts
+        opts = {index: name}.merge opts
         client.scan query, opts
       end
 
@@ -464,8 +464,8 @@ module Elastomer
       # Examples
       #
       #   index.multi_search do |m|
-      #     m.search({:query => {:match_all => {}}, :size => 0)
-      #     m.search({:query => {:field => {"author" => "grantr"}}}, :type => 'tweet')
+      #     m.search({query: {match_all: {}}, size: 0)
+      #     m.search({query: {field: {"author" => "grantr"}}}, type: 'tweet')
       #     ...
       #   end
       #
@@ -475,7 +475,7 @@ module Elastomer
       def multi_search( params = {}, &block )
         raise "a block is required" if block.nil?
 
-        params = {:index => self.name}.merge params
+        params = {index: self.name}.merge params
         client.multi_search params, &block
       end
 
@@ -493,8 +493,8 @@ module Elastomer
       #
       #   # block form
       #   multi_percolate do |m|
-      #     m.percolate({ :author => "pea53" }, { :type => 'default-type' })
-      #     m.count({ :author => "pea53" }, { :type => 'type2' })
+      #     m.percolate({ author: "pea53" }, { type: 'default-type' })
+      #     m.count({ author: "pea53" }, { type: 'type2' })
       #     ...
       #   end
       #
@@ -515,7 +515,7 @@ module Elastomer
       # warmer_name - The name of the warmer to operate on.
       #
       # Examples
-      #   index.warmer('warmer1').create(:query => {:match_all => {}})
+      #   index.warmer('warmer1').create(query: {match_all: {}})
       #   index.warmer('warmer1').get
       #   index.warmer('warmer1').delete
       #
@@ -587,7 +587,7 @@ module Elastomer
 
       # Internal: Returns a Hash containing default parameters.
       def defaults
-        { :index => name }
+        { index: name }
       end
 
     end

data/lib/elastomer/client/multi_percolate.rb

@@ -21,12 +21,12 @@ module Elastomer
     #   multi_percolate(request_body)
     #
     #   # index in URI
-    #   multi_percolate(request_body, :index => 'default-index')
+    #   multi_percolate(request_body, index: 'default-index')
     #
     #   # block form
-    #   multi_percolate(:index => 'default-index') do |m|
-    #     m.percolate({ :author => "pea53" }, { :type => 'default-type' })
-    #     m.count({ :author => "pea53" }, { :type => 'type2' })
+    #   multi_percolate(index: 'default-index') do |m|
+    #     m.percolate({ author: "pea53" }, { type: 'default-type' })
+    #     m.count({ author: "pea53" }, { type: 'type2' })
     #     ...
     #   end
     #
@@ -40,7 +40,7 @@ module Elastomer
         raise "multi_percolate request body cannot be nil" if body.nil?
         params ||= {}
 
-        response = self.post "{/index}{/type}/_mpercolate", params.merge(:body => body)
+        response = self.post "{/index}{/type}/_mpercolate", params.merge(body: body, action: "mpercolate", rest_api: "mpercolate")
         response.body
       end
     end
@@ -80,8 +80,8 @@ module Elastomer
       #
       # Returns this MultiPercolate instance.
       def percolate(doc, header = {})
-        add_to_actions(:percolate => @params.merge(header))
-        add_to_actions(:doc => doc)
+        add_to_actions(percolate: @params.merge(header))
+        add_to_actions(doc: doc)
       end
 
       # Add a percolate acount action to the multi percolate request. This
@@ -93,8 +93,8 @@ module Elastomer
       #
       # Returns this MultiPercolate instance.
       def count(doc, header = {})
-        add_to_actions(:count => @params.merge(header))
-        add_to_actions(:doc => doc)
+        add_to_actions(count: @params.merge(header))
+        add_to_actions(doc: doc)
       end
 
       # Execute the multi_percolate call with the accumulated percolate actions.

data/lib/elastomer/client/multi_search.rb

@@ -21,12 +21,12 @@ module Elastomer
     #   multi_search(request_body)
     #
     #   # index in URI
-    #   multi_search(request_body, :index => 'default-index')
+    #   multi_search(request_body, index: 'default-index')
     #
     #   # block form
-    #   multi_search(:index => 'default-index') do |m|
-    #     m.search({:query => {:match_all => {}}, :size => 0)
-    #     m.search({:query => {:field => {"foo" => "bar"}}}, :type => 'default-type')
+    #   multi_search(index: 'default-index') do |m|
+    #     m.search({query: {match_all: {}}, size: 0)
+    #     m.search({query: {field: {"foo" => "bar"}}}, type: 'default-type')
     #     ...
     #   end
     #
@@ -40,7 +40,7 @@ module Elastomer
         raise "multi_search request body cannot be nil" if body.nil?
         params ||= {}
 
-        response = self.post "{/index}{/type}/_msearch", params.merge(:body => body)
+        response = self.post "{/index}{/type}/_msearch", params.merge(body: body, action: "msearch", rest_api: "msearch")
         response.body
       end
     end

data/lib/elastomer/client/native_delete_by_query.rb

@@ -8,7 +8,7 @@ module Elastomer
     # Examples
     #
     #   # request body query
-    #   native_delete_by_query({:query => {:match_all => {}}}, :type => 'tweet')
+    #   native_delete_by_query({query: {match_all: {}}}, type: 'tweet')
     #
     # See https://www.elastic.co/guide/en/elasticsearch/reference/5.6/docs-delete-by-query.html
     #
@@ -20,39 +20,19 @@ module Elastomer
     class NativeDeleteByQuery
       attr_reader :client, :query, :parameters
 
-      PARAMETERS = %i[
-        conflicts
-        index
-        q
-        refresh
-        routing
-        scroll_size
-        timeout
-        type
-        wait_for_active_shards
-        wait_for_completion
-      ].to_set.freeze
-
       def initialize(client, query, parameters)
         unless client.version_support.native_delete_by_query?
           raise IncompatibleVersionException, "Elasticsearch '#{client.version}' does not support _delete_by_query"
         end
 
-        parameters.keys.each do |key|
-          unless PARAMETERS.include?(key) || PARAMETERS.include?(key.to_sym)
-            raise IllegalArgument, "'#{key}' is not a valid _delete_by_query parameter"
-          end
-        end
-
         @client = client
         @query = query
         @parameters = parameters
-
       end
 
       def execute
         # TODO: Require index parameter. type is optional.
-        response = client.post("/{index}{/type}/_delete_by_query", parameters.merge(body: query))
+        response = client.post("/{index}{/type}/_delete_by_query", parameters.merge(body: query, action: "delete_by_query", rest_api: "delete_by_query"))
         response.body
       end
     end

data/lib/elastomer/client/nodes.rb

@@ -41,15 +41,15 @@ module Elastomer
       #
       # Examples
       #
-      #   info(:info => "_all")
-      #   info(:info => "os")
-      #   info(:info => %w[os jvm process])
+      #   info(info: "_all")
+      #   info(info: "os")
+      #   info(info: %w[os jvm process])
       #
       # See https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster-nodes-info.html
       #
       # Returns the response as a Hash
       def info( params = {} )
-        response = client.get "/_nodes{/node_id}{/info}", update_params(params, :action => "nodes.info")
+        response = client.get "/_nodes{/node_id}{/info}", update_params(params, action: "nodes.info", rest_api: "nodes.info")
         response.body
       end
 
@@ -62,14 +62,14 @@ module Elastomer
       #
       # Examples
       #
-      #   stats(:stats => "thread_pool")
-      #   stats(:stats => %w[os process])
+      #   stats(stats: "thread_pool")
+      #   stats(stats: %w[os process])
       #
       # See https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster-nodes-stats.html
       #
       # Returns the response as a Hash
       def stats( params = {} )
-        response = client.get "/_nodes{/node_id}/stats{/stats}", update_params(params, :action => "nodes.stats")
+        response = client.get "/_nodes{/node_id}/stats{/stats}", update_params(params, action: "nodes.stats", rest_api: "nodes.stats")
         response.body
       end
 
@@ -87,21 +87,7 @@ module Elastomer
       #
       # Returns the response as a String
       def hot_threads( params = {} )
-        response = client.get "/_nodes{/node_id}/hot_threads", update_params(params, :action => "nodes.hot_threads")
-        response.body
-      end
-
-      # Shutdown one or more nodes in the cluster. There is also a
-      # Cluster#shutdown command for shutting down the entire cluseter.
-      #
-      # params - Parameters Hash
-      #   :node_id - a single node ID or Array of node IDs
-      #
-      # See https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster-nodes-shutdown.html
-      #
-      # Returns the response as a Hash
-      def shutdown( params = {} )
-        response = client.post "/_cluster/nodes{/node_id}/_shutdown", update_params(params, :action => "nodes.shutdown")
+        response = client.get "/_nodes{/node_id}/hot_threads", update_params(params, action: "nodes.hot_threads", rest_api: "nodes.hot_threads")
         response.body
       end
 

data/lib/elastomer/client/percolator.rb

@@ -24,11 +24,11 @@ module Elastomer
       # Examples
       #
       #   percolator = $client.index("default-index").percolator "1"
-      #   percolator.create :query => { :match_all => { } }
+      #   percolator.create query: { match_all: { } }
       #
       # Returns the response body as a Hash
       def create(body, params = {})
-        response = client.put("/{index}/#{@percolator_type}/{id}", defaults.merge(params.merge(:body => body, :action => "percolator.create")))
+        response = client.put("/{index}/#{@percolator_type}/{id}", defaults.merge(params.merge(body: body, action: "percolator.create")))
         response.body
       end
 
@@ -41,7 +41,7 @@ module Elastomer
       #
       # Returns the response body as a Hash
       def get(params = {})
-        response = client.get("/{index}/#{@percolator_type}/{id}", defaults.merge(params.merge(:action => "percolator.get")))
+        response = client.get("/{index}/#{@percolator_type}/{id}", defaults.merge(params.merge(action: "percolator.get")))
         response.body
       end
 
@@ -54,7 +54,7 @@ module Elastomer
       #
       # Returns the response body as a Hash
       def delete(params = {})
-        response = client.delete("/{index}/#{@percolator_type}/{id}", defaults.merge(params.merge(:action => "percolator.delete")))
+        response = client.delete("/{index}/#{@percolator_type}/{id}", defaults.merge(params.merge(action: "percolator.delete")))
         response.body
       end
 
@@ -72,7 +72,7 @@ module Elastomer
 
       # Internal: Returns a Hash containing default parameters.
       def defaults
-        {:index => index_name, :id => id}
+        {index: index_name, id: id}
       end
 
     end  # Percolator

data/lib/elastomer/client/repository.rb

@@ -26,7 +26,7 @@ module Elastomer
       #
       # Returns true if the repository exists
       def exists?(params = {})
-        response = client.get "/_snapshot{/repository}", update_params(params, :action => "repository.exists")
+        response = client.get "/_snapshot{/repository}", update_params(params, action: "repository.exists", rest_api: "snapshot.get_repository")
         response.success?
       rescue Elastomer::Client::Error => err
         if err.error && err.error.dig("root_cause", 0, "type") == "repository_missing_exception"
@@ -45,7 +45,7 @@ module Elastomer
       #
       # Returns the response body as a Hash
       def create(body, params = {})
-        response = client.put "/_snapshot/{repository}", update_params(params, :body => body, :action => "repository.create")
+        response = client.put "/_snapshot/{repository}", update_params(params, body: body, action: "repository.create", rest_api: "snapshot.create_repository")
         response.body
       end
 
@@ -56,7 +56,7 @@ module Elastomer
       #
       # Returns the response body as a Hash
       def get(params = {})
-        response = client.get "/_snapshot{/repository}", update_params(params, :action => "repository.get")
+        response = client.get "/_snapshot{/repository}", update_params(params, action: "repository.get", rest_api: "snapshot.get_repository")
         response.body
       end
 
@@ -67,7 +67,7 @@ module Elastomer
       #
       # Returns the response body as a Hash
       def status(params = {})
-        response = client.get "/_snapshot{/repository}/_status", update_params(params, :action => "repository.status")
+        response = client.get "/_snapshot{/repository}/_status", update_params(params, action: "repository.status", rest_api: "snapshot.status")
         response.body
       end
 
@@ -79,7 +79,7 @@ module Elastomer
       #
       # Returns the response body as a Hash
       def update(body, params = {})
-        response = client.put "/_snapshot/{repository}", update_params(params, :body => body, :action => "repository.update")
+        response = client.put "/_snapshot/{repository}", update_params(params, body: body, action: "repository.update", rest_api: "snapshot.create_repository")
         response.body
       end
 
@@ -90,7 +90,7 @@ module Elastomer
       #
       # Returns the response body as a Hash
       def delete(params = {})
-        response = client.delete "/_snapshot/{repository}", update_params(params, :action => "repository.delete")
+        response = client.delete "/_snapshot/{repository}", update_params(params, action: "repository.delete", rest_api: "snapshot.delete_repository")
         response.body
       end
 
@@ -120,7 +120,7 @@ module Elastomer
 
       # Internal: Returns a Hash containing default parameters.
       def defaults
-        { :repository => name }
+        { repository: name }
       end
     end
   end