elasticsearch-api 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 809bad690b19674236f2947c0199b6b5c5a56cef
-  data.tar.gz: 84b3250f0b22bdc58974d8216ec239a28dfa6fd6
+  metadata.gz: 62247808bb72f7ae656b190ea047eeb8a93160f2
+  data.tar.gz: 0ab2745690ffc9e0e5243b050ade10dea4fec177
 SHA512:
-  metadata.gz: 1c612ec40fbac63d3b845ab1e1d4963fed7e501bfe42d1a5476159f2d08aa388e25302dca5a6a0e517e41a84a4eff1fea341d5a04bfb7fbcc8c3eefc94c53ce0
-  data.tar.gz: f623a29d97eba9852fdc5532a1deba497c21fdac7fc36c3852df3e6a8884af1a8c3a92603ec81310aa395b020c7b7c3ca523eadb21248da3a66ebfb1743edb0d
+  metadata.gz: 04845dd1ec5918fdd884ced7eed2772f15e3e73b56462d8e4859964e55a099af166dd9cf7df5715141aa69a286fbdb91bbe7360f4133d60b9f38953e86e0c1b5
+  data.tar.gz: 4e0f8f9f1e1d4853d48acc0f583af99b8d84693af566e18eb8f775fc0e3b0b1e731964a54bf40391d9d5b24f784a093f25efc5be593bfb637a70722530893130

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

@@ -51,7 +51,9 @@ module Elasticsearch
         params = Utils.__validate_and_extract_params arguments, valid_params
         body   = nil
 
-        Utils.__rescue_from_not_found do
+        if Array(arguments[:ignore]).include?(404)
+          Utils.__rescue_from_not_found { perform_request(method, path, params, body).body }
+        else
           perform_request(method, path, params, body).body
         end
       end

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

@@ -61,7 +61,9 @@ module Elasticsearch
 
         params[:fields] = Utils.__listify(params[:fields]) if params[:fields]
 
-        Utils.__rescue_from_not_found do
+        if Array(arguments[:ignore]).include?(404)
+          Utils.__rescue_from_not_found { perform_request(method, path, params, body).body }
+        else
           perform_request(method, path, params, body).body
         end
       end

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

@@ -16,7 +16,9 @@ module Elasticsearch
         params = {}
         body   = arguments[:body]
 
-        Utils.__rescue_from_not_found do
+        if Array(arguments[:ignore]).include?(404)
+          Utils.__rescue_from_not_found { perform_request(method, path, params, body).body }
+        else
           perform_request(method, path, params, body).body
         end
       end

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

@@ -38,7 +38,9 @@ module Elasticsearch
           params = Utils.__validate_and_extract_params arguments, valid_params
           body   = nil
 
-          Utils.__rescue_from_not_found do
+          if Array(arguments[:ignore]).include?(404)
+            Utils.__rescue_from_not_found { perform_request(method, path, params, body).body }
+          else
             perform_request(method, path, params, body).body
           end
         end

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

@@ -28,7 +28,9 @@ module Elasticsearch
           params = Utils.__validate_and_extract_params arguments, valid_params
           body = nil
 
-          Utils.__rescue_from_not_found do
+          if Array(arguments[:ignore]).include?(404)
+            Utils.__rescue_from_not_found { perform_request(method, path, params, body).body }
+          else
             perform_request(method, path, params, body).body
           end
         end

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

@@ -94,7 +94,9 @@ module Elasticsearch
 
         params[:fields] = Utils.__listify(params[:fields]) if params[:fields]
 
-        Utils.__rescue_from_not_found do
+        if Array(arguments[:ignore]).include?(404)
+          Utils.__rescue_from_not_found { perform_request(method, path, params, body).body }
+        else
           perform_request(method, path, params, body).body
         end
       end

data/lib/elasticsearch/api/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module API
-    VERSION = "1.0.11"
+    VERSION = "1.0.12"
   end
 end

data/test/unit/delete_document_test.rb

@@ -62,11 +62,19 @@ module Elasticsearch
           subject.delete :index => 'foo^bar', :type => 'bar/bam', :id => 1
         end
 
+        should "raise a NotFound exception" do
+          subject.expects(:perform_request).raises(NotFound)
+
+          assert_raise NotFound do
+            subject.delete :index => 'foo', :type => 'bar', :id => 'XXX'
+          end
+        end
+
         should "catch a NotFound exception with the ignore parameter" do
           subject.expects(:perform_request).raises(NotFound)
 
           assert_nothing_raised do
-            subject.get :index => 'foo', :type => 'bar', :id => 'XXX', :ignore => 404
+            subject.delete :index => 'foo', :type => 'bar', :id => 'XXX', :ignore => 404
           end
         end
 

data/test/unit/get_document_test.rb

@@ -62,6 +62,14 @@ module Elasticsearch
           end
         end
 
+        should "raise a NotFound exception" do
+          subject.expects(:perform_request).raises(NotFound)
+
+          assert_raise NotFound do
+            subject.get :index => 'foo', :type => 'bar', :id => 'XXX'
+          end
+        end
+
         should "catch a NotFound exception with the ignore parameter" do
           subject.expects(:perform_request).raises(NotFound)
 

data/test/unit/get_template_test.rb

@@ -19,6 +19,21 @@ module Elasticsearch
           subject.get_template :id => "foo"
         end
 
+        should "raise a NotFound exception" do
+          subject.expects(:perform_request).raises(NotFound)
+
+          assert_raise NotFound do
+            subject.get_template :id => "foo"
+          end
+        end
+
+        should "catch a NotFound exception with the ignore parameter" do
+          subject.expects(:perform_request).raises(NotFound)
+
+          assert_nothing_raised do
+            subject.get_template :id => "foo", :ignore => 404
+          end
+        end
       end
 
     end

data/test/unit/indices/delete_template_test.rb

@@ -28,11 +28,19 @@ module Elasticsearch
           subject.indices.delete_template :name => 'foo^bar'
         end
 
-        should "ignore 404s" do
+        should "raise a NotFound exception" do
+          subject.expects(:perform_request).raises(NotFound)
+
+          assert_raise NotFound do
+            assert ! subject.indices.delete_template(:name => 'foo')
+          end
+        end
+
+        should "catch a NotFound exception with the ignore parameter" do
           subject.expects(:perform_request).raises(NotFound)
 
           assert_nothing_raised do
-            assert ! subject.indices.delete_template(:name => 'foo^bar', :ignore => 404)
+            assert ! subject.indices.delete_template(:name => 'foo', :ignore => 404)
           end
         end
 

data/test/unit/indices/delete_test.rb

@@ -47,6 +47,14 @@ module Elasticsearch
           subject.indices.delete :index => 'foo^bar'
         end
 
+        should "raise a NotFound exception" do
+          subject.expects(:perform_request).raises(NotFound)
+
+          assert_raise NotFound do
+            subject.indices.delete :index => 'foo'
+          end
+        end
+
         should "catch a NotFound exception with the ignore parameter" do
           subject.expects(:perform_request).raises(NotFound)
 

data/test/unit/update_document_test.rb

@@ -62,11 +62,19 @@ module Elasticsearch
           subject.update :index => 'foo^bar', :type => 'bar/bam', :id => '1', :body => {}
         end
 
+        should "raise a NotFound exception" do
+          subject.expects(:perform_request).raises(NotFound)
+
+          assert_raise NotFound do
+            subject.update :index => 'foo', :type => 'bar', :id => 'XXX'
+          end
+        end
+
         should "catch a NotFound exception with the ignore parameter" do
           subject.expects(:perform_request).raises(NotFound)
 
           assert_nothing_raised do
-            subject.get :index => 'foo', :type => 'bar', :id => 'XXX', :ignore => 404
+            subject.update :index => 'foo', :type => 'bar', :id => 'XXX', :ignore => 404
           end
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-api
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-29 00:00:00.000000000 Z
+date: 2015-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json