reactor 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32ae9f0d99cf819318f0bd3611addcc9537548fe
-  data.tar.gz: 17f2a43e5d16f8fe9d0847d949eba3425a31f72d
+  metadata.gz: 92b65b121e054e4657f60f0209b36a03258d4f4d
+  data.tar.gz: d36e98b14a7659a97a6ad9c8dc9397b1870baa9a
 SHA512:
-  metadata.gz: 2d67d5c63c75311901f4b7e0bbb40c10da97fc65a5245fa06f37bab54b55bf0adb5f4eb86751af6934db16ed3b4319979c80953498943c3414e40d520cb5c40c
-  data.tar.gz: 5bbe9527be4c56d7c73586b7b22da08799321d611de3bb823c96f4548958d0596aa1b8588c5114a5fc4619ca7cbdc4bc6b74d796c311f2f3886c7efb289c0f29
+  metadata.gz: c37a732fa832c8e4970cf3aa0f730504458823476f5f9c0438bce9ec63badc7d89815bd0765ef717024b95d5faa63813b53a80368cb26aef2bda7dfd2901b958
+  data.tar.gz: a769df5f8e42181782789a02bc8b55a6f306eb8ab962913783e45e2570f8995ac481f43050866a4230400664e81fe2a682a32c4860fb1330cf72e0d6d58e370b

data/lib/reactor/event.rb

@@ -22,18 +22,7 @@ class Reactor::Event
       Reactor::Subscriber.delay.fire s.id, data
     end
 
-    static_subscribers =   (Reactor::SUBSCRIBERS[name.to_s]  || []) | (Reactor::SUBSCRIBERS['*'] || [])
-    if static_subscribers.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)
-          else
-            method.call Reactor::Event.new(data)
-        end
-      end
-    end
+    ((Reactor::SUBSCRIBERS[name.to_s]  || []) | (Reactor::SUBSCRIBERS['*'] || [])).each {|s| s.perform_async(data) }
   end
 
   def method_missing(method, *args)

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

@@ -3,9 +3,38 @@ module Reactor::Subscribable
 
   module ClassMethods
     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)
+      (Reactor::SUBSCRIBERS[event.to_s] ||= []).push(StaticSubscriberFactory.create event, method, {source: self}.merge(options), &block)
+    end
+  end
+
+  class StaticSubscriberFactory
+
+    def self.create(event, method = nil, options = {}, &block)
+      handler_class_prefix = event == '*' ? 'Wildcard': event.to_s.camelize
+      new_class = "Reactor::StaticSubscribers::#{handler_class_prefix}Handler#{Reactor::SUBSCRIBERS[event.to_s].size}"
+
+      eval %Q{
+        class #{new_class}
+          include Sidekiq::Worker
+
+          cattr_accessor :method, :delay, :source
+
+          def perform(data)
+            event = Reactor::Event.new(data)
+            if @@method.is_a?(Symbol)
+              @@source.delay_for(@@delay).send(@@method, event)
+            else
+              @@method.call(event)
+            end
+          end
+        end
+      }
+
+      new_class = new_class.constantize
+      new_class.method = method || block
+      new_class.delay = options[:delay] || 0
+      new_class.source = options[:source]
+      new_class
     end
   end
 end

data/lib/reactor/version.rb

@@ -1,3 +1,3 @@
 module Reactor
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/lib/reactor.rb

@@ -7,6 +7,8 @@ require "reactor/event"
 
 module Reactor
   SUBSCRIBERS = {}
+  module StaticSubscribers
+  end
 end
 
 ActiveRecord::Base.send(:include, Reactor::Publishable)

data/spec/event_spec.rb

@@ -40,6 +40,25 @@ describe Reactor::Event do
       Reactor::Subscriber.any_instance.should_receive(:fire).with(hash_including(actor_id: '1'))
       Reactor::Event.perform(event_name, actor_id: '1')
     end
+
+    describe 'when subscriber throws exception', :sidekiq do
+      let(:mock) { mock(:thing, some_method: 3) }
+      let(:barfing_event) { Reactor::Event.perform('barfed', somethin: 'up') }
+
+      before do
+        Reactor::SUBSCRIBERS['barfed'] ||= []
+        Reactor::SUBSCRIBERS['barfed'] << Reactor::Subscribable::StaticSubscriberFactory.create('barfed') do |event|
+          raise 'UNEXPECTED!'
+        end
+        Reactor::SUBSCRIBERS['barfed'] << Reactor::Subscribable::StaticSubscriberFactory.create('barfed') do |event|
+          mock.some_method
+        end
+      end
+
+      it 'doesnt matter because it runs in a separate worker process' do
+        expect { barfing_event }.to_not raise_exception
+      end
+    end
   end
 
   describe 'reschedule', :sidekiq do

data/spec/models/concerns/subscribable_spec.rb

@@ -33,11 +33,10 @@ describe Reactor::Subscribable do
         Reactor::Event.publish(:puppy_delivered)
       end
 
-      it 'can be delayed', :sidekiq do
+      it 'can be delayed' do
+        Auction.should_receive(:pick_up_poop)
+        Auction.should_receive(:delay_for).with(5.minutes).and_return(Auction)
         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
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reactor
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - winfred
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: Sidekiq/ActiveRecord pubsub lib