reactor 0.9.2 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c9de12205e0a8f3710f84534cb634fb2270b2e7
-  data.tar.gz: dc1e8f7268a6ca74d744f3e524b742f9bf4fcec9
+  metadata.gz: 703450e6a7d56fa44bbfcfa8a9eed1263df5cc0b
+  data.tar.gz: f2e523fbc25b98abeb47b5f67d16b4cbf6b388e7
 SHA512:
-  metadata.gz: c12f75f204e699aabd87ce268f06f1d4aebed23e96af6b9d844b76cb7998c2d9d6ca50e52b8439a5c25e6969659de676c376e73b61003410f9e360f8bb766ebb
-  data.tar.gz: 218dd37d4a43ce958a2482347cc5b87e3fe43edad8ce2af84e5cd78f4ad1459ad9af9f9f897be7d98e35a205c3cdc91abd283c89c3d5267f2ca11565d21d4fb3
+  metadata.gz: b9d620ea6f462727a488d71c236420a18f36bca937916d58836604de3098d4a2e638527aa9c9e502ee0040cd55d79b179ccc1291b0f969c149d0369a7f38391f
+  data.tar.gz: 442cf06b6d18b3ef38347836d072b1cf3bfe1907f1d28e44048f1e451b74aec0006224741c27a5b1f07d977a0ae3ed25beb5670037d76f890c9e0d4ddef623cd

data/lib/reactor/event.rb

@@ -66,9 +66,24 @@ class Reactor::Event
     def reschedule(name, data = {})
       scheduled_jobs = Sidekiq::ScheduledSet.new
       job = scheduled_jobs.detect do |job|
-        job['class'] == self.name.to_s &&
-        job['args'].first == name.to_s &&
-        job.score.to_i == data[:was].to_i
+        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
+
+        if data[:actor]
+          job_data = job['args'].second
+
+          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
+
+          same_class && same_name && same_at && same_actor
+        else
+          same_class && same_name && same_at
+        end
       end
 
       job.delete if job

data/lib/reactor/version.rb

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

data/reactor.gemspec

@@ -18,8 +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.0"
-  spec.add_dependency 'activerecord', '> 3.0'
+  spec.add_dependency "sidekiq", "< 4.0"
+  spec.add_dependency 'activerecord', '< 4.2'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/spec/event_spec.rb

@@ -84,16 +84,36 @@ describe Reactor::Event do
 
     it 'will schedule an event in the future even if that event was not previously scheduled in the past' do
       expect {
-        jid = Reactor::Event.reschedule :no_old_turtule_time, at: (time + 2.hours), was: time
+        jid = Reactor::Event.reschedule :no_old_turtle_time, at: (time + 2.hours), was: time
         expect(scheduled.find_job(jid).score).to eq((time + 2.hours).to_f)
       }.to change{ scheduled.size }.by(1)
     end
 
     it 'will not schedule an event when the time passed in is nil' do
       expect {
-        Reactor::Event.reschedule :no_old_turtule_time, at: nil, was: time
+        Reactor::Event.reschedule :no_old_turtle_time, at: nil, was: time
       }.to_not change{ scheduled.size }
     end
+
+    context 'when an actor is passed' do
+      let(:actor) { ArbitraryModel.create! }
+
+      it 'will not delete a job which is not associated with the actor' do
+        Reactor::Event.publish :turtle_time, at: time
+
+        expect {
+          Reactor::Event.reschedule :turtle_time, at: time + 2.hours, was: time, actor: actor
+        }.to change { scheduled.size}.from(1).to(2)
+      end
+
+      it 'will delete a job associated with the actor' do
+        Reactor::Event.publish :turtle_time, at: time, actor: actor
+
+        expect {
+          Reactor::Event.reschedule :turtle_time, at: time + 2.hours, was: time, actor: actor
+        }.not_to change { scheduled.size}.from(1)
+      end
+    end
   end
 
   describe 'event content' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reactor
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.4
 platform: ruby
 authors:
 - winfred
@@ -11,36 +11,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-15 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -216,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Sidekiq/ActiveRecord pubsub lib