reactor 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 703450e6a7d56fa44bbfcfa8a9eed1263df5cc0b
-  data.tar.gz: f2e523fbc25b98abeb47b5f67d16b4cbf6b388e7
+  metadata.gz: 2f68e85e0e74847f96c21488a9c501839d9f6e63
+  data.tar.gz: 9a604a01797f2ca97b72510ab25442e505853630
 SHA512:
-  metadata.gz: b9d620ea6f462727a488d71c236420a18f36bca937916d58836604de3098d4a2e638527aa9c9e502ee0040cd55d79b179ccc1291b0f969c149d0369a7f38391f
-  data.tar.gz: 442cf06b6d18b3ef38347836d072b1cf3bfe1907f1d28e44048f1e451b74aec0006224741c27a5b1f07d977a0ae3ed25beb5670037d76f890c9e0d4ddef623cd
+  metadata.gz: c7d15a00dd0bcac36828b89a4a5aee6b953dc955beba2243e057268902466acf56e3f8357a27857d70a2425c22aef54372903bedbb1e88ab78562fc0c9fde3e2
+  data.tar.gz: bd054bf8cfd108603c718d9cb39ff10d2010fdc2744e8a898e2f950cda19f30ab5af1528fb3eeb9bc6156f3c7039f0dc7d6b9957b62a0e6f2dd07217906a8c0e

data/lib/reactor/event.rb

@@ -66,23 +66,18 @@ class Reactor::Event
     def reschedule(name, data = {})
       scheduled_jobs = Sidekiq::ScheduledSet.new
       job = scheduled_jobs.detect do |job|
-        same_class = job['class'] == self.name.to_s
-        same_name = job['args'].first == name.to_s
-        same_at = job.score.to_i == data[:was].to_i
+        return false if job['class'] != self.name.to_s
 
-        if data[:actor]
-          job_data = job['args'].second
+        same_event_name  = job['args'].first == name.to_s
+        same_at_time     = job.score.to_i == data[:was].to_i
 
-          if job_data
-            same_actor =  job_data['actor_type'] == data[:actor].class.name &&
-                          job_data['actor_id'] == data[:actor].id
-          else
-            same_actor = false
-          end
+        if data[:actor]
+          same_actor =  job['args'].second['actor_type']  == data[:actor].class.name &&
+                        job['args'].second['actor_id']    == data[:actor].id
 
-          same_class && same_name && same_at && same_actor
+          same_event_name && same_at_time && same_actor
         else
-          same_class && same_name && same_at
+          same_event_name && same_at_time
         end
       end
 

data/lib/reactor/version.rb

@@ -1,3 +1,3 @@
 module Reactor
-  VERSION = "0.9.4"
+  VERSION = "0.9.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reactor
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - winfred
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq