reactor 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e683b319dcb6136bea474698ee9c53e5a7fabe9a
-  data.tar.gz: 6bafceec936367e13be1dce08585ce8820f2c25d
+  metadata.gz: 0e227b2106e2216c0abde0ec3f5345d3afa3155f
+  data.tar.gz: 22f077973eb209621f8fc8b6cc09f79cb3e1a828
 SHA512:
-  metadata.gz: f3b840d95dc4f6e8695524435465d2f0bece5d5db509cd1f9f55f9477fdd05238652dd2fab5c876ec32d530268d28e7fce44de2e453eb626fb94be96b07934f0
-  data.tar.gz: 92240ee624abd7e20c4ca52cd3c477e32ba2f3358f4a66b6531ef4733af0a6831704b88e0e6f6f16745944bffc58210a4116ceb4009a15f3711af666ec0f0b3d
+  metadata.gz: 137f70f5c33b9b23de059067923644aa97afffa48f54df7fc5460ba8009a11a7e98e7081a54ddab49ea15d481b4906c7a3bd9909ace85ec5d8297010a8964af9
+  data.tar.gz: b153c8f263797ae38c7502429cfa5d7d93ff47655537d2fa89fbbe89b96c74b1236b2331f867e5a08bb3a222dc8d81a514a93999f06a8d44efc927cc239d8c15

data/lib/reactor/event.rb

@@ -74,6 +74,7 @@ class Reactor::Event
         job['args'].first == name.to_s &&
         job.score.to_i == data[:was].to_i
       end
+      return if job.nil?
       job.delete
       publish(name, data.except(:was)) if data[:at].future?
     end

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

@@ -43,13 +43,13 @@ module Reactor::Publishable
 
   def reschedule_events
     self.class.events.each do |name, data|
-      attr_changed_method = "#{data[:watch] || data[:at]}_changed?"
-      if data[:at] && respond_to?(attr_changed_method) && send(attr_changed_method)
+      attr_changed_method = data[:watch] || data[:at]
+      if data[:at] && previous_changes[attr_changed_method]
         Reactor::Event.reschedule name,
           at: send(data[:at]),
           actor: ( data[:actor] ? send(data[:actor]) : self ),
           target: ( data[:target] ? self : nil),
-          was: send("#{data[:at]}_was")
+          was: previous_changes[attr_changed_method][0]
       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.4"
+  VERSION = "0.4.5"
 end

data/spec/models/concerns/publishable_spec.rb

@@ -4,7 +4,7 @@ class Pet < ActiveRecord::Base
 end
 
 class Auction < ActiveRecord::Base
-  attr_accessor :we_want_it, :arbitrary_date
+  attr_accessor :we_want_it
   belongs_to :pet
 
   def ring_timeout
@@ -17,7 +17,7 @@ class Auction < ActiveRecord::Base
 
   publishes :bell
   publishes :ring, at: :ring_timeout, watch: :name
-  publishes :begin, at: :arbitrary_date
+  publishes :begin, at: :start_at
   publishes :conditional_event_on_save, if: -> { we_want_it }
   publishes :woof, actor: :pet, target: :self
 end
@@ -34,7 +34,7 @@ describe Reactor::Publishable do
   before { TestSubscriber.destroy_all }
   describe 'publish' do
     let(:pet) { Pet.create! }
-    let(:auction) { Auction.create!(pet: pet, arbitrary_date: DateTime.new(2012,12,21)) }
+    let(:auction) { Auction.create!(pet: pet, start_at: DateTime.new(2012,12,21)) }
 
     it 'publishes an event with actor_id and actor_type set as self' do
       auction
@@ -54,6 +54,24 @@ describe Reactor::Publishable do
       auction
     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
+
+      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
+      auction.save!
+    end
+
     it 'supports immediate events (on create) that get fired once' do
       TestSubscriber.create! event: :bell
       auction
@@ -72,7 +90,7 @@ describe Reactor::Publishable do
 
     it 'does publish an event scheduled for the future' do
       TestSubscriber.create! event: :begin
-      Auction.create!(pet: pet, arbitrary_date: Time.current + 1.week)
+      Auction.create!(pet: pet, start_at: Time.current + 1.week)
       TestSubscriber.class_variable_get(:@@called).should be_true
     end
 

metadata

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