RubyGems - elasticsearch-api - Versions diffs - 1.0.6 → 1.0.7 - Mend

elasticsearch-api 1.0.6 → 1.0.7

Files changed (136) hide show

data/lib/elasticsearch/api/actions/indices/put_settings.rb CHANGED

@@ -53,7 +53,7 @@ module Elasticsearch
             :flat_settings
           ]
-          method = 'PUT'
+          method = HTTP_PUT
           path   = Utils.__pathify Utils.__listify(arguments[:index]), '_settings'
           params = Utils.__validate_and_extract_params arguments, valid_params
           body   = arguments[:body]

data/lib/elasticsearch/api/actions/indices/put_template.rb CHANGED

@@ -26,7 +26,7 @@ module Elasticsearch
           raise ArgumentError, "Required argument 'body' missing" unless arguments[:body]
           valid_params = [ :create, :order, :timeout ]
-          method = 'PUT'
+          method = HTTP_PUT
           path   = Utils.__pathify '_template', Utils.__escape(arguments[:name])
           params = Utils.__validate_and_extract_params arguments, valid_params

data/lib/elasticsearch/api/actions/indices/put_warmer.rb CHANGED

@@ -48,7 +48,7 @@ module Elasticsearch
             :expand_wildcards
           ]
-          method = 'PUT'
+          method = HTTP_PUT
           path   = Utils.__pathify( Utils.__listify(arguments[:index]),
                                     Utils.__listify(arguments[:type]),
                                     '_warmer',

data/lib/elasticsearch/api/actions/indices/recovery.rb CHANGED

@@ -29,7 +29,7 @@ module Elasticsearch
             :detailed,
             :active_only,
             :human ]
-          method = 'GET'
+          method = HTTP_GET
           path   = Utils.__pathify Utils.__listify(arguments[:index]), '_recovery'
           params = Utils.__validate_and_extract_params arguments, valid_params
           body   = nil

data/lib/elasticsearch/api/actions/indices/refresh.rb CHANGED

@@ -40,7 +40,7 @@ module Elasticsearch
             :expand_wildcards
           ]
-          method = 'POST'
+          method = HTTP_POST
           path   = Utils.__pathify Utils.__listify(arguments[:index]), '_refresh'
           params = Utils.__validate_and_extract_params arguments, valid_params

data/lib/elasticsearch/api/actions/indices/segments.rb CHANGED

@@ -30,7 +30,7 @@ module Elasticsearch
             :expand_wildcards
           ]
-          method = 'GET'
+          method = HTTP_GET
           path   = Utils.__pathify Utils.__listify(arguments[:index]), '_segments'
           params = Utils.__validate_and_extract_params arguments, valid_params

data/lib/elasticsearch/api/actions/indices/snapshot_index.rb CHANGED

@@ -29,7 +29,7 @@ module Elasticsearch
             :expand_wildcards
           ]
-          method = 'POST'
+          method = HTTP_POST
           path   = Utils.__pathify Utils.__listify(arguments[:index]), '_gateway/snapshot'
           params = Utils.__validate_and_extract_params arguments, valid_params

data/lib/elasticsearch/api/actions/indices/stats.rb CHANGED

@@ -101,7 +101,7 @@ module Elasticsearch
             :allow_no_indices,
             :expand_wildcards ]
-          method = 'GET'
+          method = HTTP_GET
           parts  = Utils.__extract_parts arguments, valid_parts
           path   = Utils.__pathify Utils.__listify(arguments[:index]), '_stats', Utils.__listify(parts)

data/lib/elasticsearch/api/actions/indices/status.rb CHANGED

@@ -42,7 +42,7 @@ module Elasticsearch
             :recovery,
             :snapshot ]
-          method = 'GET'
+          method = HTTP_GET
           path   = Utils.__pathify Utils.__listify(arguments[:index]), '_status'
           params = Utils.__validate_and_extract_params arguments, valid_params

data/lib/elasticsearch/api/actions/indices/update_aliases.rb CHANGED

@@ -34,7 +34,7 @@ module Elasticsearch
           raise ArgumentError, "Required argument 'body' missing" unless arguments[:body]
           valid_params = [ :timeout ]
-          method = 'POST'
+          method = HTTP_POST
           path   = "_aliases"
           params = Utils.__validate_and_extract_params arguments, valid_params

data/lib/elasticsearch/api/actions/indices/upgrade.rb CHANGED

@@ -25,7 +25,7 @@ module Elasticsearch
             :expand_wildcards,
             :wait_for_completion ]
-          method = 'POST'
+          method = HTTP_POST
           path   = "_upgrade"
           params = Utils.__validate_and_extract_params arguments, valid_params
           body   = nil

data/lib/elasticsearch/api/actions/indices/validate_query.rb CHANGED

@@ -64,7 +64,7 @@ module Elasticsearch
             :expand_wildcards,
             :source ]
-          method = 'GET'
+          method = HTTP_GET
           path   = Utils.__pathify Utils.__listify(arguments[:index]),
                                    Utils.__listify(arguments[:type]),
                                    '_validate/query'

data/lib/elasticsearch/api/actions/info.rb CHANGED

@@ -7,7 +7,7 @@ module Elasticsearch
       # @see http://elasticsearch.org/guide/
       #
       def info(arguments={})
-        method = 'GET'
+        method = HTTP_GET
         path   = ""
         params = {}
         body   = nil

data/lib/elasticsearch/api/actions/list_benchmarks.rb CHANGED

@@ -17,7 +17,7 @@ module Elasticsearch
       def list_benchmarks(arguments={})
         valid_params = [
            ]
-        method = 'GET'
+        method = HTTP_GET
         path   = "_bench"
         params = {}
         body   = nil

data/lib/elasticsearch/api/actions/mget.rb CHANGED

@@ -57,7 +57,7 @@ module Elasticsearch
           :_source_include,
           :_source_exclude ]
-        method = 'GET'
+        method = HTTP_GET
         path   = Utils.__pathify Utils.__escape(arguments[:index]),
                                  Utils.__escape(arguments[:type]),
                                  '_mget'

data/lib/elasticsearch/api/actions/mlt.rb CHANGED

@@ -107,7 +107,7 @@ module Elasticsearch
           :search_types,
           :stop_words ]
-        method = 'GET'
+        method = HTTP_GET
         path   = Utils.__pathify Utils.__escape(arguments[:index]),
                                  Utils.__escape(arguments[:type]),
                                  Utils.__escape(arguments[:id]),

data/lib/elasticsearch/api/actions/mpercolate.rb CHANGED

@@ -36,7 +36,7 @@ module Elasticsearch
           :allow_no_indices,
           :expand_wildcards ]
-        method = 'GET'
+        method = HTTP_GET
         path   = "_mpercolate"
         params = Utils.__validate_and_extract_params arguments, valid_params

data/lib/elasticsearch/api/actions/msearch.rb CHANGED

@@ -39,7 +39,7 @@ module Elasticsearch
         raise ArgumentError, "Required argument 'body' missing" unless arguments[:body]
         valid_params = [ :search_type ]
-        method = 'GET'
+        method = HTTP_GET
         path   = Utils.__pathify( Utils.__listify(arguments[:index]), Utils.__listify(arguments[:type]), '_msearch' )
         params = Utils.__validate_and_extract_params arguments, valid_params

data/lib/elasticsearch/api/actions/mtermvectors.rb CHANGED

@@ -50,7 +50,7 @@ module Elasticsearch
         ids = arguments.delete(:ids)
-        method = 'GET'
+        method = HTTP_GET
         path   = Utils.__pathify Utils.__escape(arguments[:index]),
                                  Utils.__escape(arguments[:type]),
                                  '_mtermvectors'

data/lib/elasticsearch/api/actions/nodes/hot_threads.rb CHANGED

@@ -32,7 +32,7 @@ module Elasticsearch
             :threads,
             :type ]
-          method = 'GET'
+          method = HTTP_GET
           path   = Utils.__pathify '_nodes', Utils.__listify(arguments[:node_id]), 'hot_threads'
           params = Utils.__validate_and_extract_params arguments, valid_params

data/lib/elasticsearch/api/actions/nodes/info.rb CHANGED

@@ -14,6 +14,14 @@ module Elasticsearch
         #
         #     client.nodes.info jvm: true
         #
+        # @example Return information about HTTP and network
+        #
+        #     client.nodes.info http: true, network: true
+        #
+        # @example Pass a list of metrics
+        #
+        #     client.nodes.info metric: ['http', 'network']
+        #
         # @option arguments [List] :node_id A comma-separated list of node IDs or names to limit the returned information;
         #                                   use `_local` to return information from the node you're connecting to, leave
         #                                   empty to get information from all nodes
@@ -31,6 +39,9 @@ module Elasticsearch
         # @see http://elasticsearch.org/guide/reference/api/admin-cluster-nodes-info/
         #
         def info(arguments={})
+          arguments = arguments.clone
+          metric    = arguments.delete(:metric)
           valid_parts = [
             :_all,
             :http,
@@ -45,9 +56,14 @@ module Elasticsearch
           valid_params = []
-          method = 'GET'
+          method = HTTP_GET
+          if metric
+            parts = metric
+          else
+            parts = Utils.__extract_parts arguments, valid_parts
+          end
-          parts  = Utils.__extract_parts arguments, valid_parts
           path   = Utils.__pathify '_nodes', Utils.__listify(arguments[:node_id]), Utils.__listify(parts)
           params = Utils.__validate_and_extract_params arguments, valid_params

data/lib/elasticsearch/api/actions/nodes/shutdown.rb CHANGED

@@ -22,7 +22,7 @@ module Elasticsearch
             :delay,
             :exit ]
-          method = 'POST'
+          method = HTTP_POST
           path   = Utils.__pathify '_cluster/nodes', Utils.__listify(arguments[:node_id]), '_shutdown'
           params = Utils.__validate_and_extract_params arguments, valid_params

data/lib/elasticsearch/api/actions/nodes/stats.rb CHANGED

@@ -55,7 +55,7 @@ module Elasticsearch
             :level,
             :types ]
-          method = 'GET'
+          method = HTTP_GET
           path   = Utils.__pathify '_nodes',
                                    Utils.__listify(arguments[:node_id]),

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

@@ -21,10 +21,10 @@ module Elasticsearch
       #
       # @example Evaluate a custom document (passed as `:doc`) against the queries
       #
-      #     client.percolate index: 'my-index', body: { doc: { title: "Foo" } }
+      #     client.percolate index: 'my-index', type: 'my-type', body: { doc: { title: "Foo" } }
       #     # => {..., matches: [ {_index: 'my-index', _id: 'alert-1'} ]}
       #
-      #     client.percolate index: 'my-index', body: { doc: { title: "Foo Bar" } }
+      #     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
@@ -44,13 +44,12 @@ module Elasticsearch
       #
       # @example Evaluate a document against "high priority" percolator queries
       #
-      #     client.percolate index: 'my-index', body: {
+      #     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*)
       # @option arguments [String] :id Fetch the document specified by index/type/id and
@@ -91,7 +90,7 @@ module Elasticsearch
           :version,
           :version_type ]
-        method = 'GET'
+        method = HTTP_GET
         path   = Utils.__pathify Utils.__escape(arguments[:index]),
                                  Utils.__escape(arguments[:type]),
                                  arguments[:id],

data/lib/elasticsearch/api/actions/ping.rb CHANGED

@@ -11,7 +11,7 @@ module Elasticsearch
       # @see http://elasticsearch.org/guide/
       #
       def ping(arguments={})
-        method = 'HEAD'
+        method = HTTP_HEAD
         path   = ""
         params = {}
         body   = nil

data/lib/elasticsearch/api/actions/put_script.rb CHANGED

@@ -37,7 +37,7 @@ module Elasticsearch
           :version,
           :version_type ]
-        method = 'PUT'
+        method = HTTP_PUT
         path   = "_scripts/#{arguments.delete(:lang)}/#{arguments[:id]}"
         params = Utils.__validate_and_extract_params arguments, valid_params

data/lib/elasticsearch/api/actions/put_template.rb CHANGED

@@ -13,7 +13,7 @@ module Elasticsearch
       def put_template(arguments={})
         raise ArgumentError, "Required argument 'id' missing"   unless arguments[:id]
         raise ArgumentError, "Required argument 'body' missing" unless arguments[:body]
-        method = 'PUT'
+        method = HTTP_PUT
         path   = "_search/template/#{arguments[:id]}"
         params = {}
         body   = arguments[:body]

data/lib/elasticsearch/api/actions/scroll.rb CHANGED

@@ -44,14 +44,14 @@ module Elasticsearch
       # @see http://www.elasticsearch.org/guide/reference/api/search/search-type/
       #
       def scroll(arguments={})
-        method = 'GET'
+        method = HTTP_GET
         path   = "_search/scroll"
         valid_params = [
           :scroll,
           :scroll_id ]
         params = Utils.__validate_and_extract_params arguments, valid_params
-        body   = arguments[:body]
+        body   = params.delete(:scroll_id) || arguments[:body]
         perform_request(method, path, params, body).body
       end

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

@@ -112,7 +112,7 @@ module Elasticsearch
       # @see http://www.elasticsearch.org/guide/reference/api/search/request-body/
       #
       def search(arguments={})
-        arguments[:index] = '_all' if ! arguments[:index] && arguments[:type]
+        arguments[:index] = UNDERSCORE_ALL if ! arguments[:index] && arguments[:type]
         valid_params = [
           :analyzer,
@@ -130,6 +130,7 @@ module Elasticsearch
           :lowercase_expanded_terms,
           :preference,
           :q,
+          :query_cache,
           :routing,
           :scroll,
           :search_type,
@@ -147,8 +148,8 @@ module Elasticsearch
           :timeout,
           :version ]
-        method = 'GET'
-        path   = Utils.__pathify( Utils.__listify(arguments[:index]), Utils.__listify(arguments[:type]), '_search' )
+        method = HTTP_GET
+        path   = Utils.__pathify( Utils.__listify(arguments[:index]), Utils.__listify(arguments[:type]), UNDERSCORE_SEARCH )
         params = Utils.__validate_and_extract_params arguments, valid_params
         body   = arguments[:body]

data/lib/elasticsearch/api/actions/search_shards.rb CHANGED

@@ -29,7 +29,7 @@ module Elasticsearch
           :ignore_unavailable,
           :allow_no_indices,
           :expand_wildcards ]
-        method = 'GET'
+        method = HTTP_GET
         path   = Utils.__pathify( Utils.__listify(arguments[:index]), Utils.__listify(arguments[:type]), '_search_shards' )
         params = Utils.__validate_and_extract_params arguments, valid_params
         body   = nil

data/lib/elasticsearch/api/actions/search_template.rb CHANGED

@@ -49,7 +49,7 @@ module Elasticsearch
           :routing,
           :scroll,
           :search_type ]
-        method = 'GET'
+        method = HTTP_GET
         path   = Utils.__pathify( Utils.__listify(arguments[:index]), Utils.__listify(arguments[:type]), '_search/template' )
         params = Utils.__validate_and_extract_params arguments, valid_params
         body   = arguments[:body]

data/lib/elasticsearch/api/actions/snapshot/create.rb CHANGED

@@ -34,7 +34,7 @@ module Elasticsearch
           repository = arguments.delete(:repository)
           snapshot   = arguments.delete(:snapshot)
-          method = 'PUT'
+          method = HTTP_PUT
           path   = Utils.__pathify( '_snapshot', Utils.__escape(repository), Utils.__escape(snapshot) )
           params = Utils.__validate_and_extract_params arguments, valid_params

data/lib/elasticsearch/api/actions/snapshot/create_repository.rb CHANGED

@@ -30,7 +30,7 @@ module Elasticsearch
           repository = arguments.delete(:repository)
-          method = 'PUT'
+          method = HTTP_PUT
           path   = Utils.__pathify( '_snapshot', Utils.__escape(repository) )
           params = Utils.__validate_and_extract_params arguments, valid_params

data/lib/elasticsearch/api/actions/snapshot/delete.rb CHANGED

@@ -27,7 +27,7 @@ module Elasticsearch
           repository = arguments.delete(:repository)
           snapshot   = arguments.delete(:snapshot)
-          method = 'DELETE'
+          method = HTTP_DELETE
           path   = Utils.__pathify( '_snapshot', Utils.__escape(repository), Utils.__listify(snapshot) )
           params = Utils.__validate_and_extract_params arguments, valid_params

data/lib/elasticsearch/api/actions/snapshot/delete_repository.rb CHANGED

@@ -24,7 +24,7 @@ module Elasticsearch
           repository = arguments.delete(:repository)
-          method = 'DELETE'
+          method = HTTP_DELETE
           path   = Utils.__pathify( '_snapshot', Utils.__listify(repository) )
           params = Utils.__validate_and_extract_params arguments, valid_params

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

@@ -33,7 +33,7 @@ module Elasticsearch
           repository = arguments.delete(:repository)
           snapshot   = arguments.delete(:snapshot)
-          method = 'GET'
+          method = HTTP_GET
           path   = Utils.__pathify( '_snapshot', Utils.__escape(repository), Utils.__listify(snapshot) )
           params = Utils.__validate_and_extract_params arguments, valid_params

data/lib/elasticsearch/api/actions/snapshot/get_repository.rb CHANGED

@@ -28,7 +28,7 @@ module Elasticsearch
           repository = arguments.delete(:repository)
-          method = 'GET'
+          method = HTTP_GET
           path   = Utils.__pathify( '_snapshot', Utils.__escape(repository) )
           params = Utils.__validate_and_extract_params arguments, valid_params