elasticsearch-api 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8117b07c3656cd36592dc6a74685015a35a77125
-  data.tar.gz: f9673514f128f2de7b6e11fbdf456cc890f96122
+  metadata.gz: 652b3135a6dcad857e8e846a1336b52d30ed66e9
+  data.tar.gz: 7df54d682afb2b0eab4ce19115a5a440fefc5c13
 SHA512:
-  metadata.gz: 756a663f49e4f94ddf31c28430f39f1683cbb92da3eeee1cf6d3c9851f064f00328e02de0e37f59e5c95ff1157aab0bc1398a533f24fa6d12d58450e3f6ce5e1
-  data.tar.gz: 0660cf068a76559597c9d17df4604c2d6855d615c98230ca242c231a35b60b1a0f0da324a3f148c464359072cb4a345becef650e70d43f6f276464541b7719c3
+  metadata.gz: 94fd554d9eaabeaea5157e58daed95780e4340688f2f611cb505cc31063cf25c8b950b1532af647c2273188f4e97ec081a12d6789a2dcfffd7dba0338c23f07c
+  data.tar.gz: 95a64b45a39de72b1b30f5b701d11f6cd0ad21b54f4918019efa40913ab0ff0b4749e76f4928712618c0900b453fb71520f55d5ff5eb82a5f3f5049cfd043f7b

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

@@ -51,12 +51,8 @@ module Elasticsearch
         params = Utils.__validate_and_extract_params arguments, valid_params
         body   = nil
 
-        perform_request(method, path, params, body).body
-
-      rescue Exception => e
-        # NOTE: Use exception name, not full class in Elasticsearch::Client to allow client plugability
-        if Array(arguments[:ignore]).include?(404) && e.class.to_s =~ /NotFound/; false
-        else raise(e)
+        Utils.__rescue_from_not_found do
+          perform_request(method, path, params, body).body
         end
       end
     end

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

@@ -40,13 +40,9 @@ module Elasticsearch
         params = Utils.__validate_and_extract_params arguments, valid_params
         body   = nil
 
-        perform_request(method, path, params, body).status == 200 ? true : false
-        rescue Exception => e
-          if e.class.to_s =~ /NotFound/ || e.message =~ /Not\s*Found|404/i
-            false
-          else
-            raise e
-          end
+        Utils.__rescue_from_not_found do
+          perform_request(method, path, params, body).status == 200 ? true : false
+        end
       end
 
       alias_method :exists?, :exists

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

@@ -61,12 +61,8 @@ module Elasticsearch
 
         params[:fields] = Utils.__listify(params[:fields]) if params[:fields]
 
-        perform_request(method, path, params, body).body
-
-      rescue Exception => e
-        # NOTE: Use exception name, not full class in Elasticsearch::Client to allow client plugability
-        if Array(arguments[:ignore]).include?(404) && e.class.to_s =~ /NotFound/; false
-        else raise(e)
+        Utils.__rescue_from_not_found do
+          perform_request(method, path, params, body).body
         end
       end
     end

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

@@ -58,12 +58,8 @@ module Elasticsearch
 
         params[:fields] = Utils.__listify(params[:fields]) if params[:fields]
 
-        perform_request(method, path, params, body).body
-
-      rescue Exception => e
-        # NOTE: Use exception name, not full class in Elasticsearch::Client to allow client plugability
-        if Array(arguments[:ignore]).include?(404) && e.class.to_s =~ /NotFound/; false
-        else raise(e)
+        Utils.__rescue_from_not_found do
+          perform_request(method, path, params, body).body
         end
       end
     end

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

@@ -16,11 +16,8 @@ module Elasticsearch
         params = {}
         body   = arguments[:body]
 
-        perform_request(method, path, params, body).body
-      rescue Exception => e
-        # NOTE: Use exception name, not full class in Elasticsearch::Client to allow client plugability
-        if Array(arguments[:ignore]).include?(404) && e.class.to_s =~ /NotFound/; false
-        else raise(e)
+        Utils.__rescue_from_not_found do
+          perform_request(method, path, params, body).body
         end
       end
     end

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

@@ -38,12 +38,8 @@ module Elasticsearch
           params = Utils.__validate_and_extract_params arguments, valid_params
           body   = nil
 
-          perform_request(method, path, params, body).body
-
-        rescue Exception => e
-          # NOTE: Use exception name, not full class in Elasticsearch::Client to allow client plugability
-          if Array(arguments[:ignore]).include?(404) && e.class.to_s =~ /NotFound/; false
-          else raise(e)
+          Utils.__rescue_from_not_found do
+            perform_request(method, path, params, body).body
           end
         end
       end

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

@@ -28,12 +28,8 @@ module Elasticsearch
           params = Utils.__validate_and_extract_params arguments, valid_params
           body = nil
 
-          perform_request(method, path, params, body).body
-
-        rescue Exception => e
-          # NOTE: Use exception name, not full class in Elasticsearch::Client to allow client plugability
-          if Array(arguments[:ignore]).include?(404) && e.class.to_s =~ /NotFound/; false
-          else raise(e)
+          Utils.__rescue_from_not_found do
+            perform_request(method, path, params, body).body
           end
         end
       end

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

@@ -42,12 +42,8 @@ module Elasticsearch
           params = Utils.__validate_and_extract_params arguments, valid_params
           body   = nil
 
-          perform_request(method, path, params, body).status == 200 ? true : false
-        rescue Exception => e
-          if e.class.to_s =~ /NotFound/ || e.message =~ /Not\s*Found|404/i
-            false
-          else
-            raise e
+          Utils.__rescue_from_not_found do
+            perform_request(method, path, params, body).status == 200 ? true : false
           end
         end
 

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

@@ -40,12 +40,8 @@ module Elasticsearch
           params = Utils.__validate_and_extract_params arguments, valid_params
           body = nil
 
-          perform_request(method, path, params, body).status == 200 ? true : false
-        rescue Exception => e
-          if e.class.to_s =~ /NotFound/ || e.message =~ /Not\s*Found|404/i
-            false
-          else
-            raise e
+          Utils.__rescue_from_not_found do
+            perform_request(method, path, params, body).status == 200 ? true : false
           end
         end
 

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

@@ -23,12 +23,8 @@ module Elasticsearch
           params = Utils.__validate_and_extract_params arguments, valid_params
           body = nil
 
-          perform_request(method, path, params, body).status == 200 ? true : false
-        rescue Exception => e
-          if e.class.to_s =~ /NotFound/ || e.message =~ /Not\s*Found|404/i
-            false
-          else
-            raise e
+          Utils.__rescue_from_not_found do
+            perform_request(method, path, params, body).status == 200 ? true : false
           end
         end
 

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

@@ -41,12 +41,8 @@ module Elasticsearch
           params = Utils.__validate_and_extract_params arguments, valid_params
           body = nil
 
-          perform_request(method, path, params, body).status == 200 ? true : false
-        rescue Exception => e
-          if e.class.to_s =~ /NotFound/ || e.message =~ /Not\s*Found|404/i
-            false
-          else
-            raise e
+          Utils.__rescue_from_not_found do
+            perform_request(method, path, params, body).status == 200 ? true : false
           end
         end
 

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

@@ -0,0 +1,26 @@
+module Elasticsearch
+  module API
+    module Indices
+      module Actions
+
+        # "Seal" and index or indices for faster recovery
+        #
+        # @option arguments [List] :index A comma-separated list of index names;
+        #                                 use `_all` or empty string for all indices
+        #
+        # @see http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-seal.html
+        #
+        def seal(arguments={})
+          valid_params = [
+             ]
+          method = 'POST'
+          path   = Utils.__pathify Utils.__listify(arguments[:index]), '_seal'
+          params = {}
+          body   = nil
+
+          perform_request(method, path, params, body).body
+        end
+      end
+    end
+  end
+end

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

@@ -16,13 +16,9 @@ module Elasticsearch
         params = {}
         body   = nil
 
-        perform_request(method, path, params, body).status == 200 ? true : false
-        rescue Exception => e
-          if e.class.to_s =~ /NotFound/ || e.message =~ /Not\s*Found|404/i
-            false
-          else
-            raise e
-          end
+        Utils.__rescue_from_not_found do
+          perform_request(method, path, params, body).status == 200 ? true : false
+        end
       end
     end
   end

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

@@ -94,12 +94,8 @@ module Elasticsearch
 
         params[:fields] = Utils.__listify(params[:fields]) if params[:fields]
 
-        perform_request(method, path, params, body).body
-
-      rescue Exception => e
-        # NOTE: Use exception name, not full class in Elasticsearch::Client to allow client plugability
-        if Array(arguments[:ignore]).include?(404) && e.class.to_s =~ /NotFound/; false
-        else raise(e)
+        Utils.__rescue_from_not_found do
+          perform_request(method, path, params, body).body
         end
       end
     end

data/lib/elasticsearch/api/utils.rb

@@ -178,6 +178,23 @@ module Elasticsearch
         return parts
       end
 
+      # Calls given block, rescuing from any exceptions. Returns `false`
+      # if exception contains NotFound/404 in its class name or message, else re-raises exception.
+      #
+      # @yield [block] A block of code to be executed with exception handling.
+      #
+      # @api private
+      #
+      def __rescue_from_not_found(&block)
+        yield
+      rescue Exception => e
+        if e.class.to_s =~ /NotFound/ || e.message =~ /Not\s*Found|404/i
+          false
+        else
+          raise e
+        end
+      end
+
       extend self
     end
   end

data/lib/elasticsearch/api/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module API
-    VERSION = "1.0.9"
+    VERSION = "1.0.10"
   end
 end

data/test/unit/indices/seal_test.rb

@@ -0,0 +1,25 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    class IndicesSealTest < ::Test::Unit::TestCase
+
+      context "Indices: Seal" 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/_seal', url
+            assert_nil   body
+            true
+          end.returns(FakeResponse.new)
+
+          subject.indices.seal :index => 'foo'
+        end
+
+      end
+
+    end
+  end
+end

data/test/unit/utils_test.rb

@@ -200,6 +200,28 @@ module Elasticsearch
 
         end
 
+        context "__rescue_from_not_found" do
+
+          should "return false if exception class name contains 'NotFound'" do
+            assert_equal( false, __rescue_from_not_found { raise NotFound })
+          end
+
+          should "return false if exception message contains 'Not Found'" do
+            assert_equal( false, __rescue_from_not_found { raise Exception.new "Not Found" })
+          end
+
+          should "return false if exception message contains '404'" do
+            assert_equal( false, __rescue_from_not_found { raise Exception.new "404" })
+          end
+
+          should "raise exception if exception class name and message do not contain NotFound/404" do
+            assert_raise Exception do
+              __rescue_from_not_found { raise Exception.new "Any other exception" }
+            end
+          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.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-14 00:00:00.000000000 Z
+date: 2015-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -421,6 +421,7 @@ files:
 - lib/elasticsearch/api/actions/indices/put_warmer.rb
 - lib/elasticsearch/api/actions/indices/recovery.rb
 - lib/elasticsearch/api/actions/indices/refresh.rb
+- lib/elasticsearch/api/actions/indices/seal.rb
 - lib/elasticsearch/api/actions/indices/segments.rb
 - lib/elasticsearch/api/actions/indices/snapshot_index.rb
 - lib/elasticsearch/api/actions/indices/stats.rb
@@ -544,6 +545,7 @@ files:
 - test/unit/indices/put_warmer_test.rb
 - test/unit/indices/recovery_test.rb
 - test/unit/indices/refresh_test.rb
+- test/unit/indices/seal_test.rb
 - test/unit/indices/segments_test.rb
 - test/unit/indices/snapshot_index_test.rb
 - test/unit/indices/stats_test.rb
@@ -695,6 +697,7 @@ test_files:
 - test/unit/indices/put_warmer_test.rb
 - test/unit/indices/recovery_test.rb
 - test/unit/indices/refresh_test.rb
+- test/unit/indices/seal_test.rb
 - test/unit/indices/segments_test.rb
 - test/unit/indices/snapshot_index_test.rb
 - test/unit/indices/stats_test.rb