reactor 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d94c9e88b1e39de193207ebfb0ac79144ec9506
-  data.tar.gz: e5d673c488dc337113cf581c715fcdeb1da9da09
+  metadata.gz: 5ace8ce445f2aebac77523482a0a16112cda5143
+  data.tar.gz: 1844c28133029e8b9ed6d1eac32793efd2a58ede
 SHA512:
-  metadata.gz: b4a8ac148d6b9c2d1bcf5686b7bd6a3db9247be7853bde3671d1b72bb01b982d3691b8c5470e26406b95a922c820578684097c68574274efa51b8a1414cc9a66
-  data.tar.gz: 5ade72a5fc8fc294710fd6be3910ef3f03f12daa0ad1f83f5cc353fe175475bd537e467fa06a5f83f827f577921d9ea35521123373764dc508f6cf57e77cbb24
+  metadata.gz: d268ec515c2b5e26577ebac12299a4969de3a17721e8dd02d9509b0b10cc8010115331d55ca3a8b133e7e51de619b30a1e4ccea9cc3f915c3ed7237ee60f998d
+  data.tar.gz: d0c4f6f3d2b99293034ffb76f06b48a34ed7a4b23a917801706478d390ea115a9a6f827ef843f3cbc8dd8ea1ea1b2ab0a9ab4984d9f81b08c5f13c341a656f38

data/.gitignore

@@ -15,6 +15,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+tags
 .rvmrc
 .ruby-version
-.ruby-gemset
+.ruby-gemset

data/lib/reactor/event.rb

@@ -70,7 +70,7 @@ class Reactor::Event
     def reschedule(name, data = {})
       scheduled_jobs = Sidekiq::ScheduledSet.new
       job = scheduled_jobs.detect do |job|
-        job['class'] == self.class.name.to_s
+        job['class'] == self.name.to_s &&
         job['args'].first == name.to_s &&
         job.score.to_i == data[:was].to_i
       end

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

@@ -2,7 +2,7 @@ module Reactor::Publishable
   extend ActiveSupport::Concern
 
   included do
-    after_commit :schedule_events, if: :persisted?, on: :create
+    after_commit :schedule_events, if: :persisted?
     after_commit :reschedule_events, if: :persisted?, on: :update
   end
 
@@ -31,11 +31,11 @@ module Reactor::Publishable
       ).except(:watch, :if)
       need_to_fire = case (ifarg = data[:if])
                        when Proc
-                         instance_exec &ifarg
+                         instance_exec(&ifarg)
                        when Symbol
                          send(ifarg)
                        else
-                         true
+                         transaction_include_action?(:create)
                      end
       Reactor::Event.publish name, event if need_to_fire
     end
@@ -46,20 +46,13 @@ module Reactor::Publishable
       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: previous_changes[data[:at]].try(:first) || send("#{data[:at]}_was")
-      end
-      if data[:if]
-        need_to_fire = case (ifarg = data[:if])
-                         when Proc
-                           instance_exec &ifarg
-                         when Symbol
-                           send(ifarg)
-                       end
-        Reactor::Event.publish name, actor: self if need_to_fire
+          data.merge(
+            at: send(data[:at]),
+            actor: ( data[:actor] ? send(data[:actor]) : self ),
+            target: ( data[:target] ? self : nil),
+            was: previous_changes[data[:at]].try(:first) || send("#{data[:at]}_was"))
       end
     end
   end
-end
+
+end

data/lib/reactor/version.rb

@@ -1,3 +1,3 @@
 module Reactor
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 end

data/reactor.gemspec

@@ -6,8 +6,8 @@ require 'reactor/version'
 Gem::Specification.new do |spec|
   spec.name          = "reactor"
   spec.version       = Reactor::VERSION
-  spec.authors       = ["winfred", "walt"]
-  spec.email         = ["winfred@developerauction.com", "walt@developerauction.com", "curtis@developerauction.com", "nate@developerauction.com"]
+  spec.authors       = ["winfred", "walt", "nate", "cgag", "petermin"]
+  spec.email         = ["winfred@developerauction.com", "walt@developerauction.com", "curtis@developerauction.com", "nate@developerauction.com", "kengteh.min@gmail.com"]
   spec.description   = %q{ rails chrono reactor }
   spec.summary       = %q{ Sidekiq/ActiveRecord pubsub lib }
   spec.homepage      = ""

data/spec/models/concerns/publishable_spec.rb

@@ -17,7 +17,7 @@ class Auction < ActiveRecord::Base
 
   publishes :bell
   publishes :ring, at: :ring_timeout, watch: :start_at
-  publishes :begin, at: :start_at
+  publishes :begin, at: :start_at, additional_info: 'curtis was here'
   publishes :conditional_event_on_save, if: -> { we_want_it }
   publishes :woof, actor: :pet, target: :self
 end
@@ -62,7 +62,8 @@ describe Reactor::Publishable do
         hash_including(
           at: new_start_at,
           actor: auction,
-          was: start_at
+          was: start_at,
+          additional_info: 'curtis was here'
         )
       auction.start_at = new_start_at
       auction.save!
@@ -118,4 +119,4 @@ describe Reactor::Publishable do
       TestSubscriber.class_variable_get(:@@called).should be_true
     end
   end
-end
+end

metadata

@@ -1,15 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: reactor
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - winfred
 - walt
+- nate
+- cgag
+- petermin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-22 00:00:00.000000000 Z
+date: 2013-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -87,6 +90,7 @@ email:
 - walt@developerauction.com
 - curtis@developerauction.com
 - nate@developerauction.com
+- kengteh.min@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []