tantot 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8034dc47aeea3eeca0970dae7bec53a8e99de285
-  data.tar.gz: 26a50c7cd327edfdebc0706edf1cb6a861b76411
+  metadata.gz: 7f6ad6fe3fb7afb2054c68fe8625cc99ea85c327
+  data.tar.gz: 2196c42e206c184669e3429323b4d77774db068e
 SHA512:
-  metadata.gz: d439b688a52f03174b5f18020e226522518069da36e9b96b41953aec8266f8f81c533ae6299f5b4c496ffc9830512c7c62bb86b26075fe110627b135bfcd7119
-  data.tar.gz: a1a4189f19fdc39e248c40e3b4d60dc734dd4340082caeeb72289281df287aca115e84460714fce002ce49dea3195ff7c312caa5439693e5efb2663614a74bda
+  metadata.gz: 757def8ab9f5e5fa8846b95a6aec91d7f12c2181c51c01680e4fb683cfe61debfe5f71f45e0560da93f43a88c87e2d01d24b1e0c5c338bda469628287bdbe97a
+  data.tar.gz: 9c0c6e845e61607d91e0513d6ce8cf6226b577b416e3aee6fdba89e3be4cde58c7bb1c52a4186313d85623f6db07a96df4716a8c81f619bcf72908a4a44b6fe9

data/lib/tantot/observe.rb

@@ -69,9 +69,10 @@ module Tantot
 
           Tantot.collector.register_watch(context, block)
 
-          callback_options = {
-            if: Observe.condition_proc(context)
-          }
+          callback_options = {}.tap do |opts|
+            opts[:if] = Observe.condition_proc(context) if context[:attributes].any? || options.key?(:if)
+            opts[:on] = options[:on] if options.key?(:on)
+          end
           update_proc = Observe.update_proc(context)
 
           if Tantot.config.use_after_commit_callbacks

data/lib/tantot/version.rb

@@ -1,3 +1,3 @@
 module Tantot
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/spec/tantot_spec.rb

@@ -295,5 +295,83 @@ describe Tantot do
         expect(changes[:obj]).to eq(Tantot::Changes::ById.new({1=>{"id"=>[nil, 1]}, 2=>{"id"=>[nil, 2]}, 3=>{"id"=>[nil, 3]}}))
       end
     end
+
+    context 'on:' do
+
+      context ':create' do
+        before do
+          stub_model(:city) do
+            watch TestWatcher, on: :create
+          end
+        end
+
+        it "should only watch creation" do
+          city = nil
+          Tantot.collector.run do
+            city = City.create!
+            expect(watcher_instance).to receive(:perform).once.with(Tantot::Changes::ByModel.new({City => {city.id => {"id" => [nil, city.id]}}}))
+          end
+          Tantot.collector.run do
+            city = City.find(city)
+            city.name = 'foo'
+            city.save
+          end
+          Tantot.collector.run do
+            city = City.find(city)
+            city.destroy
+          end
+        end
+      end
+
+      context ':update' do
+        before do
+          stub_model(:city) do
+            watch TestWatcher, on: :update
+          end
+        end
+
+        it "should only watch update" do
+          city = nil
+          Tantot.collector.run do
+            city = City.create!
+            expect(watcher_instance).to receive(:perform).once.with(Tantot::Changes::ByModel.new({City => {city.id => {"name" => [nil, 'foo']}}}))
+          end
+          Tantot.collector.run do
+            city = City.find(city)
+            city.name = 'foo'
+            city.save
+          end
+          Tantot.collector.run do
+            city = City.find(city)
+            city.destroy
+          end
+        end
+      end
+
+      context ':destroy' do
+        before do
+          stub_model(:city) do
+            watch TestWatcher, on: :destroy
+          end
+        end
+
+        it "should only watch destruction" do
+          city = nil
+          Tantot.collector.run do
+            city = City.create!
+            expect(watcher_instance).to receive(:perform).once.with(Tantot::Changes::ByModel.new({City => {city.id => {}}}))
+          end
+          Tantot.collector.run do
+            city = City.find(city)
+            city.name = 'foo'
+            city.save
+          end
+          Tantot.collector.run do
+            city = City.find(city)
+            city.destroy
+          end
+        end
+      end
+    end
   end # describe '.watch'
 end

metadata

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