sidekiq-scheduler 0.1.1 → 0.1.2

data/lib/sidekiq-scheduler/testing.rb

@@ -0,0 +1,33 @@
+require 'sidekiq/testing'
+
+module SidekiqScheduler
+  module Worker
+    module ClassMethods
+      alias_method :perform_at_old, :perform_at
+      def perform_at(timestamp, *args)
+        jobs << { 'class' => self.name, 'timestamp' => timestamp.to_i, 'args' => args }
+        true
+      end
+
+      alias_method :perform_in_old, :perform_in
+      def perform_in(seconds_from_now, *args)
+        timestamp = Time.now + seconds_from_now
+        jobs << { 'class' => self.name, 'timestamp' => timestamp.to_i, 'args' => args }
+      end
+
+      alias_method :remove_delayed_old, :remove_delayed
+      def remove_delayed(*args)
+        old_jobcount = jobs.size
+        jobs.reject! { |job| job["class"] == self.name && job["args"] == args }
+        old_jobcount - jobs.size
+      end
+
+      alias_method :remove_delayed_from_timestamp_old, :remove_delayed_from_timestamp
+      def remove_delayed_from_timestamp(timestamp, *args)
+        old_jobcount = jobs.size
+        jobs.reject! { |job| job["class"] == self.name && job["timestamp"] == timestamp.to_i && job["args"] == args }
+        old_jobcount - jobs.size
+      end
+    end
+  end
+end

data/lib/sidekiq-scheduler/version.rb

@@ -1,3 +1,3 @@
 module SidekiqScheduler
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/sidekiq-scheduler/worker.rb

@@ -11,6 +11,14 @@ module SidekiqScheduler
       def perform_in(seconds_from_now, *args)
         Sidekiq::Client.delayed_push(Time.now + seconds_from_now, 'class' => self.name, 'args' => args)
       end
+
+      def remove_delayed(*args)
+        Sidekiq::Client.remove_all_delayed(self.name, *args)
+      end
+
+      def remove_delayed_from_timestamp(timestamp, *args)
+        Sidekiq::Client.remove_delayed(timestamp, self.name, *args)
+      end
     end
   end
 end

data/test/client_test.rb

@@ -34,6 +34,14 @@ class ClientTest < MiniTest::Unit::TestCase
       assert_equal 2, Sidekiq::Client.remove_all_delayed('Foo', 3, 4)
     end
 
+    it 'handles removed_delayed from a worker' do
+      Sidekiq::Client.delayed_push(1331284491, 'class' => 'MyWorker', 'args' => [1, 2])
+      Sidekiq::Client.delayed_push(1331284492, 'class' => 'MyWorker', 'args' => [3, 4])
+      Sidekiq::Client.delayed_push(1331284493, 'class' => 'MyWorker', 'args' => [3, 4])
+      Sidekiq::Client.delayed_push(1331284493, 'class' => 'MyWorker', 'args' => [5, 6])
+      assert_equal 2, MyWorker.remove_delayed(3, 4)
+    end
+
     it 'removes messages from specified timestamp' do
       Sidekiq::Client.delayed_push(1331284491, 'class' => 'Foo', 'args' => [1, 2])
       Sidekiq::Client.delayed_push(1331284492, 'class' => 'Foo', 'args' => [1, 2])
@@ -41,6 +49,13 @@ class ClientTest < MiniTest::Unit::TestCase
       assert_equal 1, Sidekiq.redis.llen('delayed:1331284492')
     end
 
+    it 'removes messages from a worker for a specified timestamp' do
+      Sidekiq::Client.delayed_push(1331284491, 'class' => 'MyWorker', 'args' => [1, 2])
+      Sidekiq::Client.delayed_push(1331284492, 'class' => 'MyWorker', 'args' => [1, 2])
+      assert_equal 1, MyWorker.remove_delayed_from_timestamp(1331284491, 1, 2)
+      assert_equal 1, Sidekiq.redis.llen('delayed:1331284492')
+    end
+
     it 'removes messages for a queue from specified timestamp' do
       Sidekiq::Client.delayed_push('foo', 1331284491, 'class' => 'Foo', 'args' => [1, 2])
       Sidekiq::Client.delayed_push('foo', 1331284492, 'class' => 'Foo', 'args' => [1, 2])
@@ -113,6 +128,5 @@ class ClientTest < MiniTest::Unit::TestCase
         @redis.verify
       end
     end
-
   end
 end

data/test/support/direct_worker.rb

@@ -0,0 +1,6 @@
+class DirectWorker
+  include Sidekiq::Worker
+  def perform(a, b)
+    a + b
+  end
+end

data/test/testing_test.rb

@@ -0,0 +1,38 @@
+require 'test_helper'
+require 'sidekiq-scheduler/worker'
+
+class TestingTest < MiniTest::Unit::TestCase
+  describe 'sidekiq-scheduler testing' do
+
+    it 'stubs the perform_* calls when in testing mode' do
+      begin
+        require 'sidekiq-scheduler/testing'
+        # perform_at
+        assert_equal 0, DirectWorker.jobs.size
+        assert DirectWorker.perform_at(1331759054, 1, 2)
+        assert_equal 1, DirectWorker.jobs.size
+        assert_equal 1331759054, DirectWorker.jobs[0]['timestamp']
+        DirectWorker.jobs.clear
+
+        # perform_in
+        Timecop.freeze(Time.now) do
+          timestamp = Time.now + 30
+          assert_equal 0, DirectWorker.jobs.size
+          assert DirectWorker.perform_in(30, 1, 2)
+          assert_equal 1, DirectWorker.jobs.size
+          assert_equal timestamp.to_i, DirectWorker.jobs[0]['timestamp']
+        end
+      ensure
+        # Undo override
+        SidekiqScheduler::Worker::ClassMethods.class_eval do
+          remove_method :perform_at, :perform_in, :remove_delayed, :remove_delayed_from_timestamp
+          alias_method :perform_at, :perform_at_old
+          alias_method :perform_in, :perform_in_old
+          alias_method :remove_delayed, :remove_delayed_old
+          alias_method :remove_delayed_from_timestamp, :remove_delayed_from_timestamp_old
+          remove_method :perform_at_old, :perform_in_old, :remove_delayed_old, :remove_delayed_from_timestamp_old
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-scheduler
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
-  requirement: &70115084759380 !ruby/object:Gem::Requirement
+  requirement: &70095698629680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70115084759380
+  version_requirements: *70095698629680
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70115084758860 !ruby/object:Gem::Requirement
+  requirement: &70095698629040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70115084758860
+  version_requirements: *70095698629040
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70115084758160 !ruby/object:Gem::Requirement
+  requirement: &70095698628560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70115084758160
+  version_requirements: *70095698628560
 description: Light weight job scheduling extension for Sidekiq that adds support for
   queueing items in the future.
 email:
@@ -57,6 +57,7 @@ files:
 - lib/sidekiq-scheduler/cli.rb
 - lib/sidekiq-scheduler/client.rb
 - lib/sidekiq-scheduler/manager.rb
+- lib/sidekiq-scheduler/testing.rb
 - lib/sidekiq-scheduler/version.rb
 - lib/sidekiq-scheduler/worker.rb
 - lib/sidekiq-scheduler.rb
@@ -69,8 +70,10 @@ files:
 - test/config.yml
 - test/fake_env.rb
 - test/manager_test.rb
+- test/support/direct_worker.rb
 - test/support/my_worker.rb
 - test/test_helper.rb
+- test/testing_test.rb
 homepage: https://github.com/yabawock/sidekiq-scheduler
 licenses: []
 post_install_message: 
@@ -85,7 +88,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1488616446890576615
+      hash: 3002219408512225865
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -94,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1488616446890576615
+      hash: 3002219408512225865
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.17
@@ -107,5 +110,7 @@ test_files:
 - test/config.yml
 - test/fake_env.rb
 - test/manager_test.rb
+- test/support/direct_worker.rb
 - test/support/my_worker.rb
 - test/test_helper.rb
+- test/testing_test.rb