elasticsearch-api 1.0.15 → 1.0.16.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68336ac9575020a4a102cbde2a0157d6f47c6b67
-  data.tar.gz: 50c1630f17dec457ff7068c78d48acfd8884ab2e
+  metadata.gz: 081fe135d7cd87037475fd790752c46d26b170ed
+  data.tar.gz: 3d8753842bdfff64dffcccd95e431988b0cf943a
 SHA512:
-  metadata.gz: 24d082a7abe1d6a40f9051d4d849d57e4e0efaec7e891a38e237ccc0f6b35ce9c3b606490d14636fdcf483e18bcfe097a75a5bcb1b5e6b96efe79ae809bd7e4a
-  data.tar.gz: 5129cac0908e6f23afe58723a2a6ea6e4cc4d087a5525060b6e6cb028f5d41706336e4d96fec1142684f4fa8f25894864681718b59ca26223fc0c6ce9b787069
+  metadata.gz: 90ae2bede4146274cf1bcbae9477999e7144982d595ec67e64bf1839337ebfa93083ed9afac814cf2f0746de40eab462a973a0bebb7d55e4919d78795eeed9bb
+  data.tar.gz: 22646e3f5530a92e0e25d380bfcef7ccd6db6e8b06dd1048a83fb1eaf3912a0581de5607701511f156422003dad597fc28ede8b90c6324440201bac9fc675be8

data/Gemfile

@@ -3,14 +3,14 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in elasticsearch-api.gemspec
 gemspec
 
-if File.exists? File.expand_path("../../elasticsearch/elasticsearch.gemspec", __FILE__)
+if File.exist? File.expand_path("../../elasticsearch/elasticsearch.gemspec", __FILE__)
   gem 'elasticsearch', :path => File.expand_path("../../elasticsearch", __FILE__), :require => false
 end
 
-if File.exists? File.expand_path("../../elasticsearch-transport", __FILE__)
+if File.exist? File.expand_path("../../elasticsearch-transport", __FILE__)
   gem 'elasticsearch-transport', :path => File.expand_path("../../elasticsearch-transport", __FILE__), :require => true
 end
 
-if File.exists? File.expand_path("../../elasticsearch-extensions", __FILE__)
+if File.exist? File.expand_path("../../elasticsearch-extensions", __FILE__)
   gem 'elasticsearch-extensions', :path => File.expand_path("../../elasticsearch-extensions", __FILE__), :require => false
 end

data/README.md

@@ -14,9 +14,9 @@ library.
 
 The library is compatible with Ruby 1.8.7 or higher.
 
-The library is compatible with Elasticsearch 0.90 and 1.0 -- you have to install and use a matching version, though.
+The library is compatible with Elasticsearch 0.90, 1.x and 2.x -- you have to install and use a matching version, though.
 
-The 1.x versions and the master branch are compatible with **Elasticsearch 1.x** API.
+The 1.x versions and the master branch are compatible with Elasticsearch 1.x and 2.x APIs.
 
 To use the **Elasticsearch 0.90** API, install the **0.4.x** gem version or use the corresponding
 [`0.4`](https://github.com/elasticsearch/elasticsearch-ruby/tree/0.4) branch.
@@ -155,6 +155,18 @@ mash.aggregations.tags.terms.first
 # => #<Hashie::Mash count=3 term="z">
 ```
 
+### Using a Custom JSON Serializer
+
+The library uses the [MultiJson](https://rubygems.org/gems/multi_json/) gem by default,
+but allows you to set a custom JSON library, provided it uses the standard `load/dump`
+interface:
+
+```ruby
+Elasticsearch::API.settings[:serializer] = JrJackson::Json
+Elasticsearch::API.serializer.dump({foo: 'bar'})
+# => {"foo":"bar"}
+```
+
 ## Development
 
 To work on the code, clone and bootstrap the main repository first --

data/Rakefile

@@ -71,7 +71,7 @@ namespace :test do
       es_version_info = client.info['version']
       build_hash      = es_version_info['build_hash']
       cluster_running = true
-    rescue Faraday::Error::ConnectionFailed => e
+    rescue Faraday::Error::ConnectionFailed
       STDERR.puts "[!] Test cluster not running?"
       cluster_running = false
     end

data/elasticsearch-api.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency "multi_json"
 
   s.add_development_dependency "bundler", "> 1"
-  s.add_development_dependency "rake"
+  s.add_development_dependency "rake", "< 11.0"
 
   s.add_development_dependency "elasticsearch"
   s.add_development_dependency "elasticsearch-transport"

data/lib/elasticsearch/api.rb

@@ -10,6 +10,8 @@ Dir[ File.expand_path('../api/namespace/**/*.rb', __FILE__) ].each { |f| require
 
 module Elasticsearch
   module API
+    DEFAULT_SERIALIZER = MultiJson
+
     COMMON_PARAMS = [
       :ignore,                        # Client specific parameters
       :index, :type, :id,             # :index/:type/:id
@@ -47,15 +49,16 @@ module Elasticsearch
                 Elasticsearch::API::Cat
     end
 
-    module ClassMethods
-
-      # Access the module settings
-      #
-      def settings
-        @settings ||= {}
-      end
+    # The serializer class
+    #
+    def self.serializer
+      settings[:serializer] || DEFAULT_SERIALIZER
     end
 
-    extend ClassMethods
+    # Access the module settings
+    #
+    def self.settings
+      @settings ||= {}
+    end
   end
 end

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

@@ -4,8 +4,9 @@ module Elasticsearch
 
       # Perform multiple index, delete or update operations in a single request.
       #
-      # 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.
+      # Supports various different formats of the payload: Array of Strings, Header/Data pairs,
+      # or the conveniency "combined" format where data is passed along with the header
+      # in a single item in a custom `:data` key.
       #
       # @example Perform three operations in a single request, passing actions and data as an array of hashes
       #

data/lib/elasticsearch/api/actions/cat/repositories.rb

@@ -0,0 +1,40 @@
+module Elasticsearch
+  module API
+    module Cat
+      module Actions
+
+        # Shows all repositories registered in a cluster
+        #
+        # @example Return list of repositories
+        #
+        #     client.cat.repositories
+        #
+        # @example Return only id for each repository
+        #
+        #     client.cat.repositories h: 'id'
+        #
+        # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+        # @option arguments [List] :h Comma-separated list of column names to display
+        # @option arguments [Boolean] :help Return help information
+        # @option arguments [Boolean] :v Verbose mode. Display column headers
+        #
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/cat-repositories.html
+        #
+        def repositories(arguments={})
+          valid_params = [
+            :master_timeout,
+            :h,
+            :help,
+            :v ]
+
+          method = HTTP_GET
+          path   = "_cat/repositories"
+          params = Utils.__validate_and_extract_params arguments, valid_params
+          body   = nil
+
+          perform_request(method, path, params, body).body
+        end
+      end
+    end
+  end
+end

data/lib/elasticsearch/api/actions/cat/snapshots.rb

@@ -0,0 +1,45 @@
+module Elasticsearch
+  module API
+    module Cat
+      module Actions
+
+        # Shows all snapshots that belong to a specific repository
+        #
+        # @example Return snapshots for 'my_repository'
+        #
+        #     client.cat.snapshots repository: 'my_repository'
+        #
+        # @example Return id, status and start_epoch for 'my_repository'
+        #
+        #     client.cat.snapshots repository: 'my_repository', h: 'id,status,start_epoch'
+        #
+        # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+        # @option arguments [List] :h Comma-separated list of column names to display
+        # @option arguments [Boolean] :help Return help information
+        # @option arguments [Boolean] :v Verbose mode. Display column headers
+        #
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/cat-snapshots.html
+        #
+        def snapshots(arguments={})
+          raise ArgumentError, "Required argument 'repository' missing" unless arguments[:repository]
+
+          valid_params = [
+            :master_timeout,
+            :h,
+            :help,
+            :v ]
+
+          repository = arguments.delete(:repository)
+
+          method = HTTP_GET
+          path   = Utils.__pathify "_cat/snapshots", Utils.__escape(repository)
+          params = Utils.__validate_and_extract_params arguments, valid_params
+          body   = nil
+
+          perform_request(method, path, params, body).body
+        end
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,62 @@
+module Elasticsearch
+  module API
+    module Indices
+      module Actions
+
+        # Force merge an index, list of indices, or all indices in the cluster.
+        #
+        # @example Fully force merge an index
+        #
+        #     client.indices.forcemerge index: 'foo', max_num_segments: 1
+        #
+        # @example Do not flush index after force-merging
+        #
+        #     client.indices.forcemerge index: 'foo', flush: false
+        #
+        # @example Do not expunge deleted documents after force-merging
+        #
+        #     client.indices.forcemerge index: 'foo', only_expunge_deletes: false
+        #
+        # @example Force merge a list of indices
+        #
+        #     client.indices.forcemerge index: ['foo', 'bar']
+        #     client.indices.forcemerge index: 'foo,bar'
+        #
+        # @example forcemerge a list of indices matching wildcard expression
+        #
+        #     client.indices.forcemerge index: 'foo*'
+        #
+        # @example forcemerge all indices
+        #
+        #     client.indices.forcemerge index: '_all'
+        #
+        # @option arguments [List] :index A comma-separated list of indices to forcemerge;
+        #                                 use `_all` to forcemerge all indices
+        # @option arguments [Number] :max_num_segments The number of segments the index should be merged into
+        #                                              (default: dynamic)
+        # @option arguments [Boolean] :only_expunge_deletes Specify whether the operation should only expunge
+        #                                                   deleted documents
+        # @option arguments [Boolean] :flush Specify whether the index should be flushed after performing the operation
+        #                                    (default: true)
+        #
+        # @see http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-forcemerge.html
+        #
+        def forcemerge(arguments={})
+          valid_params = [
+            :max_num_segments,
+            :only_expunge_deletes,
+            :flush
+          ]
+
+          method = HTTP_POST
+          path   = Utils.__pathify Utils.__listify(arguments[:index]), '_forcemerge'
+
+          params = Utils.__validate_and_extract_params arguments, valid_params
+          body = nil
+
+          perform_request(method, path, params, body).body
+        end
+      end
+    end
+  end
+end

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

@@ -8,6 +8,8 @@ module Elasticsearch
         # The "optimize" operation merges the index segments, increasing search performance.
         # It corresponds to a Lucene "merge" operation.
         #
+        # @deprecated The "optimize" action has been deprecated in favor of forcemerge [https://github.com/elastic/elasticsearch/pull/13778]
+        #
         # @example Fully optimize an index (merge to one segment)
         #
         #     client.indices.optimize index: 'foo', max_num_segments: 1, wait_for_merge: false

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

@@ -34,7 +34,8 @@ module Elasticsearch
         valid_params = [
           :ignore_unavailable,
           :allow_no_indices,
-          :expand_wildcards ]
+          :expand_wildcards,
+          :percolate_format ]
 
         method = HTTP_GET
         path   = "_mpercolate"
@@ -44,7 +45,7 @@ module Elasticsearch
 
         case
         when body.is_a?(Array)
-          payload = body.map { |d| d.is_a?(String) ? d : MultiJson.dump(d) }
+          payload = body.map { |d| d.is_a?(String) ? d : Elasticsearch::API.serializer.dump(d) }
           payload << "" unless payload.empty?
           payload = payload.join("\n")
         else

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

@@ -56,11 +56,11 @@ module Elasticsearch
               sum << data
               sum
             end.
-            map { |item| MultiJson.dump(item) }
+            map { |item| Elasticsearch::API.serializer.dump(item) }
           payload << "" unless payload.empty?
           payload = payload.join("\n")
         when body.is_a?(Array)
-          payload = body.map { |d| d.is_a?(String) ? d : MultiJson.dump(d) }
+          payload = body.map { |d| d.is_a?(String) ? d : Elasticsearch::API.serializer.dump(d) }
           payload << "" unless payload.empty?
           payload = payload.join("\n")
         else

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

@@ -158,8 +158,8 @@ module Elasticsearch
 
         body   = arguments[:body]
 
-        params[:fields] = Utils.__listify(params[:fields]) if params[:fields]
-        params[:fielddata_fields] = Utils.__listify(params[:fielddata_fields]) if params[:fielddata_fields]
+        params[:fields] = Utils.__listify(params[:fields], :escape => false) if params[:fields]
+        params[:fielddata_fields] = Utils.__listify(params[:fielddata_fields], :escape => false) if params[:fielddata_fields]
 
         # FIX: Unescape the `filter_path` parameter due to __listify default behavior. Investigate.
         params[:filter_path] =  defined?(EscapeUtils) ? EscapeUtils.unescape_url(params[:filter_path]) : CGI.unescape(params[:filter_path]) if params[:filter_path]

data/lib/elasticsearch/api/utils.rb

@@ -65,6 +65,10 @@ module Elasticsearch
 
       # Convert an array of payloads into Elasticsearch `header\ndata` format
       #
+      # Supports various different formats of the payload: Array of Strings, Header/Data pairs,
+      # or the conveniency "combined" format where data is passed along with the header
+      # in a single item.
+      #
       #     Elasticsearch::API::Utils.__bulkify [
       #       { :index =>  { :_index => 'myindexA', :_type => 'mytype', :_id => '1', :data => { :title => 'Test' } } },
       #       { :update => { :_index => 'myindexB', :_type => 'mytype', :_id => '2', :data => { :doc => { :title => 'Update' } } } }
@@ -76,22 +80,24 @@ module Elasticsearch
       #     # => {"doc":{"title":"Update"}}
       #
       def __bulkify(payload)
+        operations = %w[index create delete update]
+
         case
+
         # Hashes with `:data`
-        when payload.any? { |d| d.is_a?(Hash) && d.values.first.is_a?(Hash) && (d.values.first[:data] || d.values.first['data']) }
+        when payload.any? { |d| d.is_a?(Hash) && d.values.first.is_a?(Hash) && operations.include?(d.keys.first.to_s) && (d.values.first[:data] || d.values.first['data']) }
           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 }
-            sum << data if data
-            sum
-          end.
-          map { |item| MultiJson.dump(item) }
-          payload << "" unless payload.empty?
-          return payload.join("\n")
+            inject([]) do |sum, item|
+              operation, meta = item.to_a.first
+              meta            = meta.clone
+              data            = meta.delete(:data) || meta.delete('data')
+
+              sum << { operation => meta }
+              sum << data if data
+              sum
+            end.
+            map { |item| Elasticsearch::API.serializer.dump(item) }
+          payload << '' unless payload.empty?
 
         # Array of strings
         when payload.all? { |d| d.is_a? String }
@@ -99,7 +105,7 @@ module Elasticsearch
 
         # Header/Data pairs
         else
-          payload = payload.map { |item| MultiJson.dump(item) }
+          payload = payload.map { |item| Elasticsearch::API.serializer.dump(item) }
           payload << ''
         end
 

data/lib/elasticsearch/api/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module API
-    VERSION = "1.0.15"
+    VERSION = "1.0.16.pre"
   end
 end

data/test/integration/yaml_test_runner.rb

@@ -293,8 +293,15 @@ suites.each do |suite|
       $client.indices.delete_template name: '*'
       $client.snapshot.delete repository: 'test_repo_create_1',  snapshot: 'test_snapshot', ignore: 404
       $client.snapshot.delete repository: 'test_repo_restore_1', snapshot: 'test_snapshot', ignore: 404
+      $client.snapshot.delete repository: 'test_cat_snapshots_1', snapshot: 'snap1', ignore: 404
+      $client.snapshot.delete repository: 'test_cat_snapshots_1', snapshot: 'snap2', ignore: 404
       $client.snapshot.delete_repository repository: 'test_repo_create_1', ignore: 404
       $client.snapshot.delete_repository repository: 'test_repo_restore_1', ignore: 404
+      $client.snapshot.delete_repository repository: 'test_repo_get_1', ignore: 404
+      $client.snapshot.delete_repository repository: 'test_repo_get_2', ignore: 404
+      $client.snapshot.delete_repository repository: 'test_cat_repo_1', ignore: 404
+      $client.snapshot.delete_repository repository: 'test_cat_repo_2', ignore: 404
+      $client.snapshot.delete_repository repository: 'test_cat_snapshots_1', ignore: 404
       # FIXME: This shouldn't be needed -------------
       FileUtils.rm_rf('/tmp/test_repo_create_1_loc')
       FileUtils.rm_rf('/tmp/test_repo_restore_1_loc')

data/test/unit/api_test.rb

@@ -17,6 +17,10 @@ module Elasticsearch
           assert_equal 'bar', Elasticsearch::API.settings[:foo]
         end
 
+        should "have default serializer" do
+          assert_equal MultiJson, Elasticsearch::API.serializer
+        end
+
       end
 
     end

data/test/unit/bulk_test.rb

@@ -16,7 +16,7 @@ module Elasticsearch
             if RUBY_1_8
               lines = body.split("\n")
 
-              assert_equal 5, lines.size
+              assert_equal 7, lines.size
               assert_match /\{"index"\:\{/, lines[0]
               assert_match /\{"title"\:"Test"/, lines[1]
               assert_match /\{"update"\:\{/, lines[2]
@@ -28,6 +28,8 @@ module Elasticsearch
                 {"update":{"_index":"myindexB","_type":"mytype","_id":"2"}}
                 {"doc":{"title":"Update"}}
                 {"delete":{"_index":"myindexC","_type":"mytypeC","_id":"3"}}
+                {"index":{"_index":"myindexD","_type":"mytype","_id":"1"}}
+                {"data":"MYDATA"}
               PAYLOAD
             end
             true
@@ -36,7 +38,8 @@ module Elasticsearch
           subject.bulk :body => [
             { :index =>  { :_index => 'myindexA', :_type => 'mytype', :_id => '1', :data => { :title => 'Test' } } },
             { :update => { :_index => 'myindexB', :_type => 'mytype', :_id => '2', :data => { :doc => { :title => 'Update' } } } },
-            { :delete => { :_index => 'myindexC', :_type => 'mytypeC', :_id => '3' } }
+            { :delete => { :_index => 'myindexC', :_type => 'mytypeC', :_id => '3' } },
+            { :index =>  { :_index => 'myindexD', :_type => 'mytype', :_id => '1', :data => { :data => 'MYDATA' } } },
           ]
         end
 
@@ -50,6 +53,32 @@ module Elasticsearch
           subject.bulk :index => 'myindex', :body => []
         end
 
+        should "handle `:data` keys correctly in header/data payloads" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            lines = body.split("\n")
+            assert_equal 2, lines.size
+
+            header = MultiJson.load(lines.first)
+            data   = MultiJson.load(lines.last)
+
+            assert_equal 'myindex', header['update']['_index']
+            assert_equal 'mytype',  header['update']['_type']
+            assert_equal '1',       header['update']['_id']
+
+            assert_equal({'data' => { 'title' => 'Update' }}, data['doc'])
+            # assert_equal <<-PAYLOAD.gsub(/^\s+/, ''), body
+            #   {"update":{"_index":"myindex","_type":"mytype","_id":"1"}}
+            #   {"doc":{"data":{"title":"Update"}}}
+            # PAYLOAD
+            true
+          end.returns(FakeResponse.new)
+
+          subject.bulk :body => [
+            { :update => { :_index => 'myindex', :_type => 'mytype', :_id => '1' } },
+            { :doc => { :data => { :title => 'Update' } } }
+          ]
+        end
+
         should "post a string payload" do
           subject.expects(:perform_request).with do |method, url, params, body|
             assert_equal "foo\nbar", body

data/test/unit/cat/repositories_test.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    class CatRepositoriesTest < ::Test::Unit::TestCase
+
+      context "Cat: Repositories" do
+        subject { FakeClient.new }
+
+        should "perform correct request" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'GET', method
+            assert_equal '_cat/repositories', url
+            assert_equal Hash.new, params
+            assert_nil   body
+            true
+          end.returns(FakeResponse.new)
+
+          subject.cat.repositories
+        end
+
+      end
+
+    end
+  end
+end

data/test/unit/cat/snapshots_test.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    class CatSnapshotsTest < ::Test::Unit::TestCase
+
+      context "Cat: Snapshots" do
+        subject { FakeClient.new }
+
+        should "perform correct request" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'GET', method
+            assert_equal '_cat/snapshots/foo', url
+            assert_equal Hash.new, params
+            assert_nil   body
+            true
+          end.returns(FakeResponse.new)
+
+          subject.cat.snapshots :repository => 'foo'
+        end
+
+      end
+
+    end
+  end
+end

data/test/unit/indices/forcemerge_test.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    class IndicesForcemergeTest < ::Test::Unit::TestCase
+
+      context "Indices: Forcemerge" do
+        subject { FakeClient.new }
+
+        should "perform correct request" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'POST', method
+            assert_equal '_forcemerge', url
+            assert_equal Hash.new, params
+            assert_nil   body
+            true
+          end.returns(FakeResponse.new)
+
+          subject.indices.forcemerge
+        end
+
+      end
+
+    end
+  end
+end

data/test/unit/search_test.rb

@@ -101,6 +101,14 @@ module Elasticsearch
           subject.search :index => 'foo^bar', :type => 'bar/bam'
         end
 
+        should "not URL-escape the fields parameters" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'foo^bar', params[:fields]
+            true
+          end.returns(FakeResponse.new)
+
+          subject.search :index => 'foo', :type => 'bar', :fields => 'foo^bar'
+        end
       end
 
     end

data/test/unit/utils_test.rb

@@ -132,8 +132,8 @@ module Elasticsearch
             PAYLOAD
           end
 
-          should "not modify the original payload" do
-            original = [ { :index => {:foo => 'bar', :data => { :moo => 'bam' }} } ]
+          should "not modify the original payload with the data option" 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
@@ -142,6 +142,23 @@ module Elasticsearch
             PAYLOAD
           end
 
+          should "not modify the original payload with meta/data pairs" do
+            original = [ { :index => {:foo => 'bar'} }, { :data => {:a => 'b', :data => {:c => 'd'} } } ]
+            result = Elasticsearch::API::Utils.__bulkify original
+
+            assert_not_nil original.last[:data], "Deleted :data from #{original}"
+            assert_not_nil original.last[:data][:data], "Deleted :data from #{original}"
+
+            lines = result.split("\n")
+            assert_equal 2, lines.size
+
+            header = MultiJson.load(lines.first)
+            data   = MultiJson.load(lines.last)
+
+            assert_equal 'bar', header['index']['foo']
+            assert_equal 'b',   data['data']['a']
+            assert_equal 'd',   data['data']['data']['c']
+          end
         end
 
         context "__validate_and_extract_params" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-api
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.16.pre
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -42,16 +42,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
@@ -366,8 +366,10 @@ files:
 - lib/elasticsearch/api/actions/cat/pending_tasks.rb
 - lib/elasticsearch/api/actions/cat/plugins.rb
 - lib/elasticsearch/api/actions/cat/recovery.rb
+- lib/elasticsearch/api/actions/cat/repositories.rb
 - lib/elasticsearch/api/actions/cat/segments.rb
 - lib/elasticsearch/api/actions/cat/shards.rb
+- lib/elasticsearch/api/actions/cat/snapshots.rb
 - lib/elasticsearch/api/actions/cat/thread_pool.rb
 - lib/elasticsearch/api/actions/clear_scroll.rb
 - lib/elasticsearch/api/actions/cluster/get_settings.rb
@@ -406,6 +408,7 @@ files:
 - lib/elasticsearch/api/actions/indices/exists_type.rb
 - lib/elasticsearch/api/actions/indices/flush.rb
 - lib/elasticsearch/api/actions/indices/flush_synced.rb
+- lib/elasticsearch/api/actions/indices/forcemerge.rb
 - lib/elasticsearch/api/actions/indices/get.rb
 - lib/elasticsearch/api/actions/indices/get_alias.rb
 - lib/elasticsearch/api/actions/indices/get_aliases.rb
@@ -492,8 +495,10 @@ files:
 - test/unit/cat/pending_tasks_test.rb
 - test/unit/cat/plugins_test.rb
 - test/unit/cat/recovery_test.rb
+- test/unit/cat/repositories_test.rb
 - test/unit/cat/segments_test.rb
 - test/unit/cat/shards_test.rb
+- test/unit/cat/snapshots_test.rb
 - test/unit/cat/thread_pool_test.rb
 - test/unit/clear_scroll_test.rb
 - test/unit/client_test.rb
@@ -534,6 +539,7 @@ files:
 - test/unit/indices/exists_type_test.rb
 - test/unit/indices/flush_synced_test.rb
 - test/unit/indices/flush_test.rb
+- test/unit/indices/forcemerge_test.rb
 - test/unit/indices/get_alias_test.rb
 - test/unit/indices/get_aliases_test.rb
 - test/unit/indices/get_field_mapping_test.rb
@@ -619,9 +625,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -648,8 +654,10 @@ test_files:
 - test/unit/cat/pending_tasks_test.rb
 - test/unit/cat/plugins_test.rb
 - test/unit/cat/recovery_test.rb
+- test/unit/cat/repositories_test.rb
 - test/unit/cat/segments_test.rb
 - test/unit/cat/shards_test.rb
+- test/unit/cat/snapshots_test.rb
 - test/unit/cat/thread_pool_test.rb
 - test/unit/clear_scroll_test.rb
 - test/unit/client_test.rb
@@ -690,6 +698,7 @@ test_files:
 - test/unit/indices/exists_type_test.rb
 - test/unit/indices/flush_synced_test.rb
 - test/unit/indices/flush_test.rb
+- test/unit/indices/forcemerge_test.rb
 - test/unit/indices/get_alias_test.rb
 - test/unit/indices/get_aliases_test.rb
 - test/unit/indices/get_field_mapping_test.rb