elasticsearch-api 1.0.17 → 1.0.18

data/lib/elasticsearch/api/namespace/ingest.rb

@@ -0,0 +1,20 @@
+module Elasticsearch
+  module API
+    module Ingest
+      module Actions; end
+
+      # Client for the "ingest" namespace (includes the {Ingest::Actions} methods)
+      #
+      class IngestClient
+        include Common::Client, Common::Client::Base, Ingest::Actions
+      end
+
+      # Proxy method for {IngestClient}, available in the receiving object
+      #
+      def ingest
+        @ingest ||= IngestClient.new(self)
+      end
+
+    end
+  end
+end

data/lib/elasticsearch/api/utils.rb

@@ -203,6 +203,61 @@ module Elasticsearch
         end
       end
 
+      def __report_unsupported_parameters(arguments, params=[])
+        messages = []
+        unsupported_params = params.select {|d| d.is_a?(Hash) ? arguments.include?(d.keys.first) : arguments.include?(d) }
+
+        unsupported_params.each do |param|
+          name = case param
+          when Symbol
+            param
+          when Hash
+            param.keys.first
+          else
+            raise ArgumentError, "The param must be a Symbol or a Hash"
+          end
+
+          explanation = if param.is_a?(Hash)
+            ". #{param.values.first[:explanation]}."
+          else
+            ". This parameter is not supported in the version you're using: #{Elasticsearch::API::VERSION}, and will be removed in the next release."
+          end
+
+          message = "[!] You are using unsupported parameter [:#{name}]"
+
+          if source = caller && caller.last
+            message += " in `#{source}`"
+          end
+
+          message += explanation
+
+          messages << message
+        end
+
+        unless messages.empty?
+          if terminal = STDERR.tty?
+            STDERR.puts messages.map { |m| "\e[31;1m#{m}\e[0m" }.join("\n")
+          else
+            STDERR.puts messages.join("\n")
+          end
+        end
+      end
+
+      def __report_unsupported_method(name)
+        message = "[!] You are using unsupported method [#{name}]"
+        if source = caller && caller.last
+          message += " in `#{source}`"
+        end
+
+        message += ". This method is not supported in the version you're using: #{Elasticsearch::API::VERSION}, and will be removed in the next release."
+
+        if terminal = STDERR.tty?
+            STDERR.puts "\e[31;1m#{message}\e[0m"
+          else
+            STDERR.puts message
+          end
+      end
+
       extend self
     end
   end

data/lib/elasticsearch/api/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module API
-    VERSION = "1.0.17"
+    VERSION = "1.0.18"
   end
 end

data/test/integration/yaml_test_runner.rb

@@ -289,8 +289,8 @@ suites.each do |suite|
     # --- Register context setup -------------------------------------------
     #
     setup do
-      $client.indices.delete index: '_all'
-      $client.indices.delete_template name: '*'
+      $client.indices.delete index: '_all', ignore: 404
+      $client.indices.delete_template name: '*', ignore: 404
       $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
@@ -313,7 +313,7 @@ suites.each do |suite|
     # --- Register context teardown ----------------------------------------
     #
     teardown do
-      $client.indices.delete index: '_all'
+      $client.indices.delete index: '_all', ignore: 404
     end
 
     files = Dir[suite.join('*.{yml,yaml}')]

data/test/unit/cat/plugins_test.rb

@@ -10,7 +10,7 @@ module Elasticsearch
         should "perform correct request" do
           subject.expects(:perform_request).with do |method, url, params, body|
             assert_equal 'GET', method
-            assert_equal '/_cat/plugins', url
+            assert_equal '_cat/plugins', url
             assert_equal Hash.new, params
             assert_nil   body
             true

data/test/unit/cat/tasks_test.rb

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

data/test/unit/cluster/allocation_explain_test.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    class ClusterAllocationExplainTest < ::Test::Unit::TestCase
+
+      context "Cluster: Allocation explain" 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 '_cluster/allocation/explain', url
+            assert_equal Hash.new, params
+            assert_equal nil, body
+            true
+          end.returns(FakeResponse.new)
+
+          subject.cluster.allocation_explain
+        end
+
+      end
+
+    end
+  end
+end

data/test/unit/cluster/health_test.rb

@@ -31,6 +31,15 @@ module Elasticsearch
           subject.cluster.health :level => 'indices'
         end
 
+        should "return health for a specific index" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal '_cluster/health/foo', url
+            true
+          end.returns(FakeResponse.new)
+
+          subject.cluster.health :index => 'foo'
+        end
+
       end
 
     end

data/test/unit/cluster/pending_tasks_test.rb

@@ -10,7 +10,7 @@ module Elasticsearch
         should "perform correct request" do
           subject.expects(:perform_request).with do |method, url, params, body|
             assert_equal 'GET', method
-            assert_equal '/_cluster/pending_tasks', url
+            assert_equal '_cluster/pending_tasks', url
             assert_equal Hash.new, params
             assert_nil   body
             true

data/test/unit/cluster/stats_test.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    class ClusterStatsTest < ::Test::Unit::TestCase
+
+      context "Cluster: Stats" 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 '_cluster/stats', url
+            assert_equal Hash.new, params
+            assert_nil   body
+            true
+          end.returns(FakeResponse.new)
+
+          subject.cluster.stats
+        end
+
+      end
+
+    end
+  end
+end

data/test/unit/ingest/delete_pipeline_test.rb

@@ -0,0 +1,41 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    class IngestDeletePipelineTest < ::Test::Unit::TestCase
+
+      context "Ingest: Delete pipeline" do
+        subject { FakeClient.new }
+
+        should "require the :id argument" do
+          assert_raise ArgumentError do
+            subject.ingest.delete_pipeline
+          end
+        end
+
+        should "perform correct request" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'DELETE', method
+            assert_equal '_ingest/pipeline/foo', url
+            assert_equal Hash.new, params
+            assert_nil   body
+            true
+          end.returns(FakeResponse.new)
+
+          subject.ingest.delete_pipeline :id => 'foo'
+        end
+
+        should "URL-escape the ID" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal '_ingest/pipeline/foo%5Ebar', url
+            true
+          end.returns(FakeResponse.new)
+
+          subject.ingest.delete_pipeline :id => 'foo^bar'
+        end
+
+      end
+
+    end
+  end
+end

data/test/unit/ingest/get_pipeline_test.rb

@@ -0,0 +1,41 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    class IngestGetPipelineTest < ::Test::Unit::TestCase
+
+      context "Ingest: Get pipeline" do
+        subject { FakeClient.new }
+
+        should "require the :id argument" do
+          assert_raise ArgumentError do
+            subject.ingest.get_pipeline
+          end
+        end
+
+        should "perform correct request" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'GET', method
+            assert_equal '_ingest/pipeline/foo', url
+            assert_equal Hash.new, params
+            assert_nil   body
+            true
+          end.returns(FakeResponse.new)
+
+          subject.ingest.get_pipeline :id => 'foo'
+        end
+
+        should "URL-escape the ID" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal '_ingest/pipeline/foo%5Ebar', url
+            true
+          end.returns(FakeResponse.new)
+
+          subject.ingest.get_pipeline :id => 'foo^bar'
+        end
+
+      end
+
+    end
+  end
+end

data/test/unit/ingest/put_pipeline_test.rb

@@ -0,0 +1,46 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    class IngestPutPipelineTest < ::Test::Unit::TestCase
+
+      context "Ingest: Put pipeline" do
+        subject { FakeClient.new }
+
+        should "require the :id argument" do
+          assert_raise ArgumentError do
+            subject.ingest.put_pipeline :body => {}
+          end
+        end
+
+        should "require the :body argument" do
+          assert_raise ArgumentError do
+            subject.ingest.put_pipeline :id => 'foo'
+          end
+        end
+
+        should "perform correct request" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'PUT', method
+            assert_equal '_ingest/pipeline/foo', url
+            assert_equal Hash.new, params
+            assert_equal Hash.new, body
+            true
+          end.returns(FakeResponse.new)
+
+          subject.ingest.put_pipeline :id => 'foo', :body => {}
+        end
+
+        should "URL-escape the ID" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal '_ingest/pipeline/foo%5Ebar', url
+            true
+          end.returns(FakeResponse.new)
+
+          subject.ingest.put_pipeline :id => 'foo^bar', :body => {}
+        end
+      end
+
+    end
+  end
+end

data/test/unit/ingest/simulate_test.rb

@@ -0,0 +1,35 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    class IngestSimulateTest < ::Test::Unit::TestCase
+
+      context "Ingest: Simulate" 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 '_ingest/pipeline/_simulate', url
+            assert_equal Hash.new, params
+            assert_equal Hash.new, body
+            true
+          end.returns(FakeResponse.new)
+
+          subject.ingest.simulate :body => {}
+        end
+
+        should "perform correct request with a pipeline ID" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal '_ingest/pipeline/foo/_simulate', url
+            true
+          end.returns(FakeResponse.new)
+
+          subject.ingest.simulate :id => 'foo', :body => {}
+        end
+
+      end
+
+    end
+  end
+end

data/test/unit/ping_test.rb

@@ -4,7 +4,7 @@ module Elasticsearch
   module Test
     class PingTest < ::Test::Unit::TestCase
 
-      context "Indices: Exists" do
+      context "Ping" do
         subject { FakeClient.new }
 
          should "perform correct request" do
@@ -34,6 +34,11 @@ module Elasticsearch
           assert_equal false, subject.ping
         end
 
+        should "return false on 'connection failed' exceptions" do
+          subject.expects(:perform_request).raises(StandardError.new 'ConnectionFailed')
+          assert_equal false, subject.ping
+        end
+
         should "re-raise generic exceptions" do
           subject.expects(:perform_request).raises(StandardError)
           assert_raise(StandardError) do

data/test/unit/reindex_test.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    class ReindexTest < ::Test::Unit::TestCase
+
+      context "Reindex" 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 '_reindex', url
+            assert_equal Hash.new, params
+            assert_equal Hash.new, body
+            true
+          end.returns(FakeResponse.new)
+
+          subject.reindex :body => {}
+        end
+
+      end
+
+    end
+  end
+end