sidekiq 0.6.0 → 0.7.0

data/test/test_client.rb

@@ -5,24 +5,24 @@ require 'sidekiq/worker'
 class TestClient < MiniTest::Unit::TestCase
   describe 'with real redis' do
     before do
-      Sidekiq::Client.redis = Redis.connect(:url => 'redis://localhost/sidekiq_test')
-      Sidekiq::Client.redis.flushdb
+      Sidekiq.redis = Sidekiq::RedisConnection.create(:url => 'redis://localhost/sidekiq_test')
+      Sidekiq.redis.flushdb
     end
 
     it 'does not push duplicate messages when configured for unique only' do
-      Sidekiq::Client.middleware.entries.clear
-      Sidekiq::Client.middleware.register do
-        use Sidekiq::Middleware::Client::UniqueJobs, Sidekiq::Client.redis
-        use Sidekiq::Middleware::Client::ResqueWebCompatibility, Sidekiq::Client.redis
+      Sidekiq.client_middleware.entries.clear
+      Sidekiq.client_middleware do |chain|
+        chain.add Sidekiq::Middleware::Client::UniqueJobs
+        chain.add Sidekiq::Middleware::Client::ResqueWebCompatibility
       end
       10.times { Sidekiq::Client.push('customqueue', 'class' => 'Foo', 'args' => [1, 2]) }
-      assert_equal 1, Sidekiq::Client.redis.llen("queue:customqueue")
+      assert_equal 1, Sidekiq.redis.llen("queue:customqueue")
     end
 
     it 'does push duplicate messages when not configured for unique only' do
-      Sidekiq::Client.middleware.unregister(Sidekiq::Middleware::Client::UniqueJobs)
+      Sidekiq.client_middleware.remove(Sidekiq::Middleware::Client::UniqueJobs)
       10.times { Sidekiq::Client.push('customqueue2', 'class' => 'Foo', 'args' => [1, 2]) }
-      assert_equal 10, Sidekiq::Client.redis.llen("queue:customqueue2")
+      assert_equal 10, Sidekiq.redis.llen("queue:customqueue2")
     end
   end
 
@@ -38,7 +38,8 @@ class TestClient < MiniTest::Unit::TestCase
       def @redis.incrby(*); nil; end
       def @redis.setex(*); nil; end
       def @redis.expire(*); true; end
-      Sidekiq::Client.redis = @redis
+      def @redis.with_connection; yield self; end
+      Sidekiq.redis = @redis
     end
 
     it 'raises ArgumentError with invalid params' do
@@ -88,5 +89,15 @@ class TestClient < MiniTest::Unit::TestCase
       assert pushed
       @redis.verify
     end
+
+    it 'retrieves queues' do
+      @redis.expect :smembers, ['bob'], ['queues']
+      assert_equal ['bob'], Sidekiq::Client.registered_queues
+    end
+
+    it 'retrieves workers' do
+      @redis.expect :smembers, ['bob'], ['workers']
+      assert_equal ['bob'], Sidekiq::Client.registered_workers
+    end
   end
 end

data/test/test_extensions.rb

@@ -0,0 +1,45 @@
+require 'helper'
+require 'sidekiq'
+require 'active_record'
+require 'action_mailer'
+require 'sidekiq/extensions/action_mailer'
+require 'sidekiq/extensions/active_record'
+
+
+class TestExtensions < MiniTest::Unit::TestCase
+  describe 'sidekiq extensions' do
+    before do
+      Sidekiq.client_middleware.entries.clear
+      Sidekiq.redis = @redis = MiniTest::Mock.new
+    end
+
+    class MyModel < ActiveRecord::Base
+      def self.long_class_method
+        raise "Should not be called!"
+      end
+    end
+
+    it 'allows delayed exection of ActiveRecord class methods' do
+      @redis.expect(:rpush, @redis, ['queue:default', "{\"class\":\"Sidekiq::Extensions::DelayedModel\",\"args\":[\"---\\n- !ruby/class 'TestExtensions::MyModel'\\n- :long_class_method\\n- []\\n\"]}"])
+      MyModel.delay.long_class_method
+      @redis.verify
+    end
+
+    it 'allows delayed exection of ActiveRecord instance methods' do
+      skip('requires a database')
+    end
+
+    class UserMailer < ActionMailer::Base
+      def greetings(a, b)
+        raise "Should not be called!"
+      end
+    end
+
+    it 'allows delayed delivery of ActionMailer mails' do
+      @redis.expect(:rpush, @redis, ['queue:default', "{\"class\":\"Sidekiq::Extensions::DelayedMailer\",\"args\":[\"---\\n- !ruby/class 'TestExtensions::UserMailer'\\n- :greetings\\n- - 1\\n  - 2\\n\"]}"])
+      UserMailer.delay.greetings(1, 2)
+      @redis.verify
+    end
+
+  end
+end

data/test/test_manager.rb

@@ -8,7 +8,7 @@ require 'connection_pool'
 class TestManager < MiniTest::Unit::TestCase
   describe 'with redis' do
     before do
-      Sidekiq::Manager.redis = Sidekiq::Client.redis = @redis = Sidekiq::RedisConnection.create(:url => 'redis://localhost/sidekiq_test')
+      Sidekiq.redis = @redis = Sidekiq::RedisConnection.create(:url => 'redis://localhost/sidekiq_test')
       @redis.flushdb
       $processed = 0
       $mutex = Mutex.new
@@ -30,7 +30,7 @@ class TestManager < MiniTest::Unit::TestCase
       Sidekiq::Client.push(:foo, 'class' => IntegrationWorker, 'args' => [1, 3])
 
       q = TimedQueue.new
-      mgr = Sidekiq::Manager.new(:queues => [:foo], :processor_count => 2)
+      mgr = Sidekiq::Manager.new(:queues => [:foo], :concurrency => 2)
       mgr.when_done do |_|
         q << 'done' if $processed == 2
       end

data/test/test_middleware.rb

@@ -6,8 +6,7 @@ require 'sidekiq/processor'
 class TestMiddleware < MiniTest::Unit::TestCase
   describe 'middleware chain' do
     before do
-      Sidekiq::Manager.redis = @redis = Sidekiq::RedisConnection.create(:url => 'redis://localhost/sidekiq_test')
-      Sidekiq::Client.redis = nil
+      Sidekiq.redis = Sidekiq::RedisConnection.create(:url => 'redis://localhost/sidekiq_test')
     end
 
     class CustomMiddleware
@@ -25,9 +24,7 @@ class TestMiddleware < MiniTest::Unit::TestCase
 
     it 'supports custom middleware' do
       chain = Sidekiq::Middleware::Chain.new
-      chain.register do
-        use CustomMiddleware, 1, []
-      end
+      chain.add CustomMiddleware, 1, []
 
       assert_equal CustomMiddleware, chain.entries.last.klass
     end
@@ -52,8 +49,9 @@ class TestMiddleware < MiniTest::Unit::TestCase
       recorder = []
       msg = { 'class' => CustomWorker.to_s, 'args' => [recorder] }
 
-      Sidekiq::Processor.middleware.register do
-        2.times { |i| use CustomMiddleware, i.to_s, recorder }
+      Sidekiq.server_middleware do |chain|
+        # should only add once, second should be ignored
+        2.times { |i| chain.add CustomMiddleware, i.to_s, recorder }
       end
 
       boss = MiniTest::Mock.new
@@ -66,11 +64,8 @@ class TestMiddleware < MiniTest::Unit::TestCase
     it 'allows middleware to abruptly stop processing rest of chain' do
       recorder = []
       chain = Sidekiq::Middleware::Chain.new
-
-      chain.register do
-        use NonYieldingMiddleware
-        use CustomMiddleware, 1, recorder
-      end
+      chain.add NonYieldingMiddleware
+      chain.add CustomMiddleware, 1, recorder
 
       final_action = nil
       chain.invoke { final_action = true }

data/test/test_stats.rb

@@ -5,8 +5,7 @@ require 'sidekiq/processor'
 class TestStats < MiniTest::Unit::TestCase
   describe 'with redis' do
     before do
-      Sidekiq::Manager.redis = @redis = Sidekiq::RedisConnection.create(:url => 'redis://localhost/sidekiq_test')
-      Sidekiq::Client.redis = nil
+      Sidekiq.redis = @redis = Sidekiq::RedisConnection.create(:url => 'redis://localhost/sidekiq_test')
       @redis.flushdb
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-14 00:00:00.000000000 Z
+date: 2012-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70220996079880 !ruby/object:Gem::Requirement
+  requirement: &70319633540020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70220996079880
+  version_requirements: *70319633540020
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70220996078920 !ruby/object:Gem::Requirement
+  requirement: &70319633539280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70220996078920
+  version_requirements: *70319633539280
 - !ruby/object:Gem::Dependency
   name: connection_pool
-  requirement: &70220996094360 !ruby/object:Gem::Requirement
+  requirement: &70319633537820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70220996094360
+  version_requirements: *70319633537820
 - !ruby/object:Gem::Dependency
   name: celluloid
-  requirement: &70220996093580 !ruby/object:Gem::Requirement
+  requirement: &70319633533720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70220996093580
+  version_requirements: *70319633533720
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70220996093020 !ruby/object:Gem::Requirement
+  requirement: &70319633624400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70220996093020
+  version_requirements: *70319633624400
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70220996092320 !ruby/object:Gem::Requirement
+  requirement: &70319633623480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70220996092320
+  version_requirements: *70319633623480
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70220996091640 !ruby/object:Gem::Requirement
+  requirement: &70319633622760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,29 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70220996091640
+  version_requirements: *70319633622760
+- !ruby/object:Gem::Dependency
+  name: actionmailer
+  requirement: &70319633621420 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70319633621420
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &70319633620680 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70319633620680
 description: Simple, efficient message processing for Ruby
 email:
 - mperham@gmail.com
@@ -98,6 +120,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rvmrc
+- .travis.yml
 - COMM-LICENSE
 - Changes.md
 - Gemfile
@@ -107,17 +130,27 @@ files:
 - TODO.md
 - bin/client
 - bin/sidekiq
+- examples/chef/cookbooks/sidekiq/README.rdoc
+- examples/chef/cookbooks/sidekiq/recipes/default.rb
+- examples/chef/cookbooks/sidekiq/templates/default/monitrc.conf.erb
+- examples/chef/cookbooks/sidekiq/templates/default/sidekiq.erb
+- examples/chef/cookbooks/sidekiq/templates/default/sidekiq.yml.erb
+- examples/monitrc.conf
 - examples/por.rb
 - examples/sinkiq.rb
 - lib/sidekiq.rb
 - lib/sidekiq/cli.rb
 - lib/sidekiq/client.rb
+- lib/sidekiq/extensions/action_mailer.rb
+- lib/sidekiq/extensions/active_record.rb
+- lib/sidekiq/extensions/generic_proxy.rb
 - lib/sidekiq/manager.rb
 - lib/sidekiq/middleware/chain.rb
 - lib/sidekiq/middleware/client/resque_web_compatibility.rb
 - lib/sidekiq/middleware/client/unique_jobs.rb
 - lib/sidekiq/middleware/server/active_record.rb
 - lib/sidekiq/middleware/server/airbrake.rb
+- lib/sidekiq/middleware/server/failure_jobs.rb
 - lib/sidekiq/middleware/server/unique_jobs.rb
 - lib/sidekiq/processor.rb
 - lib/sidekiq/rails.rb
@@ -134,9 +167,11 @@ files:
 - myapp/app/controllers/work_controller.rb
 - myapp/app/helpers/application_helper.rb
 - myapp/app/mailers/.gitkeep
+- myapp/app/mailers/user_mailer.rb
 - myapp/app/models/.gitkeep
 - myapp/app/models/post.rb
 - myapp/app/views/layouts/application.html.erb
+- myapp/app/views/user_mailer/greetings.html.erb
 - myapp/app/views/work/index.html.erb
 - myapp/app/workers/hard_worker.rb
 - myapp/config.ru
@@ -163,10 +198,12 @@ files:
 - myapp/log/.gitkeep
 - myapp/script/rails
 - sidekiq.gemspec
+- test/config.yml
 - test/fake_env.rb
 - test/helper.rb
 - test/test_cli.rb
 - test/test_client.rb
+- test/test_extensions.rb
 - test/test_manager.rb
 - test/test_middleware.rb
 - test/test_processor.rb
@@ -197,10 +234,12 @@ signing_key:
 specification_version: 3
 summary: Simple, efficient message processing for Ruby
 test_files:
+- test/config.yml
 - test/fake_env.rb
 - test/helper.rb
 - test/test_cli.rb
 - test/test_client.rb
+- test/test_extensions.rb
 - test/test_manager.rb
 - test/test_middleware.rb
 - test/test_processor.rb