sidekiq 0.5.1 → 0.6.0

data/test/test_processor.rb

@@ -11,6 +11,7 @@ class TestProcessor < MiniTest::Unit::TestCase
     end
 
     class MockWorker
+      include Sidekiq::Worker
       def perform(args)
         raise "kerboom!" if args == 'boom'
         $invokes += 1
@@ -21,7 +22,7 @@ class TestProcessor < MiniTest::Unit::TestCase
       msg = { 'class' => MockWorker.to_s, 'args' => ['myarg'] }
       processor = ::Sidekiq::Processor.new(@boss)
       @boss.expect(:processor_done!, nil, [processor])
-      processor.process(msg)
+      processor.process(msg, 'default')
       @boss.verify
       assert_equal 1, $invokes
       assert_equal 0, $errors.size
@@ -31,7 +32,7 @@ class TestProcessor < MiniTest::Unit::TestCase
       msg = { 'class' => MockWorker.to_s, 'args' => ['boom'] }
       processor = ::Sidekiq::Processor.new(@boss)
       assert_raises RuntimeError do
-        processor.process(msg)
+        processor.process(msg, 'default')
       end
       @boss.verify
       assert_equal 0, $invokes

data/test/test_stats.rb

@@ -0,0 +1,79 @@
+require 'helper'
+require 'sidekiq'
+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
+      @redis.flushdb
+    end
+
+    class DumbWorker
+      include Sidekiq::Worker
+
+      def perform(redis)
+        raise 'bang' if redis == nil
+      end
+    end
+
+    it 'updates global stats in the success case' do
+      msg = { 'class' => DumbWorker.to_s, 'args' => [@redis] }
+      boss = MiniTest::Mock.new
+
+      set = @redis.smembers('workers')
+      assert_equal 0, set.size
+
+      processor = Sidekiq::Processor.new(boss)
+      boss.expect(:processor_done!, nil, [processor])
+
+      # adds to the workers set upon initialize
+      set = @redis.smembers('workers')
+      assert_equal 1, set.size
+      assert_match(/#{Regexp.escape(`hostname`.strip)}/, set.first)
+
+      assert_equal 0, @redis.get('stat:failed').to_i
+      assert_equal 0, @redis.get('stat:processed').to_i
+      assert_equal 0, @redis.get("stat:processed:#{processor}").to_i
+
+      processor.process(msg, 'xyzzy')
+      processor.process(msg, 'xyzzy')
+      processor.process(msg, 'xyzzy')
+
+      set = @redis.smembers('workers')
+      assert_equal 1, set.size
+      assert_match(/#{Regexp.escape(`hostname`.strip)}/, set.first)
+      assert_equal 0, @redis.get('stat:failed').to_i
+      assert_equal 3, @redis.get('stat:processed').to_i
+      assert_equal 3, @redis.get("stat:processed:#{processor}").to_i
+    end
+
+    it 'updates global stats in the error case' do
+      msg = { 'class' => DumbWorker.to_s, 'args' => [nil] }
+      boss = MiniTest::Mock.new
+
+      assert_equal [], @redis.smembers('workers')
+      assert_equal 0, @redis.get('stat:failed').to_i
+      assert_equal 0, @redis.get('stat:processed').to_i
+
+      processor = Sidekiq::Processor.new(boss)
+      assert_equal 1, @redis.smembers('workers').size
+
+      pstr = processor.to_s
+      assert_raises RuntimeError do
+        processor.process(msg, 'xyzzy')
+      end
+
+      set = @redis.smembers('workers')
+      assert_equal 0, set.size
+      assert_equal 1, @redis.get('stat:failed').to_i
+      assert_equal 1, @redis.get('stat:processed').to_i
+      assert_equal nil, @redis.get("stat:processed:#{pstr}")
+    end
+
+    it 'should set various stats during processing' do
+      skip 'TODO'
+    end
+  end
+end

data/test/test_testing.rb

@@ -0,0 +1,32 @@
+require 'helper'
+require 'sidekiq/worker'
+
+class TestTesting < MiniTest::Unit::TestCase
+  describe 'sidekiq testing' do
+
+    class DirectWorker
+      include Sidekiq::Worker
+      def perform(a, b)
+        a + b
+      end
+    end
+
+    it 'stubs the async call when in testing mode' do
+      begin
+        # Override Sidekiq::Worker
+        require 'sidekiq/testing'
+        assert_equal 0, DirectWorker.jobs.size
+        assert DirectWorker.perform_async(1, 2)
+        assert_equal 1, DirectWorker.jobs.size
+      ensure
+        # Undo override
+        Sidekiq::Worker::ClassMethods.class_eval do
+          remove_method :perform_async
+          alias_method :perform_async, :perform_async_old
+          remove_method :perform_async_old
+        end
+      end
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-05 00:00:00.000000000 Z
+date: 2012-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70180457698040 !ruby/object:Gem::Requirement
+  requirement: &70220996079880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70180457698040
+  version_requirements: *70220996079880
+- !ruby/object:Gem::Dependency
+  name: redis-namespace
+  requirement: &70220996078920 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70220996078920
 - !ruby/object:Gem::Dependency
   name: connection_pool
-  requirement: &70180457697080 !ruby/object:Gem::Requirement
+  requirement: &70220996094360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70180457697080
+  version_requirements: *70220996094360
 - !ruby/object:Gem::Dependency
   name: celluloid
-  requirement: &70180457696360 !ruby/object:Gem::Requirement
+  requirement: &70220996093580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70180457696360
+  version_requirements: *70220996093580
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70180457695360 !ruby/object:Gem::Requirement
+  requirement: &70220996093020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70180457695360
+  version_requirements: *70220996093020
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70180457694420 !ruby/object:Gem::Requirement
+  requirement: &70220996092320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70180457694420
+  version_requirements: *70220996092320
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70180457693640 !ruby/object:Gem::Requirement
+  requirement: &70220996091640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70180457693640
+  version_requirements: *70220996091640
 description: Simple, efficient message processing for Ruby
 email:
 - mperham@gmail.com
@@ -85,24 +96,33 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
 - .rvmrc
 - COMM-LICENSE
 - Changes.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - TODO.md
 - bin/client
 - bin/sidekiq
+- examples/por.rb
+- examples/sinkiq.rb
 - lib/sidekiq.rb
 - lib/sidekiq/cli.rb
 - lib/sidekiq/client.rb
 - lib/sidekiq/manager.rb
-- lib/sidekiq/middleware.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/unique_jobs.rb
 - lib/sidekiq/processor.rb
 - lib/sidekiq/rails.rb
+- lib/sidekiq/redis_connection.rb
+- lib/sidekiq/testing.rb
 - lib/sidekiq/util.rb
 - lib/sidekiq/version.rb
 - lib/sidekiq/worker.rb
@@ -111,11 +131,13 @@ files:
 - myapp/Gemfile.lock
 - myapp/Rakefile
 - myapp/app/controllers/application_controller.rb
+- myapp/app/controllers/work_controller.rb
 - myapp/app/helpers/application_helper.rb
 - myapp/app/mailers/.gitkeep
 - myapp/app/models/.gitkeep
 - myapp/app/models/post.rb
 - myapp/app/views/layouts/application.html.erb
+- myapp/app/views/work/index.html.erb
 - myapp/app/workers/hard_worker.rb
 - myapp/config.ru
 - myapp/config/application.rb
@@ -130,6 +152,7 @@ files:
 - myapp/config/initializers/mime_types.rb
 - myapp/config/initializers/secret_token.rb
 - myapp/config/initializers/session_store.rb
+- myapp/config/initializers/sidekiq.rb
 - myapp/config/initializers/wrap_parameters.rb
 - myapp/config/locales/en.yml
 - myapp/config/routes.rb
@@ -140,12 +163,15 @@ files:
 - myapp/log/.gitkeep
 - myapp/script/rails
 - sidekiq.gemspec
+- test/fake_env.rb
 - test/helper.rb
+- test/test_cli.rb
 - test/test_client.rb
 - test/test_manager.rb
 - test/test_middleware.rb
 - test/test_processor.rb
-- test/timed_queue.rb
+- test/test_stats.rb
+- test/test_testing.rb
 homepage: http://mperham.github.com/sidekiq
 licenses: []
 post_install_message: 
@@ -171,9 +197,12 @@ signing_key:
 specification_version: 3
 summary: Simple, efficient message processing for Ruby
 test_files:
+- test/fake_env.rb
 - test/helper.rb
+- test/test_cli.rb
 - test/test_client.rb
 - test/test_manager.rb
 - test/test_middleware.rb
 - test/test_processor.rb
-- test/timed_queue.rb
+- test/test_stats.rb
+- test/test_testing.rb

data/Gemfile.lock

@@ -1,32 +0,0 @@
-PATH
-  remote: .
-  specs:
-    sidekiq (0.1.0)
-      celluloid
-      connection_pool
-      multi_json
-      redis
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    celluloid (0.8.0)
-    connection_pool (0.1.0)
-    minitest (2.10.0)
-    multi_json (1.0.4)
-    rake (0.9.2.2)
-    redis (2.2.2)
-    simplecov (0.5.4)
-      multi_json (~> 1.0.3)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  minitest
-  rake
-  sidekiq!
-  simplecov

data/lib/sidekiq/middleware.rb

@@ -1,89 +0,0 @@
-module Sidekiq
-  # Middleware is code configured to run before/after
-  # a message is processed.  It is patterned after Rack
-  # middleware.  The default middleware chain:
-  #
-  # Sidekiq::Middleware::Chain.register do
-  #   use Sidekiq::Airbrake
-  #   use Sidekiq::ActiveRecord
-  # end
-  #
-  # This is an example of a minimal middleware:
-  #
-  # class MyHook
-  #   def initialize(options=nil)
-  #   end
-  #   def call(worker, msg)
-  #     puts "Before work"
-  #     yield
-  #     puts "After work"
-  #   end
-  # end
-  #
-  module Middleware
-    class Chain
-      def self.register(&block)
-        instance_exec(&block)
-      end
-
-      def self.default
-        @default ||= [Entry.new(Airbrake), Entry.new(ActiveRecord)]
-      end
-
-      def self.use(klass, *args)
-        chain << Entry.new(klass, args)
-      end
-
-      def self.chain
-        @chain ||= default
-      end
-
-      def self.retrieve
-        Thread.current[:sidekiq_chain] ||= chain.map { |entry| entry.make_new }
-      end
-    end
-
-    class Entry
-      attr_reader :klass
-      def initialize(klass, args = [])
-        @klass = klass
-        @args  = args
-      end
-
-      def make_new
-        @klass.new(*@args)
-      end
-    end
-  end
-
-  class Airbrake
-    def initialize(options=nil)
-    end
-
-    def call(worker, msg)
-      yield
-    rescue => ex
-      send_to_airbrake(msg, ex) if defined?(::Airbrake)
-      raise
-    end
-
-    private
-
-    def send_to_airbrake(msg, ex)
-      ::Airbrake.notify(:error_class   => ex.class.name,
-                        :error_message => "#{ex.class.name}: #{ex.message}",
-                        :parameters    => msg)
-    end
-  end
-
-  class ActiveRecord
-    def initialize(options=nil)
-    end
-
-    def call(*)
-      yield
-    ensure
-      ::ActiveRecord::Base.clear_active_connections! if defined?(::ActiveRecord)
-    end
-  end
-end