reactor 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e227b2106e2216c0abde0ec3f5345d3afa3155f
-  data.tar.gz: 22f077973eb209621f8fc8b6cc09f79cb3e1a828
+  metadata.gz: 3d94c9e88b1e39de193207ebfb0ac79144ec9506
+  data.tar.gz: e5d673c488dc337113cf581c715fcdeb1da9da09
 SHA512:
-  metadata.gz: 137f70f5c33b9b23de059067923644aa97afffa48f54df7fc5460ba8009a11a7e98e7081a54ddab49ea15d481b4906c7a3bd9909ace85ec5d8297010a8964af9
-  data.tar.gz: b153c8f263797ae38c7502429cfa5d7d93ff47655537d2fa89fbbe89b96c74b1236b2331f867e5a08bb3a222dc8d81a514a93999f06a8d44efc927cc239d8c15
+  metadata.gz: b4a8ac148d6b9c2d1bcf5686b7bd6a3db9247be7853bde3671d1b72bb01b982d3691b8c5470e26406b95a922c820578684097c68574274efa51b8a1414cc9a66
+  data.tar.gz: 5ade72a5fc8fc294710fd6be3910ef3f03f12daa0ad1f83f5cc353fe175475bd537e467fa06a5f83f827f577921d9ea35521123373764dc508f6cf57e77cbb24

data/lib/reactor/models/concerns/publishable.rb

@@ -49,7 +49,7 @@ module Reactor::Publishable
           at: send(data[:at]),
           actor: ( data[:actor] ? send(data[:actor]) : self ),
           target: ( data[:target] ? self : nil),
-          was: previous_changes[attr_changed_method][0]
+          was: previous_changes[data[:at]].try(:first) || send("#{data[:at]}_was")
       end
       if data[:if]
         need_to_fire = case (ifarg = data[:if])

data/lib/reactor/version.rb

@@ -1,3 +1,3 @@
 module Reactor
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

data/spec/models/concerns/publishable_spec.rb

@@ -8,15 +8,15 @@ class Auction < ActiveRecord::Base
   belongs_to :pet
 
   def ring_timeout
-    created_at + 30.seconds
+    start_at + 30.seconds
   end
 
   def ring_timeout_was
-    created_at + 10.seconds
+    previous_changes[:start_at][0] + 30.seconds
   end
 
   publishes :bell
-  publishes :ring, at: :ring_timeout, watch: :name
+  publishes :ring, at: :ring_timeout, watch: :start_at
   publishes :begin, at: :start_at
   publishes :conditional_event_on_save, if: -> { we_want_it }
   publishes :woof, actor: :pet, target: :self
@@ -55,20 +55,31 @@ describe Reactor::Publishable do
     end
 
     it 'reschedules an event when the :at time changes' do
-      Reactor::Event.should_receive(:publish) do |name, data|
-        name.should == :begin
-        data[:at].should == auction.start_at
-        data[:actor].should == auction
-      end
-      auction
+      start_at = auction.start_at
+      new_start_at = start_at + 1.week
+      Reactor::Event.should_receive(:reschedule).with :ring, anything
+      Reactor::Event.should_receive(:reschedule).with :begin,
+        hash_including(
+          at: new_start_at,
+          actor: auction,
+          was: start_at
+        )
+      auction.start_at = new_start_at
+      auction.save!
+    end
 
-      another_start_at = auction.start_at + 1.week
-      Reactor::Event.should_receive(:reschedule) do |name, data|
-        name.should == :begin
-        data[:at].should == another_start_at
-        data[:actor].should == auction
-      end
-      auction.reload.start_at = another_start_at
+    it 'reschedules an event when the :watch field changes' do
+      ring_time = auction.ring_timeout
+      new_start_at = auction.start_at + 1.week
+      new_ring_time = new_start_at + 30.seconds
+      Reactor::Event.should_receive(:reschedule).with :begin, anything
+      Reactor::Event.should_receive(:reschedule).with :ring,
+        hash_including(
+          at: new_ring_time,
+          actor: auction,
+          was: ring_time
+        )
+      auction.start_at = new_start_at
       auction.save!
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reactor
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - winfred