elasticsearch-api 7.4.0 → 7.5.0.pre.pre

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

@@ -5,81 +5,76 @@
 module Elasticsearch
   module API
     module Actions
-
-      # Return information if and how well a document matches a query.
-      #
-      # The returned information contains a `_score` and its explanation, if the document matches the query.
-      #
-      # @example Passing the query in the Lucene query syntax as the `:q` URL parameter
-      #
-      #     client.explain index: 'myindex', type: 'mytype', id: '1', q: 'test'
-      #
-      # @example Passing the query in the Query DSL as the request `:body`
+      # Returns information about why a specific matches (or doesn't match) a query.
       #
-      #     client.explain index: 'myindex', type: 'mytype', id: '1',
-      #                    body: { query: { match: { title: 'test' } } }
-      #
-      # @option arguments [String] :id The document ID (*Required*)
-      # @option arguments [String] :index The name of the index (*Required*)
-      # @option arguments [String] :type The type of the document
-      # @option arguments [Hash] :body The query definition using the Query DSL
+      # @option arguments [String] :id The document ID
+      # @option arguments [String] :index The name of the index
+      # @option arguments [String] :type The type of the document   *Deprecated*
       # @option arguments [Boolean] :analyze_wildcard Specify whether wildcards and prefix queries in the query string query should be analyzed (default: false)
       # @option arguments [String] :analyzer The analyzer for the query string query
-      # @option arguments [String] :default_operator The default operator for query string query (AND or OR) (options: AND, OR)
+      # @option arguments [String] :default_operator The default operator for query string query (AND or OR)
+      #   (options: AND,OR)
+
       # @option arguments [String] :df The default field for query string query (default: _all)
       # @option arguments [List] :stored_fields A comma-separated list of stored fields to return in the response
       # @option arguments [Boolean] :lenient Specify whether format-based query failures (such as providing text to a numeric field) should be ignored
-      # @option arguments [String] :parent The ID of the parent document
       # @option arguments [String] :preference Specify the node or shard the operation should be performed on (default: random)
       # @option arguments [String] :q Query in the Lucene query string syntax
       # @option arguments [String] :routing Specific routing value
       # @option arguments [List] :_source True or false to return the _source field or not, or a list of fields to return
       # @option arguments [List] :_source_excludes A list of fields to exclude from the returned _source field
       # @option arguments [List] :_source_includes A list of fields to extract and return from the _source field
+
+      # @option arguments [Hash] :body The query definition using the Query DSL
       #
-      # @see http://elasticsearch.org/guide/reference/api/explain/
+      # *Deprecation notice*:
+      # Specifying types in urls has been deprecated
+      # Deprecated since version 7.0.0
       #
-      def explain(arguments={})
+      #
+      # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.5/search-explain.html
+      #
+      def explain(arguments = {})
         raise ArgumentError, "Required argument 'index' missing" unless arguments[:index]
-        raise ArgumentError, "Required argument 'id' missing"    unless arguments[:id]
-        method = HTTP_GET
+        raise ArgumentError, "Required argument 'id' missing" unless arguments[:id]
 
-        if arguments[:type]
-          path   = Utils.__pathify Utils.__escape(arguments[:index]),
-                                   Utils.__escape(arguments[:type]),
-                                   Utils.__escape(arguments[:id]),
-                                   '_explain'
-        else
-          path   = Utils.__pathify Utils.__escape(arguments[:index]),
-                                   '_explain',
-                                   Utils.__escape(arguments[:id])
-        end
+        arguments = arguments.clone
 
-        params = Utils.__validate_and_extract_params arguments, ParamsRegistry.get(__method__)
-        body   = arguments[:body]
+        _id = arguments.delete(:id)
 
-        params[:fields] = Utils.__listify(params[:fields]) if params[:fields]
+        _index = arguments.delete(:index)
 
+        _type = arguments.delete(:type)
+
+        method = Elasticsearch::API::HTTP_GET
+        path   = if _index && _type && _id
+                   "#{Utils.__listify(_index)}/#{Utils.__listify(_type)}/#{Utils.__listify(_id)}/_explain"
+                 else
+                   "#{Utils.__listify(_index)}/_explain/#{Utils.__listify(_id)}"
+  end
+        params = Utils.__validate_and_extract_params arguments, ParamsRegistry.get(__method__)
+
+        body = arguments[:body]
         perform_request(method, path, params, body).body
       end
 
       # Register this action with its valid params when the module is loaded.
       #
-      # @since 6.1.1
+      # @since 6.2.0
       ParamsRegistry.register(:explain, [
-          :analyze_wildcard,
-          :analyzer,
-          :default_operator,
-          :df,
-          :stored_fields,
-          :lenient,
-          :parent,
-          :preference,
-          :q,
-          :routing,
-          :_source,
-          :_source_excludes,
-          :_source_includes ].freeze)
+        :analyze_wildcard,
+        :analyzer,
+        :default_operator,
+        :df,
+        :stored_fields,
+        :lenient,
+        :preference,
+        :q,
+        :routing,
+        :_source,
+        :_source_excludes,
+        :_source_includes
+      ].freeze)
+    end
     end
-  end
 end

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

@@ -5,40 +5,47 @@
 module Elasticsearch
   module API
     module Actions
-
-      # Return the capabilities of fields among multiple indices
-      #
-      # @example
-      #     client.field_caps fields: '*'
-      #     # => { "fields" => "t"=>{"text"=>{"type"=>"text", "searchable"=>true, "aggregatable"=>false}} ...
+      # Returns the information about the capabilities of fields among multiple indices.
       #
       # @option arguments [List] :index A comma-separated list of index names; use `_all` or empty string to perform the operation on all indices
       # @option arguments [List] :fields A comma-separated list of field names
       # @option arguments [Boolean] :ignore_unavailable Whether specified concrete indices should be ignored when unavailable (missing or closed)
       # @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, none, all)
+      # @option arguments [String] :expand_wildcards Whether to expand wildcard expression to concrete indices that are open, closed or both.
+      #   (options: open,closed,none,all)
+
+      # @option arguments [Boolean] :include_unmapped Indicates whether unmapped fields should be included in the response.
+
       #
-      # @see http://www.elastic.co/guide/en/elasticsearch/reference/master/search-field-caps.html
+      # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.5/search-field-caps.html
       #
-      def field_caps(arguments={})
-        raise ArgumentError, "Required argument 'fields' missing" unless arguments[:fields]
-        method = HTTP_GET
-        path   = Utils.__pathify Utils.__listify(arguments[:index]), '_field_caps'
+      def field_caps(arguments = {})
+        arguments = arguments.clone
+
+        _index = arguments.delete(:index)
+
+        method = Elasticsearch::API::HTTP_GET
+        path   = if _index
+                   "#{Utils.__listify(_index)}/_field_caps"
+                 else
+                   "_field_caps"
+end
         params = Utils.__validate_and_extract_params arguments, ParamsRegistry.get(__method__)
-        body   = arguments[:body]
 
+        body = nil
         perform_request(method, path, params, body).body
       end
 
       # Register this action with its valid params when the module is loaded.
       #
-      # @since 6.1.1
+      # @since 6.2.0
       ParamsRegistry.register(:field_caps, [
-          :fields,
-          :ignore_unavailable,
-          :allow_no_indices,
-          :expand_wildcards,
-          :include_unmapped ].freeze)
+        :fields,
+        :ignore_unavailable,
+        :allow_no_indices,
+        :expand_wildcards,
+        :include_unmapped
+      ].freeze)
+    end
     end
-  end
 end

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

@@ -5,20 +5,12 @@
 module Elasticsearch
   module API
     module Actions
-
-      # Return a specified document.
-      #
-      # The response contains full document, as stored in Elasticsearch, incl. `_source`, `_version`, etc.
-      #
-      # @example Get a document
-      #
-      #     client.get index: 'myindex', type: 'mytype', id: '1'
+      # Returns a document.
       #
-      # @option arguments [String] :id The document ID (*Required*)
-      # @option arguments [String] :index The name of the index (*Required*)
-      # @option arguments [String] :type The type of the document (use `_all` to fetch the first document matching the ID across all types)
+      # @option arguments [String] :id The document ID
+      # @option arguments [String] :index The name of the index
+      # @option arguments [String] :type The type of the document (use `_all` to fetch the first document matching the ID across all types)   *Deprecated*
       # @option arguments [List] :stored_fields A comma-separated list of stored fields to return in the response
-      # @option arguments [String] :parent The ID of the parent document
       # @option arguments [String] :preference Specify the node or shard the operation should be performed on (default: random)
       # @option arguments [Boolean] :realtime Specify whether to perform the operation in realtime or search mode
       # @option arguments [Boolean] :refresh Refresh the shard containing the document before performing the operation
@@ -26,28 +18,39 @@ module Elasticsearch
       # @option arguments [List] :_source True or false to return the _source field or not, or a list of fields to return
       # @option arguments [List] :_source_excludes A list of fields to exclude from the returned _source field
       # @option arguments [List] :_source_includes A list of fields to extract and return from the _source field
-      # @option arguments [List] :_source_exclude A list of fields to exclude from the returned _source field
-      # @option arguments [List] :_source_include A list of fields to extract and return from the _source field
       # @option arguments [Number] :version Explicit version number for concurrency control
-      # @option arguments [String] :version_type Specific version type (options: internal, external, external_gte, force)
+      # @option arguments [String] :version_type Specific version type
+      #   (options: internal,external,external_gte,force)
+
+      #
+      # *Deprecation notice*:
+      # Specifying types in urls has been deprecated
+      # Deprecated since version 7.0.0
+      #
       #
-      # @see http://elasticsearch.org/guide/reference/api/get/
+      # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.5/docs-get.html
       #
-      def get(arguments={})
+      def get(arguments = {})
         raise ArgumentError, "Required argument 'index' missing" unless arguments[:index]
-        raise ArgumentError, "Required argument 'id' missing"    unless arguments[:id]
-        arguments[:type] ||= DEFAULT_DOC
+        raise ArgumentError, "Required argument 'id' missing" unless arguments[:id]
 
-        method = HTTP_GET
-        path   = Utils.__pathify Utils.__escape(arguments[:index]),
-                                 Utils.__escape(arguments[:type]),
-                                 Utils.__escape(arguments[:id])
+        arguments = arguments.clone
 
-        params = Utils.__validate_and_extract_params arguments, ParamsRegistry.get(__method__)
-        body   = nil
+        _id = arguments.delete(:id)
+
+        _index = arguments.delete(:index)
 
-        params[:fields] = Utils.__listify(params[:fields]) if params[:fields]
+        _type = arguments.delete(:type)
 
+        method = Elasticsearch::API::HTTP_GET
+        path   = if _index && _type && _id
+                   "#{Utils.__listify(_index)}/#{Utils.__listify(_type)}/#{Utils.__listify(_id)}"
+                 else
+                   "#{Utils.__listify(_index)}/_doc/#{Utils.__listify(_id)}"
+  end
+        params = Utils.__validate_and_extract_params arguments, ParamsRegistry.get(__method__)
+
+        body = nil
         if Array(arguments[:ignore]).include?(404)
           Utils.__rescue_from_not_found { perform_request(method, path, params, body).body }
         else
@@ -57,21 +60,19 @@ module Elasticsearch
 
       # Register this action with its valid params when the module is loaded.
       #
-      # @since 6.1.1
+      # @since 6.2.0
       ParamsRegistry.register(:get, [
-          :stored_fields,
-          :parent,
-          :preference,
-          :realtime,
-          :refresh,
-          :routing,
-          :_source,
-          :_source_excludes,
-          :_source_includes,
-          :_source_exclude,
-          :_source_include,
-          :version,
-          :version_type ].freeze)
+        :stored_fields,
+        :preference,
+        :realtime,
+        :refresh,
+        :routing,
+        :_source,
+        :_source_excludes,
+        :_source_includes,
+        :version,
+        :version_type
+      ].freeze)
+    end
     end
-  end
 end

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

@@ -5,30 +5,35 @@
 module Elasticsearch
   module API
     module Actions
-
-      # Retrieve an indexed script from Elasticsearch
+      # Returns a script.
       #
-      # @option arguments [String] :id Script ID (*Required*)
-      # @option arguments [String] :lang Script language
+      # @option arguments [String] :id Script ID
+      # @option arguments [Time] :master_timeout Specify timeout for connection to master
+
       #
-      # @see https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-scripting.html#_indexed_scripts
+      # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.5/modules-scripting.html
       #
-      def get_script(arguments={})
-        raise ArgumentError, "Required argument 'id' missing"   unless arguments[:id]
+      def get_script(arguments = {})
+        raise ArgumentError, "Required argument 'id' missing" unless arguments[:id]
+
+        arguments = arguments.clone
+
+        _id = arguments.delete(:id)
+
         method = Elasticsearch::API::HTTP_GET
-        path   = "_scripts/#{arguments[:id]}"
-        params = Elasticsearch::API::Utils.__validate_and_extract_params arguments, ParamsRegistry.get(__method__)
-        body   = nil
+        path   = "_scripts/#{Utils.__listify(_id)}"
+        params = Utils.__validate_and_extract_params arguments, ParamsRegistry.get(__method__)
 
+        body = nil
         perform_request(method, path, params, body).body
       end
 
-
       # Register this action with its valid params when the module is loaded.
       #
-      # @since 6.1.1
+      # @since 6.2.0
       ParamsRegistry.register(:get_script, [
-          :master_timeout ].freeze)
+        :master_timeout
+      ].freeze)
+    end
     end
-  end
 end

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

@@ -5,19 +5,11 @@
 module Elasticsearch
   module API
     module Actions
-
-      # Return a specified document's `_source`.
-      #
-      # The response contains just the original document, as passed to Elasticsearch during indexing.
-      #
-      # @example Get a document `_source`
+      # Returns the source of a document.
       #
-      #     client.get_source index: 'myindex', type: 'mytype', id: '1'
-      #
-      # @option arguments [String] :id The document ID (*Required*)
-      # @option arguments [String] :index The name of the index (*Required*)
-      # @option arguments [String] :type The type of the document; deprecated and optional starting with 7.0
-      # @option arguments [String] :parent The ID of the parent document
+      # @option arguments [String] :id The document ID
+      # @option arguments [String] :index The name of the index
+      # @option arguments [String] :type The type of the document; deprecated and optional starting with 7.0   *Deprecated*
       # @option arguments [String] :preference Specify the node or shard the operation should be performed on (default: random)
       # @option arguments [Boolean] :realtime Specify whether to perform the operation in realtime or search mode
       # @option arguments [Boolean] :refresh Refresh the shard containing the document before performing the operation
@@ -26,53 +18,55 @@ module Elasticsearch
       # @option arguments [List] :_source_excludes A list of fields to exclude from the returned _source field
       # @option arguments [List] :_source_includes A list of fields to extract and return from the _source field
       # @option arguments [Number] :version Explicit version number for concurrency control
-      # @option arguments [String] :version_type Specific version type (options: internal, external, external_gte, force)
+      # @option arguments [String] :version_type Specific version type
+      #   (options: internal,external,external_gte,force)
+
+      #
+      # *Deprecation notice*:
+      # Specifying types in urls has been deprecated
+      # Deprecated since version 7.0.0
       #
-      # @see http://elasticsearch.org/guide/reference/api/get/
       #
-      # @since 0.90.1
+      # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.5/docs-get.html
       #
-      def get_source(arguments={})
+      def get_source(arguments = {})
         raise ArgumentError, "Required argument 'index' missing" unless arguments[:index]
-        raise ArgumentError, "Required argument 'id' missing"    unless arguments[:id]
-        arguments[:type] ||= DEFAULT_DOC
+        raise ArgumentError, "Required argument 'id' missing" unless arguments[:id]
 
-        method = HTTP_GET
+        arguments = arguments.clone
 
-        if arguments[:type]
-          path   = Utils.__pathify Utils.__escape(arguments[:index]),
-                                   Utils.__escape(arguments[:type]),
-                                   Utils.__escape(arguments[:id]),
-                                   '_source'
-        else
-          path   = Utils.__pathify Utils.__escape(arguments[:index]),
-                                   '_source',
-                                   Utils.__escape(arguments[:id])
-        end
+        _id = arguments.delete(:id)
 
+        _index = arguments.delete(:index)
 
-        params = Utils.__validate_and_extract_params arguments, ParamsRegistry.get(__method__)
-        body   = nil
+        _type = arguments.delete(:type)
 
-        params[:fields] = Utils.__listify(params[:fields]) if params[:fields]
+        method = Elasticsearch::API::HTTP_GET
+        path   = if _index && _type && _id
+                   "#{Utils.__listify(_index)}/#{Utils.__listify(_type)}/#{Utils.__listify(_id)}/_source"
+                 else
+                   "#{Utils.__listify(_index)}/_source/#{Utils.__listify(_id)}"
+  end
+        params = Utils.__validate_and_extract_params arguments, ParamsRegistry.get(__method__)
 
+        body = nil
         perform_request(method, path, params, body).body
       end
 
       # Register this action with its valid params when the module is loaded.
       #
-      # @since 6.1.1
+      # @since 6.2.0
       ParamsRegistry.register(:get_source, [
-          :parent,
-          :preference,
-          :realtime,
-          :refresh,
-          :routing,
-          :_source,
-          :_source_excludes,
-          :_source_includes,
-          :version,
-          :version_type ].freeze)
+        :preference,
+        :realtime,
+        :refresh,
+        :routing,
+        :_source,
+        :_source_excludes,
+        :_source_includes,
+        :version,
+        :version_type
+      ].freeze)
+    end
     end
-  end
 end