sidekiq 5.0.0.beta3 → 5.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59a5749b8cc8c03928f8c9666277388001a44429
-  data.tar.gz: e6c8f820c0ea4d8942cf192a51fe0ca2afbc054f
+  metadata.gz: 6d7e0b4092aa035c45d6dd4893cd470bb9a249d6
+  data.tar.gz: fbb9d06f9875133960daf397b8c338ca74c2d225
 SHA512:
-  metadata.gz: bf5423a3a9753e8dd014446d2f33b926b5388bcc6b8b34b2e26fe9b467a7b1e3d19e4490becee438c6f57ebcfbfea40ae51e3ffe3d8d23522e7db35ccde95c04
-  data.tar.gz: 16e37b35e549e4007bf7e4fa1fb4079a019a8f9bd22256d96175d09b5e9747c1bb63a77b2521256d5a25634d00a36c66463c420c3ec1cdd6b0646f6d2974a8f0
+  metadata.gz: f1dd673960ace0f7e30a09bb480de64265a64b997042b65c8cb0057757129def2005c75b6f017c3b5fb589681c2f2180e2f0b8f698f4ac63ef9bf44b641ad426
+  data.tar.gz: d9a1a3270d371bf7d7bddf98d103e6be2886a4dd6acbb08c1d5edd7b951b7f8d91d11e56c0892e10c6e6981f028ea8d64db5900cef0c3cb4023b91a9adbb30cd

data/5.0-Upgrade.md

@@ -33,11 +33,12 @@ versions of Ruby and Rails and adds support for RTL languages in the Web UI.
 * The Web UI is now bi-directional - it can render either LTR
   (left-to-right) or RTL languages. With this change, **Farsi, Arabic,
   Hebrew and Urdu** are officially supported. [#3381]
-* Rails 3.2 is no longer supported.
-* Ruby 2.0 and Ruby 2.1 are no longer supported. Ruby 2.2.2+ is required.
 * Jobs which can't be parsed due to invalid JSON are now pushed
   immediately to the Dead set since they require manual intervention and
-  will never execute successfully as is. [#3296]
+  will never execute successfully as is.  The Web UI has been updated to
+  more gracefully display these jobs. [#3296]
+* **Rails 3.2** is no longer supported.
+* **Ruby 2.0 and Ruby 2.1** are no longer supported. Ruby 2.2.2+ is required.
 
 ## Upgrade
 

data/Pro-Changes.md

@@ -6,6 +6,7 @@ Please see [http://sidekiq.org/](http://sidekiq.org/) for more details and how t
 HEAD
 ---------
 
+- Re-implement `Sidekiq::Queue#delete_job` to avoid O(n) runtime [#3408]
 - Batch page displays Pending JIDs if less than 10 [#3130]
 - Batch page has a Search button to find associated Retries [#3130]
 - Make Batch UI progress bar more friendly to the colorblind [#3387]

data/lib/sidekiq/api.rb

@@ -75,7 +75,7 @@ module Sidekiq
       enqueued     = pipe2_res[s..-1].map(&:to_i).inject(0, &:+)
 
       default_queue_latency = if (entry = pipe1_res[6].first)
-                                job = Sidekiq.load_json(entry)
+                                job = Sidekiq.load_json(entry) rescue {}
                                 now = Time.now.to_f
                                 thence = job['enqueued_at'.freeze] || now
                                 now - thence
@@ -287,13 +287,21 @@ module Sidekiq
     attr_reader :value
 
     def initialize(item, queue_name=nil)
+      @args = nil
       @value = item
-      @item = if item.is_a?(Hash)
-                item
-              else
-                Sidekiq.load_json(item) rescue nil
-              end
-      @queue = queue_name || self['queue']
+      @item = item.is_a?(Hash) ? item : parse(item)
+      @queue = queue_name || @item['queue']
+    end
+
+    def parse(item)
+      Sidekiq.load_json(item)
+    rescue JSON::ParserError
+      # If the job payload in Redis is invalid JSON, we'll load
+      # the item as an empty hash and store the invalid JSON as
+      # the job 'args' for display in the Web UI.
+      @invalid = true
+      @args = [item]
+      {}
     end
 
     def klass
@@ -341,7 +349,7 @@ module Sidekiq
     end
 
     def args
-      self['args']
+      @args || @item['args']
     end
 
     def jid

data/lib/sidekiq/client.rb

@@ -48,6 +48,7 @@ module Sidekiq
     #   queue - the named queue to use, default 'default'
     #   class - the worker class to call, required
     #   args - an array of simple arguments to the perform method, must be JSON-serializable
+    #   at - timestamp to schedule the job (optional), must be Numeric (e.g. Time.now.to_f)
     #   retry - whether to retry this job if it fails, default true or an integer number of retries
     #   backtrace - whether to save any error backtrace, default false
     #
@@ -212,6 +213,7 @@ module Sidekiq
       raise(ArgumentError, "Job must be a Hash with 'class' and 'args' keys: { 'class' => SomeWorker, 'args' => ['bob', 1, :foo => 'bar'] }") unless item.is_a?(Hash) && item.has_key?('class'.freeze) && item.has_key?('args'.freeze)
       raise(ArgumentError, "Job args must be an Array") unless item['args'].is_a?(Array)
       raise(ArgumentError, "Job class must be either a Class or String representation of the class name") unless item['class'.freeze].is_a?(Class) || item['class'.freeze].is_a?(String)
+      raise(ArgumentError, "Job 'at' must be a Numeric timestamp") if item.has_key?('at'.freeze) && !item['at'].is_a?(Numeric)
       #raise(ArgumentError, "Arguments must be native JSON types, see https://github.com/mperham/sidekiq/wiki/Best-Practices") unless JSON.load(JSON.dump(item['args'])) == item['args']
 
       normalized_hash(item['class'.freeze])

data/lib/sidekiq/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Sidekiq
-  VERSION = "5.0.0.beta3"
+  VERSION = "5.0.0.rc1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 5.0.0.beta3
+  version: 5.0.0.rc1
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-22 00:00:00.000000000 Z
+date: 2017-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis