reactor 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f1aac22b0919076019fe2d53dd7999309d25216
-  data.tar.gz: 0ea239c9e18da1b510ff0ef87971abc991425b9b
+  metadata.gz: 973132a3d45a07bd6de4a4563d543ac7531863a1
+  data.tar.gz: c25c41eacaa7e20a94e36c075218091ef27718e8
 SHA512:
-  metadata.gz: 2ef2dabe5ccedc03b97990c583a992c6145716cd775d90fada6540a4b9395195e677db3e135d159240830be6701871a5615cbe966f769e3a4568b936bf925168
-  data.tar.gz: 81f0d2605e65e50f3df59b2fe79f29e6ff327e8c658e6d9d6c6ee3e39bed8a0fbdb775551a33b7e888e68cd5efc21e6c44a32943eba30acf593bafc120a83d8a
+  metadata.gz: 2ac882931bf8e8d07851abf37bfd6c8847b2d3472759a9c733d7548f84fbdb759a867de17c73532550ec9238d6daca4c75e90946c95b38992c8d9db56d387ab5
+  data.tar.gz: 2e5c28ea31c91e8c9ce3fce8f41403a3e6ea59b526b00d516deb1ddff0ae2432f7ff0467ce876bf51d185049622cb1c4cdb5c3be068aeb6713836a2b3c2fdd89

data/lib/reactor/event.rb

@@ -22,65 +22,63 @@ class Reactor::Event
     name
   end
 
-  def self.publish(name, data = {})
-    message = new(data.merge(event: name))
-    #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
+  class << self
+    def publish(name, data = {})
+      message = new(data.merge(event: name))
+
+      if message.at.nil?
+        delay.process name, message.data
+      elsif message.at.future?
+        delay_until(message.at).process name, message.data
+      end
     end
-  end
 
-  def self.reschedule(name, data = {})
-    job = scheduled_jobs.detect do |job|
-      job['class'] == name.to_s.camelize && job['at'].to_i == data[:was].to_i
+    def reschedule(name, data = {})
+      job = scheduled_jobs.detect do |job|
+        job['class'] == name.to_s.camelize && job['at'].to_i == data[:was].to_i
+      end
+      remove_scheduled_job job if job
+      delay.publish(name, data.except(:was)) if data[:at].future?
     end
-    remove_scheduled_job job if job
-    delay.publish(name, data.except(:was)) if data[:at].future?
-  end
 
-  def self.process(name, data)
-    # fire database listeners
-    Reactor::Subscriber.where(event: name.to_s).each do |subscriber|
-      Reactor::Subscriber.delay.fire subscriber.id, data
-    end
+    def process(name, data)
+      data.merge!(fired_at: Time.current)
+      Reactor::Subscriber.where(event: name.to_s).each do |subscriber|
+        Reactor::Subscriber.delay.fire subscriber.id, data
+      end
 
-    #TODO: support more matching?
-    Reactor::Subscriber.where(event: '*').each do |s|
-      Reactor::Subscriber.delay.fire s.id, data
-    end
+      #TODO: support more matching?
+      Reactor::Subscriber.where(event: '*').each do |s|
+        Reactor::Subscriber.delay.fire s.id, data
+      end
 
-    if (static_subscribers = Reactor::SUBSCRIBERS[name.to_s] || []).any?
-      static_subscribers.each do |callback|
-        case callback
-          when Hash
-            callback.keys.first.send callback.values.first, Reactor::Event.new(data.merge(event: name.to_s))
-          else
-            callback.call Reactor::Event.new(data.merge(event: name.to_s))
+      if (static_subscribers = Reactor::SUBSCRIBERS[name.to_s] || []).any?
+        static_subscribers.each do |callback|
+          delay = callback[:options].try(:[], :delay) || 0
+          case method = callback[:method]
+            when Symbol
+              callback[:source].delay_for(delay).send method, Reactor::Event.new(data.merge(event: name.to_s))
+            else
+              method.call Reactor::Event.new(data.merge(event: name.to_s))
+          end
         end
       end
     end
-  end
 
-  private
+    def scheduled_jobs(options = {})
+      Sidekiq.redis do |r|
+        from = options[:from] ? options[:from].to_f.to_s : '-inf'
+        to = options[:to] ? options[:to].to_f.to_s : '+inf'
+        r.zrangebyscore('schedule', from, to).map{|job| MultiJson.decode(job)}
+      end
+    end
 
-  def self.scheduled_jobs(options = {})
-    Sidekiq.redis do |r|
-      from = options[:from] ? options[:from].to_f.to_s : '-inf'
-      to = options[:to] ? options[:to].to_f.to_s : '+inf'
-      r.zrangebyscore('schedule', from, to).map{|job| MultiJson.decode(job)}
+    def remove_scheduled_job(job)
+      Sidekiq.redis { |r| r.zrem 'schedule', MultiJson.encode(job) }
     end
   end
 
-  def self.remove_scheduled_job(job)
-    Sidekiq.redis { |r| r.zrem 'schedule', MultiJson.encode(job) }
-  end
+  private
 
   def try_setter(method, object, *args)
     if object.is_a? ActiveRecord::Base

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

@@ -2,14 +2,9 @@ module Reactor::Subscribable
   extend ActiveSupport::Concern
 
   module ClassMethods
-    def on_event(event, method = nil, &block)
-      callback = case method
-        when Symbol
-          {self => method}
-        else
-          method
-      end
-      callback = block if block
+    def on_event(event, method = nil, options = {}, &block)
+      callback = {method: (method || block), options: {delay: 0}.merge(options)}
+      callback.merge!(source: self) if method.is_a? Symbol
       (Reactor::SUBSCRIBERS[event.to_s] ||= []).push(callback)
     end
   end

data/lib/reactor/version.rb

@@ -1,3 +1,3 @@
 module Reactor
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

data/spec/event_spec.rb

@@ -24,9 +24,15 @@ describe Reactor::Event do
   end
 
   describe 'process' do
+    before { Reactor::Subscriber.create(event: :user_did_this) }
+    after { Reactor::Subscriber.destroy_all }
     it 'fires all subscribers' do
-      Reactor::Subscriber.create(event: :user_did_this)
-      Reactor::Subscriber.any_instance.should_receive(:fire).with(actor_id: '1')
+      Reactor::Subscriber.any_instance.should_receive(:fire).with(hash_including(actor_id: '1'))
+      Reactor::Event.process(event_name, actor_id: '1')
+    end
+
+    it 'sets a fired_at key in event data' do
+      Reactor::Subscriber.any_instance.should_receive(:fire).with(hash_including(fired_at: anything))
       Reactor::Event.process(event_name, actor_id: '1')
     end
   end

data/spec/models/concerns/subscribable_spec.rb

@@ -8,6 +8,7 @@ class Auction < ActiveRecord::Base
 
   on_event :puppy_delivered, :ring_bell
   on_event :any_event, -> (event) {  puppies! }
+  on_event :pooped, :pick_up_poop, delay: 5.minutes
 
   def self.ring_bell(event)
     pp "ring ring! #{event}"
@@ -22,9 +23,18 @@ describe Reactor::Subscribable do
       Reactor::Event.publish(:bid_made, target: Auction.create)
     end
 
-    it 'binds symbol to class method' do
-      Auction.should_receive(:ring_bell)
-      Reactor::Event.publish(:puppy_delivered)
+    describe 'binding symbol of class method' do
+      it 'fires on event' do
+        Auction.should_receive(:ring_bell)
+        Reactor::Event.publish(:puppy_delivered)
+      end
+
+      it 'can be delayed', :sidekiq do
+        Reactor::Event.process(:pooped, {})
+        job = Reactor::Event.scheduled_jobs(from: 4.minutes.from_now, to: 6.minutes.from_now).last
+        job.should be_present
+        job['args'].last.should include("pick_up_poop")
+      end
     end
 
     it 'binds proc' do

data/spec/models/subscriber_spec.rb

@@ -27,7 +27,7 @@ describe Reactor::Subscriber do
   describe 'matcher' do
     it 'can be set to star to bind to all events' do
       MySubscriber.create!(event: '*')
-      MySubscriber.any_instance.should_receive(:fire).with({'random' => 'data', 'event' => :this_event})
+      MySubscriber.any_instance.should_receive(:fire).with(hash_including('random' => 'data', 'event' => :this_event))
       Reactor::Event.publish(:this_event, {random: 'data'})
     end
   end

metadata

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