elasticsearch-api 0.4.3 → 0.4.4

data/Rakefile

@@ -1,5 +1,7 @@
 require "bundler/gem_tasks"
 
+__current__ = Pathname( File.expand_path('..', __FILE__) )
+
 desc "Run unit tests"
 task :default => 'test:unit'
 task :test    => 'test:unit'
@@ -27,10 +29,53 @@ namespace :test do
     # test.warning = true
   end
 
-  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"]
+  desc "Run integration tests"
+  task :integration do
+    require 'elasticsearch'
+
+    current_branch = `git --git-dir=#{__current__.join('../support/elasticsearch/.git')} --work-tree=#{__current__.join('../support/elasticsearch')} branch --no-color`.split("\n").select { |b| b =~ /^\*/ }.first.gsub(/^\*\s*/, '')
+
+    # 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"]
+    end
+
+    begin
+      client = Elasticsearch::Client.new host: "localhost:#{ENV['TEST_CLUSTER_PORT'] || 9250}"
+      es_version_info = client.info['version']
+      build_hash      = es_version_info['build_hash']
+      cluster_running = true
+    rescue Faraday::Error::ConnectionFailed => e
+      STDERR.puts "[!] Test cluster not running?"
+      cluster_running = false
+    end
+
+    checkout_server_build = ENV['TEST_NO_SPEC_CHECKOUT'].nil? || true
+    checkout_build_hash   = ENV['TEST_BUILD_HASH'] || build_hash
+
+    begin
+      # Checkout the branch corresponding to the build
+      sh "git --git-dir=#{__current__.join('../support/elasticsearch/.git')} --work-tree=#{__current__.join('../support/elasticsearch')} checkout #{checkout_build_hash} --force --quiet" if cluster_running && checkout_server_build
+
+      # Path to the API specs
+      ENV['TEST_REST_API_SPEC'] = __current__.join('../support/elasticsearch/rest-api-spec/test/').to_s
+
+      # Run the task
+      args = [t.ruby_opts_string, t.run_code, t.file_list_string, t.option_list].join(' ')
+
+      ruby args do |ok, status|
+        if !ok && status.respond_to?(:signaled?) && status.signaled?
+          raise SignalException.new(status.termsig)
+        elsif !ok
+          fail "Command failed with status (#{status.exitstatus}): " + "[ruby #{args}]"
+        end
+      end
+
+    ensure
+      sh "git --git-dir=#{__current__.join('../support/elasticsearch/.git')} --work-tree=#{__current__.join('../support/elasticsearch')} checkout #{current_branch}", verbose: false if cluster_running && checkout_server_build
+    end
   end
 
   Rake::TestTask.new(:all) do |test|
@@ -39,7 +84,7 @@ namespace :test do
     test.test_files = FileList["test/unit/**/*_test.rb", "test/integration/**/*_test.rb", "test/integration/yaml_test_runner.rb"]
   end
 
-  namespace :server do
+  namespace :cluster do
     desc "Start Elasticsearch nodes for tests"
     task :start do
       $LOAD_PATH << File.expand_path('../../elasticsearch-transport/lib', __FILE__) << File.expand_path('../test', __FILE__)

data/elasticsearch-api.gemspec

@@ -48,6 +48,7 @@ Gem::Specification.new do |s|
   if defined?(RUBY_VERSION) && RUBY_VERSION < '1.9'
     s.add_development_dependency "test-unit", '~> 2'
     s.add_development_dependency "activesupport", '~> 3'
+    s.add_development_dependency "json"
   end
 
   if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'

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

@@ -7,15 +7,26 @@ module Elasticsearch
       # Pass the operations in the `:body` option as an array of hashes, following Elasticsearch conventions.
       # For operations which take data, pass them as the `:data` option in the operation hash.
       #
-      # @example Perform three operations in a single request
+      # @example Perform three operations in a single request, passing actions and data as an array of hashes
+      #
+      #     client.bulk body: [
+      #       { index: { _index: 'myindex', _type: 'mytype', _id: 1 } },
+      #       { title: 'foo' },
+      #
+      #       { index: { _index: 'myindex', _type: 'mytype', _id: 2 } },
+      #       { title: 'foo' },
+      #
+      #       { delete: { _index: 'myindex', _type: 'mytype', _id: 3  } }
+      #     ]
+      # @example Perform three operations in a single request, passing data in the `:data` option
       #
       #     client.bulk body: [
       #       { index:  { _index: 'myindex', _type: 'mytype', _id: 1, data: { title: 'foo' } } },
       #       { update: { _index: 'myindex', _type: 'mytype', _id: 2, data: { doc: { title: 'foo' } } } },
-      #       { delete: { _index: 'myindex', _type: 'mytype', _id: 3  },
+      #       { delete: { _index: 'myindex', _type: 'mytype', _id: 3  } }
       #     ]
       #
-      # @example Perform a script-based bulk update
+      # @example Perform a script-based bulk update, passing scripts in the `:data` option
       #
       #     client.bulk body: [
       #       { update: { _index: 'myindex', _type: 'mytype', _id: 1,

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

@@ -19,8 +19,13 @@ module Elasticsearch
       # @option arguments [List] :index A comma-separated list of indices to restrict the results
       # @option arguments [List] :type A comma-separated list of types to restrict the results
       # @option arguments [Hash] :body A query to restrict the results (optional)
-      # @option arguments [String] :ignore_indices When performed on multiple indices, allows to ignore `missing` ones
-      #                                            (options: none, missing)
+      # @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] :ignore_indices When performed on multiple indices, allows to ignore
+      #                                            `missing` ones (options: none, missing) @until 1.0
+      # @option arguments [Boolean] :ignore_unavailable Whether specified concrete indices should be ignored when
+      #                                                 unavailable (missing, closed, etc)
       # @option arguments [Number] :min_score Include only documents with a specific `_score` value in the result
       # @option arguments [String] :preference Specify the node or shard the operation should be performed on
       #                                        (default: random)
@@ -32,6 +37,9 @@ module Elasticsearch
       def count(arguments={})
         valid_params = [
           :ignore_indices,
+          :ignore_unavailable,
+          :allow_no_indices,
+          :expand_wildcards,
           :min_score,
           :preference,
           :routing,

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

@@ -25,8 +25,15 @@ module Elasticsearch
       # @option arguments [String] :default_operator The default operator for query string query (AND or OR)
       #                                              (options: AND, OR)
       # @option arguments [String] :df The field to use as default where no field prefix is given in the query string
-      # @option arguments [String] :ignore_indices When performed on multiple indices, allows to ignore `missing` ones
-      #                                            (options: none, missing)
+      # @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 [String] :ignore_indices When performed on multiple indices, allows to ignore
+      #                                            `missing` ones (options: none, missing) @until 1.0
+      # @option arguments [Boolean] :ignore_unavailable Whether specified concrete indices should be ignored when
+      #                                                 unavailable (missing, closed, etc)
       # @option arguments [String] :replication Specific replication type (options: sync, async)
       # @option arguments [String] :q Query in the Lucene query string syntax
       # @option arguments [String] :routing Specific routing value
@@ -44,6 +51,9 @@ module Elasticsearch
           :default_operator,
           :df,
           :ignore_indices,
+          :ignore_unavailable,
+          :allow_no_indices,
+          :expand_wildcards,
           :replication,
           :q,
           :routing,

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

@@ -23,6 +23,11 @@ module Elasticsearch
         #     client.indices.clear_cache field_data: true, fields: 'created_at', filter_cache: false, id_cache: false
         #
         # @option arguments [List] :index A comma-separated list of index name to limit the operation
+        # @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] :field_data Clear field data
         # @option arguments [Boolean] :fielddata Clear field data
         # @option arguments [List] :fields A comma-separated list of fields to clear when using the
@@ -33,8 +38,10 @@ module Elasticsearch
         #                                          `filter_cache` parameter (default: all)
         # @option arguments [Boolean] :id Clear ID caches for parent/child
         # @option arguments [Boolean] :id_cache Clear ID caches for parent/child
-        # @option arguments [String] :ignore_indices When performed on multiple indices,
-        #                                            allows to ignore `missing` ones (options: none, missing)
+        # @option arguments [String] :ignore_indices When performed on multiple indices, allows to ignore
+        #                                            `missing` ones (options: none, missing) @until 1.0
+        # @option arguments [Boolean] :ignore_unavailable Whether specified concrete indices should be ignored when
+        #                                                 unavailable (missing, closed, etc)
         # @option arguments [List] :index A comma-separated list of index name to limit the operation
         # @option arguments [Boolean] :recycler Clear the recycler cache
         #
@@ -51,6 +58,9 @@ module Elasticsearch
             :id,
             :id_cache,
             :ignore_indices,
+            :ignore_unavailable,
+            :allow_no_indices,
+            :expand_wildcards,
             :recycler ]
 
           method = 'POST'

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

@@ -12,13 +12,29 @@ module Elasticsearch
         #     client.indices.close index: 'myindex'
         #
         # @option arguments [String] :index The name of the index (*Required*)
+        # @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 [String] :ignore_indices When performed on multiple indices, allows to ignore
+        #                                            `missing` ones (options: none, missing) @until 1.0
+        # @option arguments [Boolean] :ignore_unavailable Whether specified concrete indices should be ignored when
+        #                                                 unavailable (missing, closed, etc)
         # @option arguments [Time] :timeout Explicit operation timeout
         #
         # @see http://www.elasticsearch.org/guide/reference/api/admin-indices-open-close/
         #
         def close(arguments={})
           raise ArgumentError, "Required argument 'index' missing" unless arguments[:index]
-          valid_params = [ :timeout ]
+
+          valid_params = [
+            :ignore_indices,
+            :ignore_unavailable,
+            :allow_no_indices,
+            :expand_wildcards,
+            :timeout
+          ]
 
           method = 'POST'
           path   = Utils.__pathify Utils.__listify(arguments[:index]), '_close'

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

@@ -10,15 +10,33 @@ module Elasticsearch
         #     client.indices.exists index: 'myindex'
         #
         # @option arguments [List] :index A comma-separated list of indices to check (*Required*)
+        # @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 [String] :ignore_indices When performed on multiple indices, allows to ignore
+        #                                            `missing` ones (options: none, missing) @until 1.0
+        # @option arguments [Boolean] :ignore_unavailable Whether specified concrete indices should be ignored when
+        #                                                 unavailable (missing, closed, etc)
+        #
         # @return [true,false]
         #
         # @see http://www.elasticsearch.org/guide/reference/api/admin-indices-indices-exists/
         #
         def exists(arguments={})
           raise ArgumentError, "Required argument 'index' missing" unless arguments[:index]
+
+          valid_params = [
+            :ignore_indices,
+            :ignore_unavailable,
+            :allow_no_indices,
+            :expand_wildcards
+          ]
+
           method = 'HEAD'
           path   = Utils.__listify(arguments[:index])
-          params = {}
+          params = Utils.__validate_and_extract_params arguments, valid_params
           body   = nil
 
           perform_request(method, path, params, body).status == 200 ? true : false

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

@@ -11,14 +11,26 @@ module Elasticsearch
         #
         # @option arguments [List] :index A comma-separated list of index names to filter aliases
         # @option arguments [List] :name A comma-separated list of alias names to return (*Required*)
-        # @option arguments [String] :ignore_indices When performed on multiple indices, allows to ignore `missing` ones
-        #                                            (options: none, missing)
+        # @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 [String] :ignore_indices When performed on multiple indices, allows to ignore
+        #                                            `missing` ones (options: none, missing) @until 1.0
+        # @option arguments [Boolean] :ignore_unavailable Whether specified concrete indices should be ignored when
+        #                                                 unavailable (missing, closed, etc)
         #
         # @see http://www.elasticsearch.org/guide/reference/api/admin-indices-aliases/
         #
         def exists_alias(arguments={})
           raise ArgumentError, "Required argument 'name' missing" unless arguments[:name]
-          valid_params = [ :ignore_indices ]
+          valid_params = [
+            :ignore_indices,
+            :ignore_unavailable,
+            :allow_no_indices,
+            :expand_wildcards
+          ]
 
           method = 'HEAD'
           path   = Utils.__pathify Utils.__listify(arguments[:index]), '_alias', Utils.__escape(arguments[:name])

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

@@ -8,15 +8,27 @@ module Elasticsearch
         # @option arguments [List] :index A comma-separated list of index names; use `_all`
         #                                 to check the types across all indices (*Required*)
         # @option arguments [List] :type A comma-separated list of document types to check (*Required*)
-        # @option arguments [String] :ignore_indices When performed on multiple indices, allows to ignore `missing` ones
-        #                                            (options: none, missing)
+        # @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 [String] :ignore_indices When performed on multiple indices, allows to ignore
+        #                                            `missing` ones (options: none, missing) @until 1.0
+        # @option arguments [Boolean] :ignore_unavailable Whether specified concrete indices should be ignored when
+        #                                                 unavailable (missing, closed, etc)
         #
         # @see http://www.elasticsearch.org/guide/reference/api/admin-indices-types-exists/
         #
         def exists_type(arguments={})
           raise ArgumentError, "Required argument 'index' missing" unless arguments[:index]
           raise ArgumentError, "Required argument 'type' missing" unless arguments[:type]
-          valid_params = [ :ignore_indices ]
+          valid_params = [
+            :ignore_indices,
+            :ignore_unavailable,
+            :allow_no_indices,
+            :expand_wildcards
+          ]
 
           method = 'HEAD'
           path   = Utils.__pathify Utils.__listify(arguments[:index]), Utils.__escape(arguments[:type])

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

@@ -11,10 +11,19 @@ module Elasticsearch
         # @note The flush operation is handled automatically by Elasticsearch, you don't need to perform it manually.
         #
         # @option arguments [List] :index A comma-separated list of index names; use `_all` or empty string for all indices
-        # @option arguments [Boolean] :force TODO: ?
-        # @option arguments [Boolean] :full TODO: ?
-        # @option arguments [String] :ignore_indices When performed on multiple indices, allows to ignore `missing` ones
-        #                                            (options: none, missing)
+        # @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] :full If set to true a new index writer is created and settings that have been
+        #                                   changed related to the index writer will be refreshed. (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 [String] :ignore_indices When performed on multiple indices, allows to ignore
+        #                                            `missing` ones (options: none, missing) @until 1.0
+        # @option arguments [Boolean] :ignore_unavailable Whether specified concrete indices should be ignored when
+        #                                                 unavailable (missing, closed, etc)
         # @option arguments [Boolean] :refresh Refresh the index after performing the operation
         #
         # @see http://www.elasticsearch.org/guide/reference/api/admin-indices-flush/
@@ -24,6 +33,9 @@ module Elasticsearch
             :force,
             :full,
             :ignore_indices,
+            :ignore_unavailable,
+            :allow_no_indices,
+            :expand_wildcards,
             :refresh ]
 
           method = 'POST'

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

@@ -15,16 +15,26 @@ module Elasticsearch
         #
         # @option arguments [List] :index A comma-separated list of index names to filter aliases
         # @option arguments [List] :name A comma-separated list of alias names to return (*Required*)
-        # @option arguments [String] :ignore_indices When performed on multiple indices, allows to ignore `missing` ones
-        #                                            (options: none, missing)
-        # @option arguments [List] :index A comma-separated list of index names to filter aliases
-        # @option arguments [List] :name A comma-separated list of alias names to return
+        # @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 [String] :ignore_indices When performed on multiple indices, allows to ignore
+        #                                            `missing` ones (options: none, missing) @until 1.0
+        # @option arguments [Boolean] :ignore_unavailable Whether specified concrete indices should be ignored when
+        #                                                 unavailable (missing, closed, etc)
         #
         # @see http://www.elasticsearch.org/guide/reference/api/admin-indices-aliases/
         #
         def get_alias(arguments={})
           raise ArgumentError, "Required argument 'name' missing" unless arguments[:name]
-          valid_params = [ :ignore_indices ]
+          valid_params = [
+            :ignore_indices,
+            :ignore_unavailable,
+            :allow_no_indices,
+            :expand_wildcards
+          ]
 
           method = 'GET'
           path   = Utils.__pathify Utils.__listify(arguments[:index]), '_alias', Utils.__escape(arguments[:name])

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

@@ -21,12 +21,27 @@ module Elasticsearch
         # @option arguments [List] :type  A comma-separated list of document types
         # @option arguments [List] :field A comma-separated list of fields (*Required*)
         # @option arguments [Boolean] :include_defaults Whether default mapping values should be returned as well
+        # @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 [String] :ignore_indices When performed on multiple indices, allows to ignore
+        #                                            `missing` ones (options: none, missing) @until 1.0
+        # @option arguments [Boolean] :ignore_unavailable Whether specified concrete indices should be ignored when
+        #                                                 unavailable (missing, closed, etc)
         #
         # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-get-field-mapping.html
         #
         def get_field_mapping(arguments={})
           raise ArgumentError, "Required argument 'field' missing" unless arguments[:field]
-          valid_params = [ :include_defaults ]
+          valid_params = [
+            :include_defaults,
+            :ignore_indices,
+            :ignore_unavailable,
+            :allow_no_indices,
+            :expand_wildcards
+          ]
 
           method = 'GET'
           path   = Utils.__pathify(

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

@@ -19,13 +19,29 @@ module Elasticsearch
         #
         # @option arguments [List] :index A comma-separated list of index names; use `_all` or empty string for all indices
         # @option arguments [List] :type A comma-separated list of document types
+        # @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 [String] :ignore_indices When performed on multiple indices, allows to ignore
+        #                                            `missing` ones (options: none, missing) @until 1.0
+        # @option arguments [Boolean] :ignore_unavailable Whether specified concrete indices should be ignored when
+        #                                                 unavailable (missing, closed, etc)
         #
         # @see http://www.elasticsearch.org/guide/reference/api/admin-indices-get-mapping/
         #
         def get_mapping(arguments={})
+          valid_params = [
+            :ignore_indices,
+            :ignore_unavailable,
+            :allow_no_indices,
+            :expand_wildcards
+          ]
+
           method = 'GET'
           path   = Utils.__pathify Utils.__listify(arguments[:index]), Utils.__listify(arguments[:type]), '_mapping'
-          params = {}
+          params = Utils.__validate_and_extract_params arguments, valid_params
           body = nil
 
           perform_request(method, path, params, body).body

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

@@ -26,11 +26,28 @@ module Elasticsearch
         # @option arguments [String] :name The name of the warmer (supports wildcards); leave empty to get all warmers
         # @option arguments [List] :type A comma-separated list of document types to restrict the operation;
         #                                leave empty to perform the operation on all types
+        # @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 [String] :ignore_indices When performed on multiple indices, allows to ignore
+        #                                            `missing` ones (options: none, missing) @until 1.0
+        # @option arguments [Boolean] :ignore_unavailable Whether specified concrete indices should be ignored when
+        #                                                 unavailable (missing, closed, etc)
         #
         # @see http://www.elasticsearch.org/guide/reference/api/admin-indices-warmers/
         #
         def get_warmer(arguments={})
           raise ArgumentError, "Required argument 'index' missing" unless arguments[:index]
+
+          valid_params = [
+            :ignore_indices,
+            :ignore_unavailable,
+            :allow_no_indices,
+            :expand_wildcards
+          ]
+
           method = 'GET'
           path   = Utils.__pathify( Utils.__listify(arguments[:index]), '_warmer', Utils.__escape(arguments[:name]) )
           params = {}

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

@@ -10,13 +10,29 @@ module Elasticsearch
         #     client.indices.open index: 'myindex'
         #
         # @option arguments [String] :index The name of the index (*Required*)
+        # @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 [String] :ignore_indices When performed on multiple indices, allows to ignore
+        #                                            `missing` ones (options: none, missing) @until 1.0
+        # @option arguments [Boolean] :ignore_unavailable Whether specified concrete indices should be ignored when
+        #                                                 unavailable (missing, closed, etc)
         # @option arguments [Time] :timeout Explicit operation timeout
         #
         # @see http://www.elasticsearch.org/guide/reference/api/admin-indices-open-close/
         #
         def open(arguments={})
           raise ArgumentError, "Required argument 'index' missing" unless arguments[:index]
-          valid_params = [ :timeout ]
+
+          valid_params = [
+            :ignore_indices,
+            :ignore_unavailable,
+            :allow_no_indices,
+            :expand_wildcards,
+            :timeout
+          ]
 
           method = 'POST'
           path   = Utils.__pathify Utils.__escape(arguments[:index]), '_open'

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

@@ -18,12 +18,20 @@ module Elasticsearch
         #
         # @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 [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] :flush Specify whether the index should be flushed after performing the operation
         #                                    (default: true)
-        # @option arguments [String] :ignore_indices When performed on multiple indices, allows to ignore `missing` ones
-        #                                            (options: none, missing)
+        # @option arguments [String] :ignore_indices When performed on multiple indices, allows to ignore
+        #                                            `missing` ones (options: none, missing) @until 1.0
+        # @option arguments [Boolean] :ignore_unavailable Whether specified concrete indices should be ignored when
+        #                                                 unavailable (missing, closed, etc)
         # @option arguments [Number] :max_num_segments The number of segments the index should be merged into
         #                                              (default: dynamic)
+        # @option arguments [Time] :master_timeout Specify timeout for connection to master
         # @option arguments [Boolean] :only_expunge_deletes Specify whether the operation should only expunge
         #                                                   deleted documents
         # @option arguments [Boolean] :refresh Specify whether the index should be refreshed after performing the operation
@@ -35,8 +43,12 @@ module Elasticsearch
         #
         def optimize(arguments={})
           valid_params = [
-            :flush,
             :ignore_indices,
+            :ignore_unavailable,
+            :allow_no_indices,
+            :expand_wildcards,
+            :flush,
+            :master_timeout,
             :max_num_segments,
             :only_expunge_deletes,
             :operation_threading,

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

@@ -23,6 +23,16 @@ module Elasticsearch
         # @option arguments [String] :type The name of the document type (*Required*)
         # @option arguments [Boolean] :ignore_conflicts Specify whether to ignore conflicts while updating the mapping
         #                                               (default: false)
+        # @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 [String] :ignore_indices When performed on multiple indices, allows to ignore
+        #                                            `missing` ones (options: none, missing) @until 1.0
+        # @option arguments [Boolean] :ignore_unavailable Whether specified concrete indices should be ignored when
+        #                                                 unavailable (missing, closed, etc)
+        # @option arguments [Time] :master_timeout Specify timeout for connection to master
         # @option arguments [Time] :timeout Explicit operation timeout
         #
         # @see http://www.elasticsearch.org/guide/reference/api/admin-indices-put-mapping/
@@ -31,7 +41,16 @@ module Elasticsearch
           raise ArgumentError, "Required argument 'index' missing" unless arguments[:index]
           raise ArgumentError, "Required argument 'type' missing"  unless arguments[:type]
           raise ArgumentError, "Required argument 'body' missing"  unless arguments[:body]
-          valid_params = [ :ignore_conflicts, :timeout ]
+
+          valid_params = [
+            :ignore_conflicts,
+            :ignore_indices,
+            :ignore_unavailable,
+            :allow_no_indices,
+            :expand_wildcards,
+            :master_timeout,
+            :timeout
+          ]
 
           method = 'PUT'
           path   = Utils.__pathify Utils.__listify(arguments[:index]), Utils.__escape(arguments[:type]), '_mapping'

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

@@ -27,14 +27,33 @@ module Elasticsearch
         # @option arguments [Hash] :body The index settings to be updated (*Required*)
         # @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 [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 [String] :ignore_indices When performed on multiple indices, allows to ignore
+        #                                            `missing` ones (options: none, missing) @until 1.0
+        # @option arguments [Boolean] :ignore_unavailable Whether specified concrete indices should be ignored when
+        #                                                 unavailable (missing, closed, etc)
+        # @option arguments [Time] :master_timeout Specify timeout for connection to master
         #
         # @see http://www.elasticsearch.org/guide/reference/api/admin-indices-update-settings/
         #
         def put_settings(arguments={})
           raise ArgumentError, "Required argument 'body' missing" unless arguments[:body]
+
+          valid_params = [
+            :ignore_indices,
+            :ignore_unavailable,
+            :allow_no_indices,
+            :expand_wildcards,
+            :master_timeout
+          ]
+
           method = 'PUT'
           path   = Utils.__pathify Utils.__listify(arguments[:index]), '_settings'
-          params = {}
+          params = Utils.__validate_and_extract_params arguments, valid_params
           body   = arguments[:body]
 
           perform_request(method, path, params, body).body

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

@@ -25,19 +25,36 @@ module Elasticsearch
         #                                leave empty to perform the operation on all types
         # @option arguments [Hash] :body The search request definition for the warmer
         #                                (query, filters, facets, sorting, etc) (*Required*)
+        # @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 [String] :ignore_indices When performed on multiple indices, allows to ignore
+        #                                            `missing` ones (options: none, missing) @until 1.0
+        # @option arguments [Boolean] :ignore_unavailable Whether specified concrete indices should be ignored when
+        #                                                 unavailable (missing, closed, etc)
         #
         # @see http://www.elasticsearch.org/guide/reference/api/admin-indices-warmers/
         #
         def put_warmer(arguments={})
           raise ArgumentError, "Required argument 'index' missing" unless arguments[:index]
-          raise ArgumentError, "Required argument 'name' missing" unless arguments[:name]
-          raise ArgumentError, "Required argument 'body' missing" unless arguments[:body]
+          raise ArgumentError, "Required argument 'name' missing"  unless arguments[:name]
+          raise ArgumentError, "Required argument 'body' missing"  unless arguments[:body]
+
+          valid_params = [
+            :ignore_indices,
+            :ignore_unavailable,
+            :allow_no_indices,
+            :expand_wildcards
+          ]
+
           method = 'PUT'
           path   = Utils.__pathify( Utils.__listify(arguments[:index]),
                                     Utils.__listify(arguments[:type]),
                                     '_warmer',
                                     Utils.__listify(arguments[:name]) )
-          params = {}
+          params = Utils.__validate_and_extract_params arguments, valid_params
           body   = arguments[:body]
 
           perform_request(method, path, params, body).body

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

@@ -20,13 +20,25 @@ module Elasticsearch
         #
         # @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 [String] :ignore_indices When performed on multiple indices, allows to ignore `missing` ones
-        #                                            (options: none, missing)
+        # @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 [String] :ignore_indices When performed on multiple indices, allows to ignore
+        #                                            `missing` ones (options: none, missing) @until 1.0
+        # @option arguments [Boolean] :ignore_unavailable Whether specified concrete indices should be ignored when
+        #                                                 unavailable (missing, closed, etc)
         #
         # @see http://www.elasticsearch.org/guide/reference/api/admin-indices-refresh/
         #
         def refresh(arguments={})
-          valid_params = [ :ignore_indices ]
+          valid_params = [
+            :ignore_indices,
+            :ignore_unavailable,
+            :allow_no_indices,
+            :expand_wildcards
+          ]
 
           method = 'POST'
           path   = Utils.__pathify Utils.__listify(arguments[:index]), '_refresh'

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

@@ -10,13 +10,25 @@ module Elasticsearch
         #
         # @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 [String] :ignore_indices When performed on multiple indices, allows to ignore `missing` ones
-        #                                            (options: none, missing)
+        # @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 [String] :ignore_indices When performed on multiple indices, allows to ignore
+        #                                            `missing` ones (options: none, missing) @until 1.0
+        # @option arguments [Boolean] :ignore_unavailable Whether specified concrete indices should be ignored when
+        #                                                 unavailable (missing, closed, etc)
         #
         # @see http://elasticsearch.org/guide/reference/api/admin-indices-segments/
         #
         def segments(arguments={})
-          valid_params = [ :ignore_indices ]
+          valid_params = [
+            :ignore_indices,
+            :ignore_unavailable,
+            :allow_no_indices,
+            :expand_wildcards
+          ]
 
           method = 'GET'
           path   = Utils.__pathify Utils.__listify(arguments[:index]), '_segments'

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

@@ -9,13 +9,25 @@ module Elasticsearch
         #
         # @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 [String] :ignore_indices When performed on multiple indices, allows to ignore `missing` ones
-        #                                            (options: none, missing)
+        # @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 [String] :ignore_indices When performed on multiple indices, allows to ignore
+        #                                            `missing` ones (options: none, missing) @until 1.0
+        # @option arguments [Boolean] :ignore_unavailable Whether specified concrete indices should be ignored when
+        #                                                 unavailable (missing, closed, etc)
         #
         # @see http://www.elasticsearch.org/guide/reference/api/admin-indices-gateway-snapshot/
         #
         def snapshot_index(arguments={})
-          valid_params = [ :ignore_indices ]
+          valid_params = [
+            :ignore_indices,
+            :ignore_unavailable,
+            :allow_no_indices,
+            :expand_wildcards
+          ]
 
           method = 'POST'
           path   = Utils.__pathify Utils.__listify(arguments[:index]), '_gateway/snapshot'

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

@@ -31,8 +31,11 @@ module Elasticsearch
         #
         # @since The `fielddata`, `filter_cache` and `id_cache` metrics are available from version 0.90.
         #
-        # @option arguments [List] :search_groups A comma-separated list of search groups to include
-        #                                         in the `search` statistics
+        # @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] :all Return all available information
         # @option arguments [Boolean] :clear Reset the default level of detail
         # @option arguments [Boolean] :docs Return information about indexed and deleted documents
@@ -43,8 +46,10 @@ module Elasticsearch
         # @option arguments [Boolean] :get Return information about get operations
         # @option arguments [Boolean] :groups A comma-separated list of search groups for `search` statistics
         # @option arguments [Boolean] :id_cache Return information about ID cache
-        # @option arguments [String] :ignore_indices When performed on multiple indices, allows to ignore `missing` ones
-        #                                            (options: none, missing)
+        # @option arguments [String] :ignore_indices When performed on multiple indices, allows to ignore
+        #                                            `missing` ones (options: none, missing) @until 1.0
+        # @option arguments [Boolean] :ignore_unavailable Whether specified concrete indices should be ignored when
+        #                                                 unavailable (missing, closed, etc)
         # @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 [Boolean] :indexing Return information about indexing operations
@@ -54,6 +59,8 @@ module Elasticsearch
         # @option arguments [Boolean] :refresh Return information about refresh operations
         # @option arguments [Boolean] :search Return information about search operations; use the `groups` parameter to
         #                                     include information for specific search groups
+        # @option arguments [List] :search_groups A comma-separated list of search groups to include
+        #                                         in the `search` statistics
         # @option arguments [Boolean] :store Return information about the size of the index
         # @option arguments [Boolean] :warmer Return information about warmers
         #
@@ -72,6 +79,9 @@ module Elasticsearch
             :groups,
             :id_cache,
             :ignore_indices,
+            :ignore_unavailable,
+            :allow_no_indices,
+            :expand_wildcards,
             :indexing,
             :merge,
             :refresh,

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

@@ -19,8 +19,15 @@ module Elasticsearch
         #
         # @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 [String] :ignore_indices When performed on multiple indices, allows to ignore `missing` ones
-        #                                            (options: none, missing)
+        # @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 [String] :ignore_indices When performed on multiple indices, allows to ignore
+        #                                            `missing` ones (options: none, missing) @until 1.0
+        # @option arguments [Boolean] :ignore_unavailable Whether specified concrete indices should be ignored when
+        #                                                 unavailable (missing, closed, etc)
         # @option arguments [Boolean] :recovery Return information about shard recovery (progress, size, etc)
         # @option arguments [Boolean] :snapshot Return information about snapshots (when shared gateway is used)
         #
@@ -29,6 +36,9 @@ module Elasticsearch
         def status(arguments={})
           valid_params = [
             :ignore_indices,
+            :ignore_unavailable,
+            :allow_no_indices,
+            :expand_wildcards,
             :recovery,
             :snapshot ]
 

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

@@ -39,9 +39,16 @@ module Elasticsearch
         # @option arguments [List] :type A comma-separated list of document types to restrict the operation;
         #                                leave empty to perform the operation on all types
         # @option arguments [Hash] :body The query definition (*without* the top-level `query` element)
+        # @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] :explain Return detailed information about the error
-        # @option arguments [String] :ignore_indices When performed on multiple indices, allows to ignore `missing` ones
-        #                                            (options: none, missing)
+        # @option arguments [String] :ignore_indices When performed on multiple indices, allows to ignore
+        #                                            `missing` ones (options: none, missing) @until 1.0
+        # @option arguments [Boolean] :ignore_unavailable Whether specified concrete indices should be ignored when
+        #                                                 unavailable (missing, closed, etc)
         # @option arguments [String] :source The URL-encoded query definition (instead of using the request body)
         # @option arguments [String] :q Query in the Lucene query string syntax
         #
@@ -52,6 +59,9 @@ module Elasticsearch
             :q,
             :explain,
             :ignore_indices,
+            :ignore_unavailable,
+            :allow_no_indices,
+            :expand_wildcards,
             :source ]
 
           method = 'GET'

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

@@ -21,8 +21,8 @@ module Elasticsearch
       #       body: [
       #         { query: { match_all: {} } },
       #         { index: 'myindex', type: 'mytype' },
-      #         { query: { query_string: { query: '"Test 1"' } } }
-      #         { search_type: 'count' }
+      #         { query: { query_string: { query: '"Test 1"' } } },
+      #         { search_type: 'count' },
       #         { facets: { published: { terms: { field: 'published' } } } }
       #       ]
       #

data/lib/elasticsearch/api/utils.rb

@@ -78,6 +78,7 @@ module Elasticsearch
           payload = payload.
           inject([]) do |sum, item|
             operation, meta = item.to_a.first
+            meta            = meta.clone
             data            = meta.delete(:data) || meta.delete('data')
 
             sum << { operation => meta }
@@ -86,6 +87,7 @@ module Elasticsearch
           end.
           map { |item| MultiJson.dump(item) }
           payload << "" unless payload.empty?
+          return payload.join("\n")
 
         # Array of strings
         when payload.all? { |d| d.is_a? String }

data/lib/elasticsearch/api/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module API
-    VERSION = "0.4.3"
+    VERSION = "0.4.4"
   end
 end

data/test/integration/yaml_test_runner.rb

@@ -10,7 +10,7 @@ require 'elasticsearch/extensions/test/profiling'
 
 # Launch test cluster
 #
-Elasticsearch::Extensions::Test::Cluster.start if ENV['SERVER'] and not Elasticsearch::Extensions::Test::Cluster.running?
+Elasticsearch::Extensions::Test::Cluster.start(nodes: 1) if ENV['SERVER'] and not Elasticsearch::Extensions::Test::Cluster.running?
 
 # Register `at_exit` handler for server shutdown.
 # MUST be called before requiring `test/unit`.
@@ -42,9 +42,12 @@ $client ||= Elasticsearch::Client.new host: "localhost:#{ENV['TEST_CLUSTER_PORT'
 
 # Store Elasticsearch version
 #
-$es_version = $client.info['version']['number']
+es_version_info = $client.info['version']
+$es_version = es_version_info['number']
 
-puts '-'*80, "Elasticsearch #{ANSI.ansi($es_version, :bold)}", '-'*80
+puts '-'*80,
+     "Elasticsearch #{ANSI.ansi($es_version, :bold)} [#{es_version_info['build_hash'].to_s[0...7]}]".center(80),
+     '-'*80
 
 require 'test_helper'
 require 'test/unit'
@@ -177,7 +180,21 @@ module Elasticsearch
         skip = actions.select { |a| a['skip'] }.first
         if skip
           min, max = skip['skip']['version'].split('-').map(&:strip)
-          if min <= $es_version && max >= $es_version
+
+          min_normalized = sprintf "%03d-%03d-%03d",
+                           *min.split('.')
+                               .map(&:to_i)
+                               .fill(0, min.split('.').length, 3-min.split('.').length)
+
+          max_normalized = sprintf "%03d-%03d-%03d",
+                           *max.split('.')
+                               .map(&:to_i)
+                               .map(&:to_i)
+                               .fill(0, max.split('.').length, 3-max.split('.').length)
+
+          es_normalized  = sprintf "%03d-%03d-%03d", *$es_version.split('.').map(&:to_i)
+
+          if min_normalized <= es_normalized && max_normalized >= es_normalized
             return skip['skip']['reason'] ? skip['skip']['reason'] : true
           end
         end
@@ -193,7 +210,8 @@ end
 
 include Elasticsearch::YamlTestSuite
 
-PATH    = Pathname(ENV['SPEC'] || File.expand_path('../../../spec/test', __FILE__))
+PATH    = Pathname(ENV['TEST_REST_API_SPEC'] || \
+          File.expand_path('../../../../support/elasticsearch/rest-api-spec/test', __FILE__))
 suites  = Dir.glob(PATH.join('*')).map { |d| Pathname(d) }
 suites  = suites.select { |s| s.to_s =~ Regexp.new(ENV['FILTER']) } if ENV['FILTER']
 

data/test/unit/utils_test.rb

@@ -124,6 +124,16 @@ module Elasticsearch
             PAYLOAD
           end
 
+          should "not modify the original payload" do
+            original = [ { :index => {:foo => 'bar', :data => { :moo => 'bam' }} } ]
+            result = Elasticsearch::API::Utils.__bulkify original
+            assert_not_nil original.first[:index][:data], "Deleted :data from #{original}"
+            assert_equal <<-PAYLOAD.gsub(/^\s+/, ''), result
+              {"index":{"foo":"bar"}}
+              {"moo":"bam"}
+            PAYLOAD
+          end
+
         end
 
         context "__validate_and_extract_params" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-api
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-09 00:00:00.000000000 Z
+date: 2014-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json