sidekiq 0.8.0 → 0.9.0

data/test/test_manager.rb

@@ -8,9 +8,8 @@ require 'connection_pool'
 class TestManager < MiniTest::Unit::TestCase
   describe 'with redis' do
     before do
-      Sidekiq.redis = { :url => 'redis://localhost/sidekiq_test' }
-      @redis = Sidekiq.redis
-      @redis.flushdb
+      Sidekiq.redis = REDIS
+      Sidekiq.redis.flushdb
       $processed = 0
       $mutex = Mutex.new
     end

data/test/test_middleware.rb

@@ -6,7 +6,7 @@ require 'sidekiq/processor'
 class TestMiddleware < MiniTest::Unit::TestCase
   describe 'middleware chain' do
     before do
-      Sidekiq.redis = { :url => 'redis://localhost/sidekiq_test' }
+      Sidekiq.redis = REDIS
     end
 
     class CustomMiddleware

data/test/test_stats.rb

@@ -5,48 +5,50 @@ require 'sidekiq/processor'
 class TestStats < MiniTest::Unit::TestCase
   describe 'with redis' do
     before do
-      Sidekiq.redis = { :url => 'redis://localhost/sidekiq_test' }
-      @redis = Sidekiq.redis
-      @redis.flushdb
+      @redis = Sidekiq.redis = REDIS
+      Sidekiq.redis.flushdb
     end
 
     class DumbWorker
       include Sidekiq::Worker
 
-      def perform(redis)
-        raise 'bang' if redis == nil
+      def perform(arg)
+        raise 'bang' if arg == nil
       end
     end
 
     it 'updates global stats in the success case' do
-      msg = { 'class' => DumbWorker.to_s, 'args' => [@redis] }
+      msg = { 'class' => DumbWorker.to_s, 'args' => [""] }
       boss = MiniTest::Mock.new
 
-      set = @redis.smembers('workers')
-      assert_equal 0, set.size
+      @redis.with do |conn|
 
-      processor = Sidekiq::Processor.new(boss)
-      boss.expect(:processor_done!, nil, [processor])
+        set = conn.smembers('workers')
+        assert_equal 0, set.size
 
-      # adds to the workers set upon initialize
-      set = @redis.smembers('workers')
-      assert_equal 1, set.size
-      assert_match(/#{Regexp.escape(`hostname`.strip)}/, set.first)
+        processor = Sidekiq::Processor.new(boss)
+        boss.expect(:processor_done!, nil, [processor])
 
-      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
+        # adds to the workers set upon initialize
+        set = conn.smembers('workers')
+        assert_equal 1, set.size
+        assert_match(/#{Regexp.escape(`hostname`.strip)}/, set.first)
 
-      processor.process(msg, 'xyzzy')
-      processor.process(msg, 'xyzzy')
-      processor.process(msg, 'xyzzy')
+        assert_equal 0, conn.get('stat:failed').to_i
+        assert_equal 0, conn.get('stat:processed').to_i
+        assert_equal 0, conn.get("stat:processed:#{processor}").to_i
 
-      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
+        processor.process(msg, 'xyzzy')
+        processor.process(msg, 'xyzzy')
+        processor.process(msg, 'xyzzy')
+
+        set = conn.smembers('workers')
+        assert_equal 1, set.size
+        assert_match(/#{Regexp.escape(`hostname`.strip)}/, set.first)
+        assert_equal 0, conn.get('stat:failed').to_i
+        assert_equal 3, conn.get('stat:processed').to_i
+        assert_equal 3, conn.get("stat:processed:#{processor}").to_i
+      end
     end
 
     it 'updates global stats in the error case' do
@@ -72,8 +74,5 @@ class TestStats < MiniTest::Unit::TestCase
       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

@@ -1,5 +1,12 @@
 require 'helper'
+require 'sidekiq'
 require 'sidekiq/worker'
+require 'active_record'
+require 'action_mailer'
+require 'sidekiq/extensions/action_mailer'
+require 'sidekiq/extensions/active_record'
+
+Sidekiq.hook_rails!
 
 class TestTesting < MiniTest::Unit::TestCase
   describe 'sidekiq testing' do
@@ -11,22 +18,48 @@ class TestTesting < MiniTest::Unit::TestCase
       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
+    class FooMailer < ActionMailer::Base
+      def bar(str)
+        str
+      end
+    end
+
+    class FooModel < ActiveRecord::Base
+      def bar(str)
+        str
       end
     end
 
+    before do
+      require 'sidekiq/testing'
+    end
+
+    after do
+      # 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
+
+    it 'stubs the async call when in testing mode' do
+      # We can only have one it block here so all 'testing' tests
+      # have to go here because require 'sidekiq/testing' changes
+      # how Sidekiq works and we need to roll back those changes
+      # when the test is done.
+      assert_equal 0, DirectWorker.jobs.size
+      assert DirectWorker.perform_async(1, 2)
+      assert_equal 1, DirectWorker.jobs.size
+
+      assert_equal 0, Sidekiq::Extensions::DelayedMailer.jobs.size
+      FooMailer.delay.bar('hello!')
+      assert_equal 1, Sidekiq::Extensions::DelayedMailer.jobs.size
+
+      assert_equal 0, Sidekiq::Extensions::DelayedModel.jobs.size
+      FooModel.delay.bar('hello!')
+      assert_equal 1, Sidekiq::Extensions::DelayedModel.jobs.size
+    end
+
   end
 end

data/test/test_web.rb

@@ -0,0 +1,51 @@
+require 'helper'
+require 'sidekiq'
+require 'sidekiq/web'
+require 'rack/test'
+
+class TestWeb < MiniTest::Unit::TestCase
+  describe 'sidekiq web' do
+    include Rack::Test::Methods
+
+    def app
+      Sidekiq::Web
+    end
+
+    before do
+      Sidekiq.redis = REDIS
+      Sidekiq.redis.flushdb
+    end
+
+    class WebWorker
+      include Sidekiq::Worker
+
+      def perform(a, b)
+        a + b
+      end
+    end
+
+    it 'shows active queues' do
+      get '/'
+      assert_equal 200, last_response.status
+      assert_match last_response.body, /Sidekiq is down/
+      refute_match last_response.body, /default/
+
+      assert WebWorker.perform_async(1, 2)
+
+      get '/'
+      assert_equal 200, last_response.status
+      assert_match last_response.body, /Sidekiq is down/
+      assert_match last_response.body, /default/
+      refute_match last_response.body, /foo/
+
+      assert Sidekiq::Client.push(:foo, 'class' => WebWorker, 'args' => [1, 3])
+
+      get '/'
+      assert_equal 200, last_response.status
+      assert_match last_response.body, /Sidekiq is down/
+      assert_match last_response.body, /default/
+      assert_match last_response.body, /foo/
+    end
+
+  end
+end

data/web/assets/javascripts/application.js

@@ -0,0 +1,3 @@
+//= require vendor/jquery
+//= require bootstrap
+//= require_tree .

data/web/assets/javascripts/vendor/bootstrap.js

@@ -0,0 +1,12 @@
+//= require vendor/bootstrap/bootstrap-transition
+//= require vendor/bootstrap/bootstrap-alert
+//= require vendor/bootstrap/bootstrap-modal
+//= require vendor/bootstrap/bootstrap-dropdown
+//= require vendor/bootstrap/bootstrap-scrollspy
+//= require vendor/bootstrap/bootstrap-tab
+//= require vendor/bootstrap/bootstrap-tooltip
+//= require vendor/bootstrap/bootstrap-popover
+//= require vendor/bootstrap/bootstrap-button
+//= require vendor/bootstrap/bootstrap-collapse
+//= require vendor/bootstrap/bootstrap-carousel
+//= require vendor/bootstrap/bootstrap-typeahead

data/web/assets/javascripts/vendor/bootstrap/bootstrap-alert.js

@@ -0,0 +1,91 @@
+/* ==========================================================
+ * bootstrap-alert.js v2.0.0
+ * http://twitter.github.com/bootstrap/javascript.html#alerts
+ * ==========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+
+!function( $ ){
+
+  "use strict"
+
+ /* ALERT CLASS DEFINITION
+  * ====================== */
+
+  var dismiss = '[data-dismiss="alert"]'
+    , Alert = function ( el ) {
+        $(el).on('click', dismiss, this.close)
+      }
+
+  Alert.prototype = {
+
+    constructor: Alert
+
+  , close: function ( e ) {
+      var $this = $(this)
+        , selector = $this.attr('data-target')
+        , $parent
+
+      if (!selector) {
+        selector = $this.attr('href')
+        selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+      }
+
+      $parent = $(selector)
+      $parent.trigger('close')
+
+      e && e.preventDefault()
+
+      $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
+
+      $parent.removeClass('in')
+
+      function removeElement() {
+        $parent.remove()
+        $parent.trigger('closed')
+      }
+
+      $.support.transition && $parent.hasClass('fade') ?
+        $parent.on($.support.transition.end, removeElement) :
+        removeElement()
+    }
+
+  }
+
+
+ /* ALERT PLUGIN DEFINITION
+  * ======================= */
+
+  $.fn.alert = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('alert')
+      if (!data) $this.data('alert', (data = new Alert(this)))
+      if (typeof option == 'string') data[option].call($this)
+    })
+  }
+
+  $.fn.alert.Constructor = Alert
+
+
+ /* ALERT DATA-API
+  * ============== */
+
+  $(function () {
+    $('body').on('click.alert.data-api', dismiss, Alert.prototype.close)
+  })
+
+}( window.jQuery )

data/web/assets/javascripts/vendor/bootstrap/bootstrap-button.js

@@ -0,0 +1,98 @@
+/* ============================================================
+ * bootstrap-button.js v2.0.0
+ * http://twitter.github.com/bootstrap/javascript.html#buttons
+ * ============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+!function( $ ){
+
+  "use strict"
+
+ /* BUTTON PUBLIC CLASS DEFINITION
+  * ============================== */
+
+  var Button = function ( element, options ) {
+    this.$element = $(element)
+    this.options = $.extend({}, $.fn.button.defaults, options)
+  }
+
+  Button.prototype = {
+
+      constructor: Button
+
+    , setState: function ( state ) {
+        var d = 'disabled'
+          , $el = this.$element
+          , data = $el.data()
+          , val = $el.is('input') ? 'val' : 'html'
+
+        state = state + 'Text'
+        data.resetText || $el.data('resetText', $el[val]())
+
+        $el[val](data[state] || this.options[state])
+
+        // push to event loop to allow forms to submit
+        setTimeout(function () {
+          state == 'loadingText' ?
+            $el.addClass(d).attr(d, d) :
+            $el.removeClass(d).removeAttr(d)
+        }, 0)
+      }
+
+    , toggle: function () {
+        var $parent = this.$element.parent('[data-toggle="buttons-radio"]')
+
+        $parent && $parent
+          .find('.active')
+          .removeClass('active')
+
+        this.$element.toggleClass('active')
+      }
+
+  }
+
+
+ /* BUTTON PLUGIN DEFINITION
+  * ======================== */
+
+  $.fn.button = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('button')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('button', (data = new Button(this, options)))
+      if (option == 'toggle') data.toggle()
+      else if (option) data.setState(option)
+    })
+  }
+
+  $.fn.button.defaults = {
+    loadingText: 'loading...'
+  }
+
+  $.fn.button.Constructor = Button
+
+
+ /* BUTTON DATA-API
+  * =============== */
+
+  $(function () {
+    $('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) {
+      $(e.target).button('toggle')
+    })
+  })
+
+}( window.jQuery )