reactor 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 973132a3d45a07bd6de4a4563d543ac7531863a1
-  data.tar.gz: c25c41eacaa7e20a94e36c075218091ef27718e8
+  metadata.gz: 7e9a74358c1037c16f0a343f02b5840c77607569
+  data.tar.gz: f8ba2b02d95b0934af0d57add8b75c33c2bf49b3
 SHA512:
-  metadata.gz: 2ac882931bf8e8d07851abf37bfd6c8847b2d3472759a9c733d7548f84fbdb759a867de17c73532550ec9238d6daca4c75e90946c95b38992c8d9db56d387ab5
-  data.tar.gz: 2e5c28ea31c91e8c9ce3fce8f41403a3e6ea59b526b00d516deb1ddff0ae2432f7ff0467ce876bf51d185049622cb1c4cdb5c3be068aeb6713836a2b3c2fdd89
+  metadata.gz: fae79f206e0011b096b6817c0dcf3dde568fed64329b22d2708549dc12725003bcc1ce64537ec255ecc7d6437fddf59b50afe295fa66a801f596712785cc9e88
+  data.tar.gz: c450f5814c17cf71e6ba9f2f92a7d41dad867ba542433d4062f5ca9492b7a00e89abb6800db9980896531eeac6873a9122c0c9061cad6021af0855f8abe90969

data/Gemfile

@@ -3,10 +3,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in reactor.gemspec
 gemspec
 
-
-gem 'sidekiq'
-gem 'activerecord', '3.2.13' 
-
 group :test do
   gem 'pry'
   gem 'rspec'

data/lib/reactor/event.rb

@@ -1,5 +1,6 @@
 class Reactor::Event
   include Reactor::OptionallySubclassable
+  include Sidekiq::Worker
 
   attr_accessor :data
 
@@ -10,6 +11,30 @@ class Reactor::Event
     end
   end
 
+  def perform(name, data)
+    data.merge!(fired_at: Time.current)
+    Reactor::Subscriber.where(event: name).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
+
+    if (static_subscribers = Reactor::SUBSCRIBERS[name] || []).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))
+          else
+            method.call Reactor::Event.new(data.merge(event: name))
+        end
+      end
+    end
+  end
+
   def method_missing(method, *args)
     if method.to_s.include?('=')
       try_setter(method, *args)
@@ -23,58 +48,28 @@ class Reactor::Event
   end
 
   class << self
+    def perform(name, data)
+      new.perform(name, data)
+    end
+
     def publish(name, data = {})
       message = new(data.merge(event: name))
 
       if message.at.nil?
-        delay.process name, message.data
+        perform_async name, message.data
       elsif message.at.future?
-        delay_until(message.at).process name, message.data
+        perform_at message.at, name, message.data
       end
     end
 
     def reschedule(name, data = {})
+      scheduled_jobs = Sidekiq::ScheduledSet.new
       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
-
-    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
-
-      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
-
-    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)}
+        job['args'].first == name.to_s &&
+        job.score == data[:was].to_f
       end
-    end
-
-    def remove_scheduled_job(job)
-      Sidekiq.redis { |r| r.zrem 'schedule', MultiJson.encode(job) }
+      job.delete
+      publish(name, data.except(:was)) if data[:at].future?
     end
   end
 

data/lib/reactor/version.rb

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

data/reactor.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "sidekiq", ">= 2.13.0"
+  spec.add_dependency 'activerecord', '3.2.13'
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"

data/spec/event_spec.rb

@@ -17,23 +17,40 @@ describe Reactor::Event do
   let(:event_name) { :user_did_this }
 
   describe 'publish' do
-    it 'fires the first process and sets message event_id' do
-      Reactor::Event.should_receive(:process).with(event_name, 'actor_id' => '1', 'event' => :user_did_this)
+    it 'fires the first perform and sets message event_id' do
+      Reactor::Event.should_receive(:perform_async).with(event_name, 'actor_id' => '1', 'event' => :user_did_this)
       Reactor::Event.publish(:user_did_this, actor_id: '1')
     end
   end
 
-  describe 'process' do
+  describe 'perform' do
     before { Reactor::Subscriber.create(event: :user_did_this) }
     after { Reactor::Subscriber.destroy_all }
     it 'fires all subscribers' do
       Reactor::Subscriber.any_instance.should_receive(:fire).with(hash_including(actor_id: '1'))
-      Reactor::Event.process(event_name, actor_id: '1')
+      Reactor::Event.perform(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')
+      Reactor::Event.perform(event_name, actor_id: '1')
+    end
+  end
+
+  describe 'reschedule', :sidekiq do
+    let(:scheduled) { Sidekiq::ScheduledSet.new }
+    let(:time) { 1.hour.from_now }
+
+    it 'can schedule and reschedule an event in the future' do
+      expect {
+        jid = Reactor::Event.publish :turtle_time, at: time
+        scheduled.find_job(jid).score.should == time.to_f
+      }.to change { scheduled.size }.by(1)
+
+      expect {
+        jid = Reactor::Event.reschedule :turtle_time, at: (time + 2.hours), was: time
+        scheduled.find_job(jid).score.should == (time + 2.hours).to_f
+      }.to_not change { scheduled.size }
     end
   end
 

data/spec/models/concerns/subscribable_spec.rb

@@ -16,6 +16,7 @@ class Auction < ActiveRecord::Base
 end
 
 describe Reactor::Subscribable do
+  let(:scheduled) { Sidekiq::ScheduledSet.new }
 
   describe 'on_event' do
     it 'binds block of code statically to event being fired' do
@@ -30,8 +31,8 @@ describe Reactor::Subscribable do
       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
+        Reactor::Event.perform('pooped', {})
+        job = scheduled.detect{|job| job.score > 4.minutes.from_now.to_f && job.score <= 5.minutes.from_now.to_f }
         job.should be_present
         job['args'].last.should include("pick_up_poop")
       end

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(hash_including('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.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - winfred
@@ -9,8 +9,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-17 00:00:00.000000000 Z
+date: 2013-07-21 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: sidekiq
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.13.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.13.0
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.2.13
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.2.13
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement