search_and_resque 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8575aca9094955ecb328163636e194afe5c44aab
-  data.tar.gz: d5fff4dda4b734eb3c520b8d7cdfc591546e11f5
+  metadata.gz: e5f841b3c8302532fcc848c0f93d02413c45ed22
+  data.tar.gz: e950f0259082332743c5ccd7988ee52c60a15525
 SHA512:
-  metadata.gz: dc66289fcd27861e15e201efbbfb879f79435cdf909578e3baac2a78961de84249cbd0ef9578d9ed25968961863e185282f0538de2d61b2cd88c61677813b686
-  data.tar.gz: dd0033c82068f3fc4ac43f62f8f6fa3bc7d649f3ea7b75927df001d2fc34a588c4cca0712e9f5e23d702cf92cfd859bfa9979c8d7240e71c7b5fc56a93263ed6
+  metadata.gz: 02d363aaacf2747f2bd6301d9d32f4c6992123b49b004974978f3bfe88008493cdb376596a3e5decbbad75c2bd036842c1aff034d784edd97917f15a2531e6e5
+  data.tar.gz: aaa016bb3c99a95f87c62a2b1496675465912c71ab96bbc2dd708abc3f56b8ed2a62fac5d3963b11c45f071ef06060bb4d5bbd004e8bd579e3ac8cb7e700a413

data/lib/search_and_resque/callbacks.rb

@@ -12,6 +12,42 @@ module SearchAndResque
         ids = Array(ids).map{ |x| x.is_a?(ActiveRecord::Base) ? x.id : x }
         SearchAndResque.queue.enqueue_delete(elastic_search_type, ids)
       end
+
+      # e.g.
+      #     Model.will_update_all(@records) do
+      #       ...
+      #       @records.update_all(...)
+      #       ...
+      #     end
+      def will_update_all(ids)
+        begin
+          skip_callback(:save, :after, :enqueue_elastic_search_update)
+          transaction do
+            yield if block_given?
+            enqueue_elastic_search_update(ids) unless ids.empty?
+          end
+        ensure
+          set_callback(:save, :after, :enqueue_elastic_search_update)
+        end
+      end
+
+      # e.g.
+      #     Model.will_delete_all(@records) do
+      #       ...
+      #       @records.delete_all
+      #       ...
+      #     end
+      def will_delete_all(ids)
+        begin
+          skip_callback(:destroy, :after, :enqueue_elastic_search_delete)
+          transaction do
+            yield if block_given?
+            enqueue_elastic_search_delete(ids) unless ids.empty?
+          end
+        ensure
+          set_callback(:destroy, :after, :enqueue_elastic_search_delete)
+        end
+      end
     end
 
     def enqueue_elastic_search_update
@@ -23,41 +59,5 @@ module SearchAndResque
     def enqueue_elastic_search_delete
       self.class.enqueue_elastic_search_delete(elastic_search_id)
     end
-
-    # e.g.
-    #     Model.will_update_all(@records) do
-    #       ...
-    #       @records.update_all(...)
-    #       ...
-    #     end
-    def will_update_all(ids)
-      begin
-        skip_callback(:save, :after, :enqueue_elastic_search_update)
-        transaction do
-          yield if block_given?
-          enqueue_elastic_search_update(ids) unless ids.empty?
-        end
-      ensure
-        set_callback(:save, :after, :enqueue_elastic_search_update)
-      end
-    end
-    
-    # e.g.
-    #     Model.will_delete_all(@records) do
-    #       ...
-    #       @records.delete_all
-    #       ...
-    #     end
-    def will_delete_all(ids)
-      begin
-        skip_callback(:destroy, :after, :enqueue_elastic_search_delete)
-        transaction do
-          yield if block_given?
-          enqueue_elastic_search_delete(ids) unless ids.empty?
-        end
-      ensure
-        set_callback(:destroy, :after, :enqueue_elastic_search_delete)
-      end
-    end
   end
 end

data/lib/search_and_resque/version.rb

@@ -1,3 +1,3 @@
 module SearchAndResque
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/test/search_and_resque_test.rb

@@ -109,4 +109,16 @@ class SearchAndResqueTest < test_framework
     score.destroy
     assert_equal nil, SearchAndResqueTestIndex::Films.filter(:ids => {values: [film.id]}).first.score_composer
   end
+
+  def test_will_delete_all
+    film1 = Film.create(:title => 'one', :director => 'two')
+    film2 = Film.create(:title => 'three', :director => 'four')
+
+    assert_equal 2, SearchAndResqueTestIndex::Films.total_count
+
+    Film.will_delete_all([film1, film2]) do
+    end
+
+    assert_equal 0, SearchAndResqueTestIndex::Films.total_count
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: search_and_resque
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Peter Woo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-04 00:00:00.000000000 Z
+date: 2016-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Resque integration for Chewy