elasticsearch-api 1.0.16.pre → 1.0.16.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 081fe135d7cd87037475fd790752c46d26b170ed
-  data.tar.gz: 3d8753842bdfff64dffcccd95e431988b0cf943a
+  metadata.gz: b1af9abf86e7d7d4c9bbe1ca622b785780866908
+  data.tar.gz: 9e89adabd828f41a55c5b795c8b15f6da98c9f52
 SHA512:
-  metadata.gz: 90ae2bede4146274cf1bcbae9477999e7144982d595ec67e64bf1839337ebfa93083ed9afac814cf2f0746de40eab462a973a0bebb7d55e4919d78795eeed9bb
-  data.tar.gz: 22646e3f5530a92e0e25d380bfcef7ccd6db6e8b06dd1048a83fb1eaf3912a0581de5607701511f156422003dad597fc28ede8b90c6324440201bac9fc675be8
+  metadata.gz: e1576a27895b37c22c05b4063e351dae84fd94b078dd039be7a5855d2fddc73313a74768fa5051502560d1fbb3053fa6ee459d15e59d4e4997ab3250d6c5db2b
+  data.tar.gz: ee34141581c01bd22eb20642f020a7f297da502714be589ccc16593e3241cb13770fb58b934983af1c89d61067724287060a4b46d24cc0b1cfd1dd7ea4405325

data/lib/elasticsearch/api.rb

@@ -46,6 +46,7 @@ module Elasticsearch
                 Elasticsearch::API::Nodes,
                 Elasticsearch::API::Indices,
                 Elasticsearch::API::Snapshot,
+                Elasticsearch::API::Tasks,
                 Elasticsearch::API::Cat
     end
 

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

@@ -0,0 +1,40 @@
+module Elasticsearch
+  module API
+    module Tasks
+      module Actions
+
+        # Cancel a specific task
+        #
+        # @option arguments [Number] :task_id Cancel the task with specified id
+        # @option arguments [List] :node_id A comma-separated list of node IDs or names to limit the returned
+        #                                   information; use `_local` to return information from the node
+        #                                   you're connecting to, leave empty to get information from all nodes
+        # @option arguments [List] :actions A comma-separated list of actions that should be returned.
+        #                                   Leave empty to return all.
+        # @option arguments [String] :parent_node Cancel tasks with specified parent node.
+        # @option arguments [Number] :parent_task Cancel tasks with specified parent task id.
+        #                                         Set to -1 to cancel all.
+        #
+        # @see http://www.elastic.co/guide/en/elasticsearch/reference/master/tasks-cancel.html
+        #
+        def cancel(arguments={})
+          valid_params = [
+            :node_id,
+            :actions,
+            :parent_node,
+            :parent_task ]
+
+          task_id = arguments.delete(:task_id)
+
+          method = 'POST'
+          path   = "_tasks"
+          path   = Utils.__pathify( '_tasks', Utils.__escape(task_id), '_cancel' )
+          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/tasks/list.rb

@@ -0,0 +1,44 @@
+module Elasticsearch
+  module API
+    module Tasks
+      module Actions
+
+        # Return the list of tasks
+        #
+        # @option arguments [Number] :task_id Return the task with specified id
+        # @option arguments [List] :node_id A comma-separated list of node IDs or names to limit the returned
+        #                                   information; use `_local` to return information from the node
+        #                                   you're connecting to, leave empty to get information from all nodes
+        # @option arguments [List] :actions A comma-separated list of actions that should be returned.
+        #                                   Leave empty to return all.
+        # @option arguments [Boolean] :detailed Return detailed task information (default: false)
+        # @option arguments [String] :parent_node Return tasks with specified parent node.
+        # @option arguments [Number] :parent_task Return tasks with specified parent task id.
+        #                                         Set to -1 to return all.
+        # @option arguments [Boolean] :wait_for_completion Wait for the matching tasks to complete (default: false)
+        #
+        # @see http://www.elastic.co/guide/en/elasticsearch/reference/master/tasks-list.html
+        #
+        def list(arguments={})
+          valid_params = [
+            :node_id,
+            :actions,
+            :detailed,
+            :parent_node,
+            :parent_task,
+            :wait_for_completion ]
+
+          task_id = arguments.delete(:task_id)
+
+          method = 'GET'
+          path   = "_tasks"
+          path   = Utils.__pathify( '_tasks', Utils.__escape(task_id) )
+          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/namespace/tasks.rb

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

data/lib/elasticsearch/api/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module API
-    VERSION = "1.0.16.pre"
+    VERSION = "1.0.16.pre2"
   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'
+skip_features = 'stash_in_path,requires_replica,headers'
 SKIP_FEATURES = ENV.fetch('TEST_SKIP_FEATURES', skip_features)
 
 # Turn configuration

data/test/unit/tasks/cancel_test.rb

@@ -0,0 +1,38 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    class TasksCancelTest < ::Test::Unit::TestCase
+
+      context "Tasks: Cancel" 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 '_tasks/_cancel', url
+            assert_equal Hash.new, params
+            assert_nil   body
+            true
+          end.returns(FakeResponse.new)
+
+          subject.tasks.cancel
+        end
+
+        should "perform correct request with a task_id" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'POST', method
+            assert_equal '_tasks/foo/_cancel', url
+            assert_equal Hash.new, params
+            assert_nil   body
+            true
+          end.returns(FakeResponse.new)
+
+          subject.tasks.cancel :task_id => 'foo'
+        end
+
+      end
+
+    end
+  end
+end

data/test/unit/tasks/list_test.rb

@@ -0,0 +1,38 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    class TasksListTest < ::Test::Unit::TestCase
+
+      context "Tasks: List" 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 '_tasks', url
+            assert_equal Hash.new, params
+            assert_nil   body
+            true
+          end.returns(FakeResponse.new)
+
+          subject.tasks.list
+        end
+
+        should "perform correct request with :task_id" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'GET', method
+            assert_equal '_tasks/foo', url
+            assert_equal Hash.new, params
+            assert_nil   body
+            true
+          end.returns(FakeResponse.new)
+
+          subject.tasks.list :task_id => 'foo'
+        end
+
+      end
+
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-api
 version: !ruby/object:Gem::Version
-  version: 1.0.16.pre
+  version: 1.0.16.pre2
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -466,6 +466,8 @@ files:
 - lib/elasticsearch/api/actions/snapshot/status.rb
 - lib/elasticsearch/api/actions/snapshot/verify_repository.rb
 - lib/elasticsearch/api/actions/suggest.rb
+- lib/elasticsearch/api/actions/tasks/cancel.rb
+- lib/elasticsearch/api/actions/tasks/list.rb
 - lib/elasticsearch/api/actions/termvectors.rb
 - lib/elasticsearch/api/actions/update.rb
 - lib/elasticsearch/api/namespace/cat.rb
@@ -474,6 +476,7 @@ files:
 - lib/elasticsearch/api/namespace/indices.rb
 - lib/elasticsearch/api/namespace/nodes.rb
 - lib/elasticsearch/api/namespace/snapshot.rb
+- lib/elasticsearch/api/namespace/tasks.rb
 - lib/elasticsearch/api/utils.rb
 - lib/elasticsearch/api/version.rb
 - test/integration/yaml_test_runner.rb
@@ -598,6 +601,8 @@ files:
 - test/unit/snapshot/status_test.rb
 - test/unit/snapshot/verify_repository_test.rb
 - test/unit/suggest_test.rb
+- test/unit/tasks/cancel_test.rb
+- test/unit/tasks/list_test.rb
 - test/unit/termvectors_test.rb
 - test/unit/update_document_test.rb
 - test/unit/utils_test.rb
@@ -757,6 +762,8 @@ test_files:
 - test/unit/snapshot/status_test.rb
 - test/unit/snapshot/verify_repository_test.rb
 - test/unit/suggest_test.rb
+- test/unit/tasks/cancel_test.rb
+- test/unit/tasks/list_test.rb
 - test/unit/termvectors_test.rb
 - test/unit/update_document_test.rb
 - test/unit/utils_test.rb