sidekiq 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 624586e09bcac2fc2e2a4a809f5ba7c66e270e05
-  data.tar.gz: dc0f6f0ba020ac0b846e89c8310918a87d4d00c1
+  metadata.gz: 981fa47de9add237cde6413d7e97aa70726ae757
+  data.tar.gz: 52151d63cf02724358c925155d8f3471f453fe75
 SHA512:
-  metadata.gz: c707028cf7bc1549c8cf5a8410867f4709c304e9490a936490cd3c068b8449a0304a17f4855d49f2ee62f829326fc3be0063a87f86bb2af34a34ed0466e40a5b
-  data.tar.gz: cdbaa525bcb6d18b9f265f44d568c1d64d74c328c66c1d7d30fe2818d40fb4321330f532c708a76a8cd620cb545d6c86677e79c3b23bb8b520dd0d20edd1ae96
+  metadata.gz: 977c16381346d0fea1968ecd4d8efd2a5b900e0a0a4e4017c21fddeb910977b716959a7d8cb6515260ee4da4f58fe645a13a75b0985663594798e2f80980dcea
+  data.tar.gz: 2852d63ccf3686dfa438d468fdc6593ad25cd95c2f727d0c0e71625ab0c6fa42af394826105a0b7a12d103c635ea6beff8d2fb757e2ea53ef7bfb8c8785ad6e0

data/.travis.yml

@@ -4,9 +4,10 @@ cache: bundler
 services:
   - redis-server
 rvm:
-  - 2.1
+  - 2.1.7
   - 2.0.0
-  - 2.2
+  - 2.2.4
+  - 2.3.0
   - jruby
   - jruby-head
   - rbx-2

data/4.0-Upgrade.md

@@ -25,6 +25,16 @@ 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,5 +1,21 @@
 # Sidekiq Changes
 
+4.0.2
+-----------
+
+- Better Japanese translations
+- Remove `json` gem dependency from gemspec. [#2743]
+- There's a new testing API based off the `Sidekiq::Queues` namespace. All
+  assertions made against the Worker class still work as expected.
+  [#2676, 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
+```
+
 4.0.1
 -----------
 
@@ -41,7 +57,7 @@
 -----------
 
 - **FIX MEMORY LEAK** Under rare conditions, threads may leak [#2598, gazay]
-- Add Ukranian locale [#2561, elrakita]
+- Add Ukrainian locale [#2561, elrakita]
 - Disconnect and retry Redis operations if we see a READONLY error [#2550]
 - Add server middleware testing harness; see [wiki](https://github.com/mperham/sidekiq/wiki/Testing#testing-server-middleware) [#2534, ryansch]
 

data/Ent-Changes.md

@@ -3,7 +3,20 @@ Sidekiq Enterprise Changelog
 
 Please see [http://sidekiq.org/](http://sidekiq.org/) for more details and how to buy.
 
-1.0.0.pre1
+0.7.9, 1.0.2
+-------------
+
+- Window limiters can now accept arbitrary window sizes [#2686]
+- Fix race condition in window limiters leading to non-stop OverLimit [#2704]
+- Fix invalid overage counts when nesting concurrent limiters
+
+1.0.1
+----------
+
+- Fix crash in periodic subsystem when a follower shuts down, thanks
+  to @justinko for reporting.
+
+1.0.0
 ----------
 
 - Enterprise 1.x targets Sidekiq 4.x.

data/Pro-Changes.md

@@ -3,12 +3,7 @@ Sidekiq Pro Changelog
 
 Please see [http://sidekiq.org/](http://sidekiq.org/) for more details and how to buy.
 
-3.0.0.pre2
------------
-
-- Fix excessive connection usage by reliable fetch.
-
-3.0.0.pre1
+3.0.0
 -----------
 
 - See the [Pro 3.0 release notes](Pro-3.0-Upgrade.md).

data/README.md

@@ -18,21 +18,26 @@ message format as Resque so it can integrate into an existing Resque processing
 You can have Sidekiq and Resque run side-by-side at the same time and
 use the Resque client to enqueue jobs in Redis to be processed by Sidekiq.
 
-At the same time, Sidekiq uses multithreading so it is much more memory efficient than
-Resque (which forks a new process for every job).  You'll find that you might need
-10 200MB resque processes to peg your CPU whereas one 300MB Sidekiq process will peg
-the same CPU and perform the same amount of work.
+Sidekiq is fast.
+
+Version |	Latency | Garbage created for 10,000 jobs	| Time to process 100,000 jobs |	Throughput
+-----------------|------|---------|---------|------------------------
+Sidekiq 4.0.0    | 10ms	| 151 MB  | 22 sec  | **4500 jobs/sec**
+Sidekiq 3.5.1    | 22ms	| 1257 MB | 125 sec | 800 jobs/sec
+Resque 1.25.2    |  -	  | -       | 420 sec | 240 jobs/sec
+DelayedJob 4.1.1 |  -   | -       | 465 sec | 215 jobs/sec
 
 
 Requirements
 -----------------
 
-I test with the latest MRI (2.2, 2.1 and 2.0) and JRuby versions (1.7).  Other versions/VMs
-are untested but might work fine.  MRI 1.9 is no longer supported.
+I test with the latest CRuby (2.2, 2.1 and 2.0) and JRuby versions (9k).  Other versions/VMs
+are untested but might work fine.  CRuby 1.9 is not supported.
 
-All Rails releases starting from 3.2 are officially supported.
+All Rails releases from 3.2 are officially supported.
 
-Redis 2.8 or greater is required.
+Redis 2.8 or greater is required.  3.0.3+ is recommended for large
+installations with thousands of worker threads.
 
 
 Installation

data/bin/sidekiq

@@ -3,7 +3,6 @@
 # Quiet some warnings we see when running in warning mode:
 # RUBYOPT=-w bundle exec sidekiq
 $TESTING = false
-$CELLULOID_DEBUG = false
 
 require_relative '../lib/sidekiq/cli'
 

data/lib/generators/sidekiq/templates/worker_spec.rb.erb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 <% module_namespacing do -%>
-RSpec.describe <%= class_name %>Worker, :type => :worker do
+RSpec.describe <%= class_name %>Worker, type: :worker do
     pending "add some examples to (or delete) #{__FILE__}"
 end
-<% end -%>
+<% end -%>

data/lib/generators/sidekiq/templates/worker_test.rb.erb

@@ -1,8 +1,8 @@
 require_relative 'test_helper'
 <% module_namespacing do -%>
-class <%= class_name %>WorkerTest < MiniTest::Unit::TestCase
-    def test_example
-      skip "add some examples to (or delete) #{__FILE__}"
-    end
+class <%= class_name %>WorkerTest < <% if defined? Minitest::Test %>Minitest::Test<% else %>MiniTest::Unit::TestCase<% end %>
+  def test_example
+    skip "add some examples to (or delete) #{__FILE__}"
+  end
 end
-<% end -%>
+<% end -%>

data/lib/sidekiq/api.rb

@@ -283,7 +283,13 @@ module Sidekiq
                      "#{target}.#{method}"
                    end
                  when "ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper"
-                   @item['wrapped'] || args[0]
+                   job_class = @item['wrapped'] || args[0]
+                   if 'ActionMailer::DeliveryJob' == job_class
+                     # MailerClass#mailer_method
+                     args[0]['arguments'][0..1].join('#')
+                   else
+                    job_class
+                   end
                  else
                    klass
                  end
@@ -297,7 +303,13 @@ module Sidekiq
                     arg
                   end
                 when "ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper"
-                  @item['wrapped'] ? args[0]["arguments"] : []
+                  job_args = @item['wrapped'] ? args[0]["arguments"] : []
+                  if 'ActionMailer::DeliveryJob' == (@item['wrapped'] || args[0])
+                   # remove MailerClass, mailer_method and 'deliver_now'
+                   job_args.drop(3)
+                  else
+                   job_args
+                  end
                 else
                   args
                 end

data/lib/sidekiq/fetch.rb

@@ -12,7 +12,7 @@ module Sidekiq
       end
 
       def queue_name
-        queue.gsub(/.*queue:/, ''.freeze)
+        queue.sub(/.*queue:/, ''.freeze)
       end
 
       def requeue

data/lib/sidekiq/manager.rb

@@ -55,6 +55,8 @@ module Sidekiq
       fire_event(:quiet, true)
     end
 
+    PAUSE_TIME = $TESTING ? 0.1 : 0.5
+
     def stop(deadline)
       quiet
       fire_event(:shutdown, true)
@@ -62,14 +64,14 @@ module Sidekiq
       # some of the shutdown events can be async,
       # we don't have any way to know when they're done but
       # give them a little time to take effect
-      sleep 0.5
+      sleep PAUSE_TIME
       return if @workers.empty?
 
       logger.info { "Pausing to allow workers to finish..." }
       remaining = deadline - Time.now
-      while remaining > 0.5
+      while remaining > PAUSE_TIME
         return if @workers.empty?
-        sleep 0.5
+        sleep PAUSE_TIME
         remaining = deadline - Time.now
       end
       return if @workers.empty?

data/lib/sidekiq/middleware/server/logging.rb

@@ -7,11 +7,11 @@ module Sidekiq
           Sidekiq::Logging.with_context(log_context(worker, item)) do
             begin
               start = Time.now
-              logger.info { "start" }
+              logger.info("start".freeze)
               yield
-              logger.info { "done: #{elapsed(start)} sec" }
+              logger.info("done: #{elapsed(start)} sec")
             rescue Exception
-              logger.info { "fail: #{elapsed(start)} sec" }
+              logger.info("fail: #{elapsed(start)} sec")
               raise
             end
           end

data/lib/sidekiq/middleware/server/retry_jobs.rb

@@ -96,7 +96,7 @@ module Sidekiq
 
           # App code can stuff all sorts of crazy binary data into the error message
           # that won't convert to JSON.
-          m = exception.message[0..10_000]
+          m = exception.message.to_s[0, 10_000]
           if m.respond_to?(:scrub!)
             m.force_encoding("utf-8")
             m.scrub!

data/lib/sidekiq/testing.rb

@@ -68,15 +68,15 @@ module Sidekiq
     def raw_push(payloads)
       if Sidekiq::Testing.fake?
         payloads.each do |job|
-          job['class'].constantize.jobs << Sidekiq.load_json(Sidekiq.dump_json(job))
+          Queues.push(job['queue'], job['class'], 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
-          klass.jobs.unshift Sidekiq.load_json(Sidekiq.dump_json(job))
-          klass.perform_one
+          job['id'] ||= SecureRandom.hex(12)
+          job_hash = Sidekiq.load_json(Sidekiq.dump_json(job))
+          klass.process_job(job_hash)
         end
         true
       else
@@ -85,6 +85,107 @@ module Sidekiq
     end
   end
 
+  module Queues
+    ##
+    # The Queues class is only for testing the fake queue implementation.
+    # There are 2 data structures involved in tandem. This is due to the
+    # Rspec syntax of change(QueueWorker.jobs, :size). It keeps a reference
+    # to the array. Because the array was dervied from a filter of the total
+    # jobs enqueued, it appeared as though the array didn't change.
+    #
+    # To solve this, we'll keep 2 hashes containing the jobs. One with keys based
+    # on the queue, and another with keys of the worker names, so the array for
+    # QueueWorker.jobs is a straight reference to a real array.
+    #
+    # Queue-based hash:
+    #
+    # {
+    #   "default"=>[
+    #     {
+    #       "class"=>"TestTesting::QueueWorker",
+    #       "args"=>[1, 2],
+    #       "retry"=>true,
+    #       "queue"=>"default",
+    #       "jid"=>"abc5b065c5c4b27fc1102833",
+    #       "created_at"=>1447445554.419934
+    #     }
+    #   ]
+    # }
+    #
+    # Worker-based hash:
+    #
+    # {
+    #   "TestTesting::QueueWorker"=>[
+    #     {
+    #       "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_by_queue[queue]
+      end
+
+      def push(queue, klass, job)
+        jobs_by_queue[queue] << job
+        jobs_by_worker[klass] << job
+      end
+
+      def jobs_by_queue
+        @jobs_by_queue ||= Hash.new { |hash, key| hash[key] = [] }
+      end
+
+      def jobs_by_worker
+        @jobs_by_worker ||= Hash.new { |hash, key| hash[key] = [] }
+      end
+
+      def delete_for(jid, queue, klass)
+        jobs_by_queue[queue].delete_if { |job| job["jid"] == jid }
+        jobs_by_worker[klass].delete_if { |job| job["jid"] == jid }
+      end
+
+      def clear_for(queue, klass)
+        jobs_by_queue[queue].clear
+        jobs_by_worker[klass].clear
+      end
+
+      def clear_all
+        jobs_by_queue.clear
+        jobs_by_worker.clear
+      end
+    end
+  end
+
   module Worker
     ##
     # The Sidekiq testing infrastructure overrides perform_async
@@ -143,28 +244,36 @@ module Sidekiq
     #
     module ClassMethods
 
+      # Queue for this worker
+      def queue
+        self.sidekiq_options["queue"]
+      end
+
       # Jobs queued for this worker
       def jobs
-        Worker.jobs[self]
+        Queues.jobs_by_worker[self.to_s]
       end
 
       # Clear all jobs for this worker
       def clear
-        jobs.clear
+        Queues.clear_for(queue, self.to_s)
       end
 
       # Drain and run all jobs for this worker
       def drain
-        while job = jobs.shift do
-          process_job(job)
+        while jobs.any?
+          next_job = jobs.first
+          Queues.delete_for(next_job["jid"], queue, self.to_s)
+          process_job(next_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?
-        job = jobs.shift
-        process_job(job)
+        next_job = jobs.first
+        Queues.delete_for(next_job["jid"], queue, self.to_s)
+        process_job(next_job)
       end
 
       def process_job(job)
@@ -183,18 +292,22 @@ module Sidekiq
 
     class << self
       def jobs # :nodoc:
-        @jobs ||= Hash.new { |hash, key| hash[key] = [] }
+        Queues.jobs_by_queue.values.flatten
       end
 
       # Clear all queued jobs across all workers
       def clear_all
-        jobs.clear
+        Queues.clear_all
       end
 
       # Drain all queued jobs across all workers
       def drain_all
-        until jobs.values.all?(&:empty?) do
-          jobs.keys.each(&:drain)
+        while jobs.any?
+          worker_classes = jobs.map { |job| job["class"] }.uniq
+
+          worker_classes.each do |worker_class|
+            worker_class.constantize.drain
+          end
         end
       end
     end

data/lib/sidekiq/version.rb

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

data/lib/sidekiq/web.rb

@@ -12,7 +12,7 @@ module Sidekiq
     include Sidekiq::Paginator
 
     enable :sessions
-    use Rack::Protection, :use => :authenticity_token unless ENV['RACK_ENV'] == 'test'
+    use ::Rack::Protection, :use => :authenticity_token unless ENV['RACK_ENV'] == 'test'
 
     set :root, File.expand_path(File.dirname(__FILE__) + "/../../web")
     set :public_folder, proc { "#{root}/assets" }

data/lib/sidekiq/web_helpers.rb

@@ -17,8 +17,13 @@ module Sidekiq
       end
     end
 
+    def clear_caches
+      @@strings = nil
+      @@locale_files = nil
+    end
+
     def locale_files
-      @@locale_files = settings.locales.flat_map do |path|
+      @@locale_files ||= settings.locales.flat_map do |path|
         Dir["#{path}/*.yml"]
       end
     end
@@ -193,6 +198,7 @@ module Sidekiq
       queue class args retry_count retried_at failed_at
       jid error_message error_class backtrace
       error_backtrace enqueued_at retry wrapped
+      created_at
     ))
 
     def retry_extra_items(retry_job)

data/lib/sidekiq/worker.rb

@@ -54,6 +54,8 @@ module Sidekiq
         client_push('class' => self, 'args' => args)
       end
 
+      # +interval+ must be a timestamp, numeric or something that acts
+      #   numeric (like an activesupport time interval).
       def perform_in(interval, *args)
         int = interval.to_f
         now = Time.now

data/sidekiq.gemspec

@@ -17,7 +17,6 @@ Gem::Specification.new do |gem|
   gem.version       = Sidekiq::VERSION
   gem.add_dependency                  'redis', '~> 3.2', '>= 3.2.1'
   gem.add_dependency                  'connection_pool', '~> 2.2', '>= 2.2.0'
-  gem.add_dependency                  'json', '~> 1.0'
   gem.add_dependency                  'concurrent-ruby', '~> 1.0'
   gem.add_development_dependency      'redis-namespace', '~> 1.5', '>= 1.5.2'
   gem.add_development_dependency      'sinatra', '~> 1.4', '>= 1.4.6'

data/test/test_api.rb

@@ -1,5 +1,7 @@
 require_relative 'helper'
 require 'sidekiq/api'
+require 'active_job'
+require 'action_mailer'
 
 class TestApi < Sidekiq::Test
   describe 'api' do
@@ -168,6 +170,21 @@ class TestApi < Sidekiq::Test
         assert_equal 0, q.latency
       end
 
+      before do
+        ActiveJob::Base.queue_adapter = :sidekiq
+        ActiveJob::Base.logger = nil
+
+        class ApiMailer < ActionMailer::Base
+          def test_email(*)
+          end
+        end
+
+        class ApiJob < ActiveJob::Base
+          def perform(*)
+          end
+        end
+      end
+
       class ApiWorker
         include Sidekiq::Worker
       end
@@ -203,6 +220,22 @@ class TestApi < Sidekiq::Test
         assert_equal [1,2,3], x.display_args
       end
 
+      it 'unwraps ActiveJob jobs' do
+        ApiJob.perform_later(1, 2, 3)
+        q = Sidekiq::Queue.new
+        x = q.first
+        assert_equal "TestApi::ApiJob", x.display_class
+        assert_equal [1,2,3], x.display_args
+      end
+
+      it 'unwraps ActionMailer jobs' do
+        ApiMailer.test_email(1, 2, 3).deliver_later
+        q = Sidekiq::Queue.new('mailers')
+        x = q.first
+        assert_equal "TestApi::ApiMailer#test_email", x.display_class
+        assert_equal [1,2,3], x.display_args
+      end
+
       it 'has no enqueued_at time for jobs enqueued in the future' do
         job_id = ApiWorker.perform_in(100, 1, 'foo')
         job = Sidekiq::ScheduledSet.new.find_job(job_id)

data/test/test_testing_fake.rb

@@ -54,6 +54,7 @@ class TestTesting < Sidekiq::Test
 
     after do
       Sidekiq::Testing.disable!
+      Sidekiq::Queues.clear_all
     end
 
     it 'stubs the async call' do
@@ -93,7 +94,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, EnqueuedWorker.jobs.size
+      assert_equal 1, Sidekiq::Queues['someq'].size
     end
 
     it 'executes all stored jobs' do
@@ -263,6 +264,83 @@ 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, QueueWorker.jobs.size
+      assert_equal 0, Sidekiq::Queues["alt"].size
+      assert_equal 0, AltQueueWorker.jobs.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
+
+    it 'respects underlying array changes' do
+      # Rspec expect change() syntax saves a reference to
+      # an underlying array. When the array containing jobs is
+      # derived, Rspec test using `change(QueueWorker.jobs, :size).by(1)`
+      # won't pass. This attempts to recreate that scenario
+      # by saving a reference to the jobs array and ensuring
+      # it changes properly on enqueueing
+      jobs = QueueWorker.jobs
+      assert_equal 0, jobs.size
+      QueueWorker.perform_async(1, 2)
+      assert_equal 1, jobs.size
+    end
   end
 end

data/test/test_web.rb

@@ -369,19 +369,24 @@ class TestWeb < Sidekiq::Test
       assert_equal 200, last_response.status
     end
 
-    Sidekiq::Web.settings.locales << File.join(File.dirname(__FILE__), "fixtures")
-    it 'can show user defined tab with custom locales' do
-      begin
+    describe 'custom locales' do
+      before do
+        Sidekiq::Web.settings.locales << File.join(File.dirname(__FILE__), "fixtures")
         Sidekiq::Web.tabs['Custom Tab'] = '/custom'
         Sidekiq::Web.get('/custom') do
+          clear_caches # ugly hack since I can't figure out how to access WebHelpers outside of this context
           t('translated_text')
         end
+      end
 
+      after do
+        Sidekiq::Web.tabs.delete 'Custom Tab'
+        Sidekiq::Web.settings.locales.pop
+      end
+
+      it 'can show user defined tab with custom locales' do
         get '/custom'
         assert_match(/Changed text/, last_response.body)
-
-      ensure
-        Sidekiq::Web.tabs.delete 'Custom Tab'
       end
     end
 

data/web/locales/en.yml

@@ -75,3 +75,4 @@ en: # <---- change this to your locale code
   PollingInterval: Polling interval
   Plugins: Plugins
   NotYetEnqueued: Not yet enqueued
+  CreatedAt: Created At

data/web/locales/fr.yml

@@ -64,6 +64,6 @@ fr:
   NoDeadJobsFound: Aucune tâche morte n'a été trouvée
   Dead: Morte
   Processes: Processus
-  Thread: Fil
-  Threads: Fils
+  Thread: Thread
+  Threads: Threads
   Jobs: Tâches

data/web/locales/ja.yml

@@ -38,7 +38,7 @@ ja:
   AreYouSure: いいですか？
   DeleteAll: 全て削除
   RetryAll: 全て再試行
-  NoRetriesFound: 再試行できません
+  NoRetriesFound: 再試行するジョブはありません
   Error: エラー
   ErrorClass: クラスエラー
   ErrorMessage: エラーメッセージ
@@ -67,3 +67,12 @@ ja:
   Thread: スレッド
   Threads: スレッド
   Jobs: ジョブ
+  Paused: 一時停止中
+  Stop: 停止
+  Quiet: 処理終了
+  StopAll: すべて停止
+  QuietAll: すべて処理終了
+  PollingInterval: ポーリング間隔
+  Plugins: プラグイン
+  NotYetEnqueued: キューに入っていません
+  CreatedAt: 作成日時

data/web/views/_job_info.erb

@@ -32,6 +32,10 @@
           <code><%= job.jid %></code>
         </td>
       </tr>
+      <tr>
+        <th><%= t('CreatedAt') %></th>
+        <td><%= relative_time(job.created_at) %></td>
+      </tr>
       <tr>
         <th><%= t('Enqueued') %></th>
         <td><%= (enqueued_at = job.enqueued_at) ? relative_time(enqueued_at) : t('NotYetEnqueued') %></td>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -50,20 +50,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.0
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -381,7 +367,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Simple, efficient background processing for Ruby