elasticsearch-api 2.0.2 → 5.0.0.pre

data/lib/elasticsearch/api/actions/ingest/simulate.rb

@@ -13,13 +13,10 @@ module Elasticsearch
         # @see https://www.elastic.co/guide/en/elasticsearch/reference/master/simulate-pipeline-api.html
         #
         def simulate(arguments={})
-          Utils.__report_unsupported_method(__method__)
-
           raise ArgumentError, "Required argument 'body' missing" unless arguments[:body]
-
-          valid_params = [ :verbose ]
-
-          method = HTTP_GET
+          valid_params = [
+            :verbose ]
+          method = 'GET'
           path   = Utils.__pathify "_ingest/pipeline", Utils.__escape(arguments[:id]), '_simulate'
           params = Utils.__validate_and_extract_params arguments, valid_params
           body   = arguments[:body]

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

@@ -40,6 +40,7 @@ module Elasticsearch
       #                                     or a list of fields to return
       # @option arguments [String] :_source_exclude A list of fields to exclude from the returned _source field
       # @option arguments [String] :_source_include A list of fields to extract and return from the _source field
+      # @option arguments [List] :stored_fields A comma-separated list of stored fields to return in the response
       #
       # @see http://elasticsearch.org/guide/reference/api/multi-get/
       #
@@ -55,7 +56,8 @@ module Elasticsearch
           :routing,
           :_source,
           :_source_include,
-          :_source_exclude ]
+          :_source_exclude,
+          :stored_fields ]
 
         method = HTTP_GET
         path   = Utils.__pathify Utils.__escape(arguments[:index]),

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

@@ -35,6 +35,7 @@ module Elasticsearch
         # @option arguments [Boolean] :settings Return information about node settings
         # @option arguments [Boolean] :thread_pool Return information about the thread pool
         # @option arguments [Boolean] :transport Return information about transport
+        # @option arguments [Boolean] :flat_settings Return settings in flat format (default: false)
         # @option arguments [Time] :timeout Explicit operation timeout
         #
         # @see http://elasticsearch.org/guide/reference/api/admin-cluster-nodes-info/
@@ -56,7 +57,7 @@ module Elasticsearch
             :transport,
             :timeout ]
 
-          valid_params = [ :timeout ]
+          valid_params = [ :flat_settings, :timeout ]
 
           method = HTTP_GET
 

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

@@ -2,7 +2,7 @@ module Elasticsearch
   module API
     module Actions
 
-      # Returns true if the cluster returns a successful HTTP response, false otherwise.
+      # Returns true if the cluster returns a sucessfull HTTP response, false otherwise.
       #
       # @example
       #

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

@@ -7,8 +7,7 @@ module Elasticsearch
       # When using `from` and `size` to return a large result sets, performance drops as you "paginate" in the set,
       # and you can't guarantee the consistency when the index is being updated at the same time.
       #
-      # The "Scroll" API uses a "point in time" snapshot of the index state, which was created via a "Search" API
-      # request specifying the `scroll` parameter.
+      # "Scrolling" the results is frequently used with the `scan` search type.
       #
       # @example A basic example
       #
@@ -25,13 +24,8 @@ module Elasticsearch
       #     1_000.times do |i| client.index index: 'test', type: 'test', id: i+1, body: {title: "Test #{i}"} end
       #     client.indices.refresh index: 'test'
       #
-      #     # Open the "view" of the index by passing the `scroll` parameter
-      #     # Sorting by `_doc` makes the operations faster
-      #     r = client.search index: 'test', scroll: '1m', body: {sort: ['_doc']}
-      #
-      #     # Display the initial results
-      #     puts "--- BATCH 0 -------------------------------------------------"
-      #     puts r['hits']['hits'].map { |d| d['_source']['title'] }.inspect
+      #     # Open the "view" of the index with the `scan` search_type
+      #     r = client.search index: 'test', search_type: 'scan', scroll: '5m', size: 10
       #
       #     # Call the `scroll` API until empty results are returned
       #     while r = client.scroll(scroll_id: r['_scroll_id'], scroll: '5m') and not r['hits']['hits'].empty? do

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

@@ -78,6 +78,9 @@ module Elasticsearch
       # @option arguments [List] :fields A comma-separated list of fields to return as part of a hit
       # @option arguments [List] :fielddata_fields A comma-separated list of fields to return as the field data
       #                                            representation of a field for each hit
+      # @option arguments [List] :docvalue_fields A comma-separated list of fields to return as the docvalue
+      #                                           representation of a field for each hit
+      # @option arguments [List] :stored_fields A comma-separated list of stored fields to return as part of a hit
       # @option arguments [Number] :from Starting offset (default: 0)
       # @option arguments [String] :ignore_indices When performed on multiple indices, allows to ignore `missing` ones
       #                                            (options: none, missing)
@@ -102,6 +105,7 @@ module Elasticsearch
       #                                     or a list of fields to return
       # @option arguments [String] :_source_exclude A list of fields to exclude from the returned _source field
       # @option arguments [String] :_source_include A list of fields to extract and return from the _source field
+      # @option arguments [List] :stored_fields A comma-separated list of stored fields to return in the response
       # @option arguments [List] :stats Specific 'tag' of the request for logging and statistical purposes
       # @option arguments [String] :suggest_field Specify which field to use for suggestions
       # @option arguments [String] :suggest_mode Specify suggest mode (options: missing, popular, always)
@@ -126,6 +130,8 @@ module Elasticsearch
           :df,
           :explain,
           :fielddata_fields,
+          :docvalue_fields,
+          :stored_fields,
           :fields,
           :from,
           :ignore_indices,
@@ -147,6 +153,7 @@ module Elasticsearch
           :_source,
           :_source_include,
           :_source_exclude,
+          :stored_fields,
           :stats,
           :suggest_field,
           :suggest_mode,

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

@@ -33,8 +33,6 @@ module Elasticsearch
       # @see http://www.elastic.co/guide/en/elasticsearch/reference/master/search-exists.html
       #
       def search_exists(arguments={})
-        arguments[:index] = UNDERSCORE_ALL if ! arguments[:index] && arguments[:type]
-
         valid_params = [
           :ignore_unavailable,
           :allow_no_indices,
@@ -50,7 +48,7 @@ module Elasticsearch
           :lenient,
           :lowercase_expanded_terms ]
         method = 'POST'
-        path   = Utils.__pathify( Utils.__listify(arguments[:index]), Utils.__listify(arguments[:type]), "_search/exists" )
+        path   = "_search/exists"
         params = Utils.__validate_and_extract_params arguments, valid_params
         body   = arguments[:body]
 

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

@@ -19,6 +19,7 @@ module Elasticsearch
         #
         # @option arguments [String] :repository A repository name (*Required*)
         # @option arguments [List] :snapshot A comma-separated list of snapshot names (*Required*)
+        # @option arguments [Boolean] :ignore_unavailable Whether to ignore unavailable snapshots, defaults to #                                                 false which means a SnapshotMissingException is thrown
         # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
         # @option arguments [Number,List] :ignore The list of HTTP errors to ignore
         #
@@ -29,6 +30,7 @@ module Elasticsearch
           raise ArgumentError, "Required argument 'snapshot' missing"   unless arguments[:snapshot]
 
           valid_params = [
+            :ignore_unavailable,
             :master_timeout ]
 
           repository = arguments.delete(:repository)

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

@@ -15,6 +15,7 @@ module Elasticsearch
         #
         # @option arguments [String] :repository A repository name
         # @option arguments [List] :snapshot A comma-separated list of snapshot names
+        # @option arguments [Boolean] :ignore_unavailable Whether to ignore unavailable snapshots, defaults to #                                                 false which means a SnapshotMissingException is thrown
         # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
         # @option arguments [Number,List] :ignore The list of HTTP errors to ignore
         #
@@ -22,6 +23,7 @@ module Elasticsearch
         #
         def status(arguments={})
           valid_params = [
+            :ignore_unavailable,
             :master_timeout ]
 
           repository = arguments.delete(:repository)

data/lib/elasticsearch/api/actions/tasks/list.rb

@@ -31,9 +31,6 @@ module Elasticsearch
             :group_by,
             :wait_for_completion ]
 
-          unsupported_params = [ :group_by ]
-          Utils.__report_unsupported_parameters(arguments.keys, unsupported_params)
-
           task_id = arguments.delete(:task_id)
 
           method = 'GET'

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

@@ -51,6 +51,10 @@ module Elasticsearch
       #                                               when a conflict occurs (default: 0)
       # @option arguments [String] :routing Specific routing value
       # @option arguments [String] :script The URL-encoded script definition (instead of using request body)
+      # @option arguments [String] :_source Specify whether the _source field should be returned,
+      #                                     or a list of fields to return
+      # @option arguments [String] :_source_exclude A list of fields to exclude from the returned _source field
+      # @option arguments [String] :_source_include A list of fields to extract and return from the _source field
       # @option arguments [Time] :timeout Explicit operation timeout
       # @option arguments [Time] :timestamp Explicit timestamp for the document
       # @option arguments [Duration] :ttl Expiration time for the document
@@ -77,6 +81,9 @@ module Elasticsearch
           :retry_on_conflict,
           :routing,
           :script,
+          :_source,
+          :_source_include,
+          :_source_exclude,
           :timeout,
           :timestamp,
           :ttl,

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

@@ -111,9 +111,6 @@ module Elasticsearch
           :wait_for_completion,
           :requests_per_second ]
 
-        unsupported_params = [ :pipeline ]
-        Utils.__report_unsupported_parameters(arguments, unsupported_params)
-
         method = HTTP_POST
 
         path   = Utils.__pathify Utils.__listify(arguments[:index]),

data/lib/elasticsearch/api/utils.rb

@@ -235,7 +235,7 @@ module Elasticsearch
         end
 
         unless messages.empty?
-          if STDERR.tty?
+          if terminal = STDERR.tty?
             STDERR.puts messages.map { |m| "\e[31;1m#{m}\e[0m" }.join("\n")
           else
             STDERR.puts messages.join("\n")
@@ -251,11 +251,11 @@ module Elasticsearch
 
         message += ". This method is not supported in the version you're using: #{Elasticsearch::API::VERSION}, and will be removed in the next release."
 
-        if STDERR.tty?
-          STDERR.puts "\e[31;1m#{message}\e[0m"
-        else
-          STDERR.puts message
-        end
+        if terminal = STDERR.tty?
+            STDERR.puts "\e[31;1m#{message}\e[0m"
+          else
+            STDERR.puts message
+          end
       end
 
       extend self

data/lib/elasticsearch/api/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module API
-    VERSION = "2.0.2"
+    VERSION = "5.0.0.pre"
   end
 end

data/test/integration/yaml_test_runner.rb

@@ -14,7 +14,7 @@ require 'elasticsearch/extensions/test/startup_shutdown'
 require 'elasticsearch/extensions/test/profiling' unless JRUBY
 
 # Skip features
-skip_features = 'stash_in_path,requires_replica,headers'
+skip_features = 'stash_in_path,requires_replica,headers,warnings'
 SKIP_FEATURES = ENV.fetch('TEST_SKIP_FEATURES', skip_features)
 
 # Turn configuration
@@ -24,8 +24,7 @@ Turn.config.format = :pretty
 # Launch test cluster
 #
 if ENV['SERVER'] and not Elasticsearch::Extensions::Test::Cluster.running?
-  es_params = "-D es.repositories.url.allowed_urls=http://snapshot.test* -D es.path.repo=/tmp -D es.node.testattr=test " + ENV['TEST_CLUSTER_PARAMS'].to_s
-  Elasticsearch::Extensions::Test::Cluster.start(nodes: 1, es_params: es_params )
+  Elasticsearch::Extensions::Test::Cluster.start
 end
 
 # Register `at_exit` handler for server shutdown.
@@ -300,12 +299,20 @@ suites.each do |suite|
       $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_repo_status_1', 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')
+      %w[
+        test_cat_repo_1_loc
+        test_cat_repo_2_loc
+        test_cat_snapshots_1_loc
+        test_repo_get_1_loc
+        test_repo_status_1_loc
+      ].each do |d|
+        FileUtils.rm_rf("/tmp/#{d}")
+      end
       # ---------------------------------------------
       $results = {}
       $stash   = {}
@@ -348,7 +355,8 @@ suites.each do |suite|
 
           # --- Register test setup -------------------------------------------
           setup do
-            actions.select { |a| a['setup'] }.first['setup'].each do |action|
+            setup_actions = actions.select { |a| a['setup'] }
+            setup_actions.first['setup'].each do |action|
               if action['do']
                 api, arguments = action['do'].to_a.first
                 arguments      = Utils.symbolize_keys(arguments)
@@ -361,7 +369,25 @@ suites.each do |suite|
                 $stderr.puts "STASH: '$#{variable}' => #{result.inspect}" if ENV['DEBUG']
                 Runner.set variable, result
               end
-            end
+            end unless setup_actions.empty?
+          end
+
+          teardown do
+            teardown_actions = actions.select { |a| a['teardown'] }
+            teardown_actions.first['teardown'].each do |action|
+              if action['do']
+                api, arguments = action['do'].to_a.first
+                arguments      = Utils.symbolize_keys(arguments)
+                Runner.perform_api_call((test.to_s + '___teardown'), api, arguments)
+              end
+              if action['set']
+                stash = action['set']
+                property, variable = stash.to_a.first
+                result  = Runner.evaluate(test, property, $last_response)
+                $stderr.puts "STASH: '$#{variable}' => #{result.inspect}" if ENV['DEBUG']
+                Runner.set variable, result
+              end
+            end unless teardown_actions.empty?
           end
 
           # --- Register test method ------------------------------------------
@@ -459,16 +485,23 @@ suites.each do |suite|
                   $stderr.puts "CHECK: Expected '#{property}' to be #{value}, is: #{length.inspect}" if ENV['DEBUG']
                   assert_equal(value, length)
 
-                when a = action['lt'] || action['gt']
-                  next
+                when a = action['lt'] || action['gt'] || action['lte'] || action['gte']
                   property, value = a.to_a.first
-                  operator        = action['lt'] ? '<' : '>'
+                  operator = case
+                    when action['lt']
+                      '<'
+                    when action['gt']
+                      '>'
+                    when action['lte']
+                      '<='
+                    when action['gte']
+                      '>='
+                  end
 
                   result  = Runner.evaluate(test, property)
                   message = "Expected '#{property}' to be #{operator} #{value}, is: #{result.inspect}"
 
                   $stderr.puts "CHECK: #{message}" if ENV['DEBUG']
-                  # operator == 'less than' ? assert(value.to_f < result.to_f, message) : assert(value.to_f > result.to_f, message)
                   assert_operator result, operator.to_sym, value.to_i
 
                 when stash = action['set']

data/test/unit/cat/templates_test.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    class CatTemplatesTest < ::Test::Unit::TestCase
+
+      context "Cat: Templates" 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/templates', url
+            assert_equal Hash.new, params
+            assert_nil   body
+            true
+          end.returns(FakeResponse.new)
+
+          subject.cat.templates
+        end
+
+      end
+
+    end
+  end
+end

data/test/unit/indices/rollover_test.rb

@@ -0,0 +1,38 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    class IndicesRolloverTest < ::Test::Unit::TestCase
+
+      context "Indices: Rollover" 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 'foo/_rollover', url
+            assert_equal Hash.new, params
+            assert_equal nil, body
+            true
+          end.returns(FakeResponse.new)
+
+          subject.indices.rollover :alias => 'foo'
+        end
+
+        should "customize the index" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'POST', method
+            assert_equal 'foo/_rollover/bar', url
+            assert_equal Hash.new, params
+            assert_equal nil, body
+            true
+          end.returns(FakeResponse.new)
+
+          subject.indices.rollover :alias => 'foo', :new_index => 'bar'
+        end
+
+      end
+
+    end
+  end
+end

data/test/unit/indices/shrink_test.rb

@@ -0,0 +1,33 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    class IndicesShrinkTest < ::Test::Unit::TestCase
+
+      context "Indices: Shrink" do
+        subject { FakeClient.new }
+
+        should "perform correct request" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'PUT', method
+            assert_equal 'foo/_shrink/bar', url
+            assert_equal nil, body
+            true
+          end.returns(FakeResponse.new)
+
+          subject.indices.shrink :index => 'foo', :target => 'bar'
+        end
+
+        should "not change the arguments" do
+          arguments = { :index => 'foo', :target => 'bar', :body => { :settings => {} } }
+          subject.indices.shrink arguments
+
+          assert_not_nil arguments[:index]
+          assert_not_nil arguments[:target]
+        end
+
+      end
+
+    end
+  end
+end