tantot 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2858d3a360d204db3c1755fecc65a5e86b3fb8e
-  data.tar.gz: 54d6490ddd105d5ff50eebae905eb91ace85c4e8
+  metadata.gz: 0f35788e06224506f63bd06b886c18a47fc6d0ab
+  data.tar.gz: a4dc68b54d13000f4f9413bfaff2aafd1781d933
 SHA512:
-  metadata.gz: 6db43766e1c9dd8e2a56ecd81386bc01a46b6c300fc91d823063fe5418df2e0d74910edc4053eb7e20216ea6316383e03d57ed35bbe0e6f9bffeee3d247bbbcf
-  data.tar.gz: 64a89f3516777115416ce38f48d92317f30390c3acfbb8f770d41bbf12e6cdafd07877fc75e9d65391865099f1308fad5f2fc17792e8c6119ec8967394714aff
+  metadata.gz: 31e28fe000fbe702ae6cdc8f2aa932ffe21615259b06cdaf89bec7d3ddebcd1ec6b3b55c8e712cd7ec218e33292a0c865c4456df1c84d51e720943126fc64853
+  data.tar.gz: 91b0f7e7bf994f95b627cfc2474cbdab5876dd0f3e3c27ed3a4632a333e8a7e639f4083360247b6c74f0a36fcceadb2b6eed4992eeb7f3b165049e94c3a5ca99

data/lib/tantot/extensions/chewy.rb

@@ -39,8 +39,8 @@ module Tantot
       def self.register_watch(model, type_name, options, block)
         method = options.delete(:method)
         model._tantot_chewy_callbacks ||= {}
-        raise MultipleWatchesProhibited.new("Cannot register an index watch on the same type more than once: #{type_name}") if model._tantot_chewy_callbacks.key?(type_name)
-        model._tantot_chewy_callbacks[type_name] = [method, options, block]
+        model._tantot_chewy_callbacks[type_name] ||= []
+        model._tantot_chewy_callbacks[type_name] << [method, options, block]
       end
 
       class ChewyWatcher
@@ -51,14 +51,12 @@ module Tantot
         def perform(changes_by_model)
           changes_by_model.each do |model, changes_by_id|
             model_watches = model._tantot_chewy_callbacks
-            model_watches.each do |type_name, (method, options, block)|
+            model_watches.each do |type_name, watches|
               # Find type
               reference = get_chewy_type(type_name)
-              backreference = get_ids_to_update(model, changes_by_id, method, options, block)
 
+              backreference = watches.flat_map {|method, options, block| get_ids_to_update(model, changes_by_id, method, options, block)}.compact
               if backreference
-                backreference.compact!
-
                 # Make sure there are any backreferences
                 if backreference.any?
                   Tantot.logger.debug { "[Tantot] [Chewy] [update_index] #{reference} (#{backreference.count} objects): #{backreference.inspect}" }

data/lib/tantot/version.rb

@@ -1,3 +1,3 @@
 module Tantot
-  VERSION = "0.1.9"
+  VERSION = "0.1.10"
 end

data/spec/extensions/chewy_spec.rb

@@ -4,15 +4,6 @@ if defined?(::Chewy)
 
   describe Tantot::Extensions::Chewy do
 
-    context "validations" do
-      it "should prevent registering on the same type more than once" do
-        stub_model(:city) do
-          watch_index 'foo'
-        end
-        expect { City.watch_index 'foo' }.to raise_error(Tantot::MultipleWatchesProhibited, /same type more than once/)
-      end
-    end
-
     [nil, :self, :class_method, :block].product([:some, :all]).each do |backreference_opt, attribute_opt|
       context "should update indexes using backreference: #{backreference_opt.inspect}, attributes: #{attribute_opt}" do
         let(:chewy_type) { double }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tantot
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - François-Pierre Bouchard