reactor 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98effb7058e42105083b6140ae324fa6bbc09c15
-  data.tar.gz: 2d869d077ad24edaf0ca70d6afa35eab454d549b
+  metadata.gz: 5e63dbb0bcf3a8396d130eeb955538359cd9551d
+  data.tar.gz: 704feccc84221143a8b90f7a86d139f7b6e91682
 SHA512:
-  metadata.gz: 480067daea1832ef2dd8f06f011e45cac9c75e2662e69dacf0afb2149286fe853000f50310e18461b5c18261b19487cbf435efb25497089d2f18a61c0f2ab11d
-  data.tar.gz: 10f4c872fe0ec5898f0b7c34e5d36bb51735b1ef7229b8f7dd23a26cb8f2f1851e356e6c7b25e2ed55a52226410b7a9cecefa191bb24c7ad09815dbb4a14f149
+  metadata.gz: a68f0f4b9cdb3bf696b66538f1a3dbc0cca8f840d8b2de18cabb7e904b0539efaa4caffdbbef46cf44cc0fe81c7996122eec0005268a7f943b1df334e54a855e
+  data.tar.gz: 0d3ba40af3fb198544d7b7d150a8c3b1ee312af095b304dd3e334c56ebad0b6915326d2ed881be0fbed4fc3c5eea08ea7985e239b54419bed136f69be6ecc512

data/lib/reactor/event.rb

@@ -24,10 +24,16 @@ class Reactor::Event
 
   def self.publish(name, data = {})
     message = new(data.merge(event: name))
-    if (message.at)
-      delay_until(message.at).process name, message.data
-    else
+    #if (message.at)
+    #  delay_until(message.at).process name, message.data
+    #else
+    #  delay.process name, message.data
+    #end
+
+    if message.at.nil?
       delay.process name, message.data
+    elsif message.at.future?
+      delay_until(message.at).process name, message.data
     end
   end
 

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

@@ -43,14 +43,14 @@ module Reactor::Eventable
 
   def reschedule_events
     self.class.events.each do |name, data|
-      if data[:at] && send("#{data[:watch] || data[:at]}_changed?")
+      attr_changed_method = "#{data[:watch] || data[:at]}_changed?"
+      if data[:at] && respond_to?(attr_changed_method) && send(attr_changed_method)
         Reactor::Event.delay.reschedule name,
           at: send(data[:at]),
           actor: ( data[:actor] ? send(data[:actor]) : self ),
           target: ( data[:target] ? self : nil),
           was: send("#{data[:at]}_was")
       end
-
       if data[:if]
         need_to_fire = case (ifarg = data[:if])
                          when Proc

data/lib/reactor/version.rb

@@ -1,3 +1,3 @@
 module Reactor
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/spec/models/concerns/eventable_spec.rb

@@ -4,7 +4,7 @@ class Pet < ActiveRecord::Base
 end
 
 class Auction < ActiveRecord::Base
-  attr_accessor :we_want_it
+  attr_accessor :we_want_it, :arbitrary_date
   belongs_to :pet
 
   def ring_timeout
@@ -17,6 +17,7 @@ class Auction < ActiveRecord::Base
 
   publishes :bell
   publishes :ring, at: :ring_timeout, watch: :name
+  publishes :begin, at: :arbitrary_date
   publishes :conditional_event_on_save, if: -> { we_want_it }
   publishes :woof, actor: :pet, target: :self
 end
@@ -30,9 +31,10 @@ class TestSubscriber < Reactor::Subscriber
 end
 
 describe Reactor::Eventable do
+  before { TestSubscriber.destroy_all }
   describe 'publish' do
     let(:pet) { Pet.create! }
-    let(:auction) { Auction.create!(pet: pet) }
+    let(:auction) { Auction.create!(pet: pet, arbitrary_date: DateTime.new(2012,12,21)) }
 
     it 'publishes an event with actor_id and actor_type set as self' do
       auction
@@ -62,6 +64,18 @@ describe Reactor::Eventable do
       TestSubscriber.class_variable_get(:@@called).should be_false
     end
 
+    it 'does not publish an event scheduled for the past' do
+      TestSubscriber.create! event: :begin
+      auction
+      TestSubscriber.class_variable_get(:@@called).should be_false
+    end
+
+    it 'does publish an event scheduled for the future' do
+      TestSubscriber.create! event: :begin
+      Auction.create!(pet: pet, arbitrary_date: Time.current + 1.week)
+      TestSubscriber.class_variable_get(:@@called).should be_true
+    end
+
     it 'can fire events onsave for any condition' do
       TestSubscriber.create! event: :conditional_event_on_save
       auction
@@ -69,6 +83,7 @@ describe Reactor::Eventable do
       auction.start_at = 1.day.from_now
       auction.save
       TestSubscriber.class_variable_get(:@@called).should be_false
+      auction.start_at = 2.days.from_now
       auction.we_want_it = true
       auction.save
       TestSubscriber.class_variable_get(:@@called).should be_true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reactor
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - winfred
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-03 00:00:00.000000000 Z
+date: 2013-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler