sidekiq 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 154fd4d987e5f7c32fad42a20176d27e958bd49f
-  data.tar.gz: a33449473a2210e1f79e3f814c50f6fe982ff101
+  metadata.gz: 624586e09bcac2fc2e2a4a809f5ba7c66e270e05
+  data.tar.gz: dc0f6f0ba020ac0b846e89c8310918a87d4d00c1
 SHA512:
-  metadata.gz: 264d2c5a210a978ca8ce9f2a78962cc4f4d62966444788b7d942644881baec212133123f3434ffafdcc21d5bd9c0130eef007195a945f86771a33da5b2d1fbea
-  data.tar.gz: 6e651a3d38dd4518a3db01abd5febdb9a4c739d16873f2ce3ffa4998bd5f5a2285303437cc6f489cb43d032590bf741006d50170470c333ed31cfa62c1168178
+  metadata.gz: c707028cf7bc1549c8cf5a8410867f4709c304e9490a936490cd3c068b8449a0304a17f4855d49f2ee62f829326fc3be0063a87f86bb2af34a34ed0466e40a5b
+  data.tar.gz: cdbaa525bcb6d18b9f265f44d568c1d64d74c328c66c1d7d30fe2818d40fb4321330f532c708a76a8cd620cb545d6c86677e79c3b23bb8b520dd0d20edd1ae96

data/4.0-Upgrade.md

@@ -17,7 +17,7 @@ gem 'redis-namespace'
 * **Redis 2.8.0 or greater is required.**  Redis 2.8 was released two years
   ago and contains **many** useful features which Sidekiq couldn't
   leverage until now.  **Redis 3.0.3 or greater is recommended** for large
-  scale use.
+  scale use [#2431](https://github.com/mperham/sidekiq/issues/2431).
 
 * Jobs are now fetched from Redis in parallel, making Sidekiq more
   resilient to high network latency.  This means that Sidekiq requires
@@ -25,16 +25,6 @@ gem 'redis-namespace'
   `concurrency + 2` connections in your pool or Sidekiq will exit.
   When in doubt, let Sidekiq size the connection pool for you.
 
-* There's a new testing API based off the `Sidekiq::Queues` namespace. All
-  assertions made against the Worker class still work as expected.
-```ruby
-assert_equal 0, Sidekiq::Queues["default"].size
-HardWorker.perform_async("log")
-assert_equal 1, Sidekiq::Queues["default"].size
-assert_equal "log", Sidekiq::Queues["default"].first['args'][0]
-Sidekiq::Queues.clear_all
-```
-
 ## Upgrade
 
 First, make sure you are using Redis 2.8 or greater. Next:

data/Changes.md

@@ -1,22 +1,18 @@
 # Sidekiq Changes
 
-4.0.0.pre1
+4.0.1
+-----------
+
+- Yank new queue-based testing API [#2663]
+- Fix invalid constant reference in heartbeat
+
+4.0.0
 -----------
 
 - Sidekiq's internals have been completely overhauled for performance
   and to remove dependencies.  This has resulted in major speedups, as
   [detailed on my blog](http://www.mikeperham.com/2015/10/14/optimizing-sidekiq/).
 - See the [4.0 upgrade notes](4.0-Upgrade.md) for more detail.
-- There's a new testing API based off the `Sidekiq::Queues` namespace. All
-  assertions made against the Worker class still work as expected.
-  [#2659, brandonhilkert]
-```ruby
-assert_equal 0, Sidekiq::Queues["default"].size
-HardWorker.perform_async("log")
-assert_equal 1, Sidekiq::Queues["default"].size
-assert_equal "log", Sidekiq::Queues["default"].first['args'][0]
-Sidekiq::Queues.clear_all
-```
 
 3.5.3
 -----------

data/lib/sidekiq/launcher.rb

@@ -112,8 +112,8 @@ module Sidekiq
         # ignore all redis/network issues
         logger.error("heartbeat: #{e.message}")
         # don't lose the counts if there was a network issue
-        PROCESSED.increment(procd)
-        FAILURE.increment(fails)
+        Processor::PROCESSED.increment(procd)
+        Processor::FAILURE.increment(fails)
       end
     end
 

data/lib/sidekiq/testing.rb

@@ -68,15 +68,15 @@ module Sidekiq
     def raw_push(payloads)
       if Sidekiq::Testing.fake?
         payloads.each do |job|
-          Queues.jobs[job['queue']] << Sidekiq.load_json(Sidekiq.dump_json(job))
+          job['class'].constantize.jobs << Sidekiq.load_json(Sidekiq.dump_json(job))
         end
         true
       elsif Sidekiq::Testing.inline?
         payloads.each do |job|
+          job['jid'] ||= SecureRandom.hex(12)
           klass = job['class'].constantize
-          job['id'] ||= SecureRandom.hex(12)
-          job_hash = Sidekiq.load_json(Sidekiq.dump_json(job))
-          klass.process_job(job_hash)
+          klass.jobs.unshift Sidekiq.load_json(Sidekiq.dump_json(job))
+          klass.perform_one
         end
         true
       else
@@ -85,64 +85,6 @@ module Sidekiq
     end
   end
 
-  module Queues
-    ##
-    # The Queues class is only for testing the fake queue implementation.
-    # The data is structured as a hash with queue name as hash key and array
-    # of job data as the value.
-    #
-    # {
-    #   "default"=>[
-    #     {
-    #       "class"=>"TestTesting::QueueWorker",
-    #       "args"=>[1, 2],
-    #       "retry"=>true,
-    #       "queue"=>"default",
-    #       "jid"=>"abc5b065c5c4b27fc1102833",
-    #       "created_at"=>1447445554.419934
-    #     }
-    #   ]
-    # }
-    #
-    # Example:
-    #
-    #   require 'sidekiq/testing'
-    #
-    #   assert_equal 0, Sidekiq::Queues["default"].size
-    #   HardWorker.perform_async(:something)
-    #   assert_equal 1, Sidekiq::Queues["default"].size
-    #   assert_equal :something, Sidekiq::Queues["default"].first['args'][0]
-    #
-    # You can also clear all workers' jobs:
-    #
-    #   assert_equal 0, Sidekiq::Queues["default"].size
-    #   HardWorker.perform_async(:something)
-    #   Sidekiq::Queues.clear_all
-    #   assert_equal 0, Sidekiq::Queues["default"].size
-    #
-    # This can be useful to make sure jobs don't linger between tests:
-    #
-    #   RSpec.configure do |config|
-    #     config.before(:each) do
-    #       Sidekiq::Queues.clear_all
-    #     end
-    #   end
-    #
-    class << self
-      def [](queue)
-        jobs[queue.to_s]
-      end
-
-      def jobs
-        @jobs ||= Hash.new { |hash, key| hash[key] = [] }
-      end
-
-      def clear_all
-        jobs.clear
-      end
-    end
-  end
-
   module Worker
     ##
     # The Sidekiq testing infrastructure overrides perform_async
@@ -201,36 +143,28 @@ module Sidekiq
     #
     module ClassMethods
 
-      # Queue for this worker
-      def queue
-        self.sidekiq_options["queue"].to_s
-      end
-
       # Jobs queued for this worker
       def jobs
-        Queues.jobs[queue].select { |job| job["class"] == self.to_s }
+        Worker.jobs[self]
       end
 
       # Clear all jobs for this worker
       def clear
-        Queues.jobs[queue].clear
+        jobs.clear
       end
 
       # Drain and run all jobs for this worker
       def drain
-        while jobs.any?
-          next_job = jobs.first
-          Queues.jobs[queue].delete_if { |job| job["jid"] == next_job["jid"] }
-          process_job(next_job)
+        while job = jobs.shift do
+          process_job(job)
         end
       end
 
       # Pop out a single job and perform it
       def perform_one
         raise(EmptyQueueError, "perform_one called with empty job queue") if jobs.empty?
-        next_job = jobs.first
-        Queues.jobs[queue].delete_if { |job| job["jid"] == next_job["jid"] }
-        process_job(next_job)
+        job = jobs.shift
+        process_job(job)
       end
 
       def process_job(job)
@@ -249,22 +183,18 @@ module Sidekiq
 
     class << self
       def jobs # :nodoc:
-        Queues.jobs.values.flatten
+        @jobs ||= Hash.new { |hash, key| hash[key] = [] }
       end
 
       # Clear all queued jobs across all workers
       def clear_all
-        Queues.clear_all
+        jobs.clear
       end
 
       # Drain all queued jobs across all workers
       def drain_all
-        while jobs.any?
-          worker_classes = jobs.map { |job| job["class"] }.uniq
-
-          worker_classes.each do |worker_class|
-            worker_class.constantize.drain
-          end
+        until jobs.values.all?(&:empty?) do
+          jobs.keys.each(&:drain)
         end
       end
     end

data/lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "4.0.0"
+  VERSION = "4.0.1"
 end

data/test/test_testing_fake.rb

@@ -54,7 +54,6 @@ class TestTesting < Sidekiq::Test
 
     after do
       Sidekiq::Testing.disable!
-      Sidekiq::Queues.clear_all
     end
 
     it 'stubs the async call' do
@@ -94,7 +93,7 @@ class TestTesting < Sidekiq::Test
     it 'stubs the enqueue_to call' do
       assert_equal 0, EnqueuedWorker.jobs.size
       assert Sidekiq::Client.enqueue_to('someq', EnqueuedWorker, 1, 2)
-      assert_equal 1, Sidekiq::Queues['someq'].size
+      assert_equal 1, EnqueuedWorker.jobs.size
     end
 
     it 'executes all stored jobs' do
@@ -264,68 +263,6 @@ class TestTesting < Sidekiq::Test
     it 'can execute a job' do
       DirectWorker.execute_job(DirectWorker.new, [2, 3])
     end
-  end
-
-  describe 'queue testing' do
-    before do
-      require 'sidekiq/testing'
-      Sidekiq::Testing.fake!
-    end
-
-    after do
-      Sidekiq::Testing.disable!
-      Sidekiq::Queues.clear_all
-    end
 
-    class QueueWorker
-      include Sidekiq::Worker
-      def perform(a, b)
-        a + b
-      end
-    end
-
-    class AltQueueWorker
-      include Sidekiq::Worker
-      sidekiq_options queue: :alt
-      def perform(a, b)
-        a + b
-      end
-    end
-
-    it 'finds enqueued jobs' do
-      assert_equal 0, Sidekiq::Queues["default"].size
-
-      QueueWorker.perform_async(1, 2)
-      QueueWorker.perform_async(1, 2)
-      AltQueueWorker.perform_async(1, 2)
-
-      assert_equal 2, Sidekiq::Queues["default"].size
-      assert_equal [1, 2], Sidekiq::Queues["default"].first["args"]
-
-      assert_equal 1, Sidekiq::Queues["alt"].size
-    end
-
-    it 'clears out all queues' do
-      assert_equal 0, Sidekiq::Queues["default"].size
-
-      QueueWorker.perform_async(1, 2)
-      QueueWorker.perform_async(1, 2)
-      AltQueueWorker.perform_async(1, 2)
-
-      Sidekiq::Queues.clear_all
-
-      assert_equal 0, Sidekiq::Queues["default"].size
-      assert_equal 0, Sidekiq::Queues["alt"].size
-    end
-
-    it 'finds jobs enqueued by client' do
-      Sidekiq::Client.push(
-        'class' => 'NonExistentWorker',
-        'queue' => 'missing',
-        'args' => [1]
-      )
-
-      assert_equal 1, Sidekiq::Queues["missing"].size
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2015-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis