sidekiq 5.0.2 → 5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6db9036e4fbbebc0c7165ea071b649f5337dea8
-  data.tar.gz: ceb58baac04eeeb9070635c0493bdfdeccb7e332
+  metadata.gz: 6c3542376ef438c3df60b3dd7aff6a49686395c5
+  data.tar.gz: d5f6869758d9897a54f71d3b4c0eff4544d3c4eb
 SHA512:
-  metadata.gz: 193169c31f16a9331b8f8f8a415ba7ced5d5e4ae09b3cfa72287444ec179b9bf48a9aceddeefd3b5f26fcf338040a1b03e4ef6a8b06bec82e00bd52d2dbb7f87
-  data.tar.gz: 70aeb283e8720dd88f8d6f7f38d1d8161ba24bdb39a8d01a851ea1876ee38c28ac6ab18575d96012fcb946c28ac6f9a0c6754422873eef1b4db87bc8f9c98769
+  metadata.gz: 38acf5142486eca974edef0da082033a210ba03b2f53509e638a2d35e2e2a224f2348b0ce4ded7c6643a708184453afb76181e293a57e3f74836119135b3b9e3
+  data.tar.gz: 8e4c6fed7be46d0b478deb457b35778552bbb8cd234934c9adc8d4a4d54ba7c1be48420a4e04882137bf9bf66617a03638fef6bd18c757335bd3670e2ae7735b

data/.travis.yml

@@ -6,13 +6,8 @@ services:
 before_install:
   - gem install bundler
   - gem update bundler
-matrix:
-  include:
-    - rvm: 2.2.4
-      env: "PERCY_ENABLE=0"
-    - rvm: 2.3.0
-      env: "PERCY_ENABLE=0"
-    - rvm: 2.4.0
-      env: "PERCY_ENABLE=1"
-    - rvm: jruby-9.1.6.0
-      env: "PERCY_ENABLE=0"
+rvm:
+  - 2.2.4
+  - 2.3.0
+  - 2.4.0
+  - jruby-9.1.6.0

data/Changes.md

@@ -2,6 +2,14 @@
 
 [Sidekiq Changes](https://github.com/mperham/sidekiq/blob/master/Changes.md) | [Sidekiq Pro Changes](https://github.com/mperham/sidekiq/blob/master/Pro-Changes.md) | [Sidekiq Enterprise Changes](https://github.com/mperham/sidekiq/blob/master/Ent-Changes.md)
 
+5.0.3
+-----------
+
+- Fix overriding `class_attribute` core extension from ActiveSupport with Sidekiq one [PikachuEXE, #3499]
+- Allow job logger to be overridden [AlfonsoUceda, #3502]
+- Set a default Redis client identifier for debugging [#3516]
+- Fix "Uninitialized constant" errors on startup with the delayed extensions [#3509]
+
 5.0.2
 -----------
 

data/Ent-Changes.md

@@ -4,12 +4,12 @@
 
 Please see [http://sidekiq.org/](http://sidekiq.org/) for more details and how to buy.
 
-HEAD
+1.6.0
 -------------
 
-- Show process "leader" tag on Busy page, requires Sidekiq 5.0.1 [#2867]
+- Show process "leader" tag on Busy page, requires Sidekiq 5.0.2 [#2867]
 - Capture custom metrics with the `save_history` API. [#2815]
-- Implement new `unique_util: 'start'` policy option. [#3471]
+- Implement new `unique_until: 'start'` policy option. [#3471]
 
 1.5.4
 -------------

data/Pro-Changes.md

@@ -4,6 +4,12 @@
 
 Please see [http://sidekiq.org/](http://sidekiq.org/) for more details and how to buy.
 
+3.5.1
+---------
+
+- Work with Sidekiq 5.0.2+
+- Improve performance of super\_fetch with weighted queues [#3489]
+
 3.5.0
 ---------
 

data/lib/sidekiq/delay.rb

@@ -3,12 +3,17 @@ module Sidekiq
 
     def self.enable_delay!
       if defined?(::ActiveSupport)
+        require 'sidekiq/extensions/active_record'
+        require 'sidekiq/extensions/action_mailer'
+
+        # Need to patch Psych so it can autoload classes whose names are serialized
+        # in the delayed YAML.
+        Psych::Visitors::ToRuby.prepend(Sidekiq::Extensions::PsychAutoload)
+
         ActiveSupport.on_load(:active_record) do
-          require 'sidekiq/extensions/active_record'
           include Sidekiq::Extensions::ActiveRecord
         end
         ActiveSupport.on_load(:action_mailer) do
-          require 'sidekiq/extensions/action_mailer'
           extend Sidekiq::Extensions::ActionMailer
         end
       end
@@ -17,5 +22,19 @@ module Sidekiq
       Module.__send__(:include, Sidekiq::Extensions::Klass)
     end
 
+    module PsychAutoload
+      def resolve_class(klass_name)
+        # constantize
+        names = klass_name.split('::')
+        names.shift if names.empty? || names.first.empty?
+
+        names.inject(Object) do |constant, name|
+          constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
+        end
+      rescue NameError
+        super
+      end
+    end
   end
 end
+

data/lib/sidekiq/processor.rb

@@ -39,7 +39,7 @@ module Sidekiq
       @thread = nil
       @strategy = (mgr.options[:fetch] || Sidekiq::BasicFetch).new(mgr.options)
       @reloader = Sidekiq.options[:reloader]
-      @logging = Sidekiq::JobLogger.new
+      @logging = (mgr.options[:job_logger] || Sidekiq::JobLogger).new
       @retrier = Sidekiq::JobRetry.new
     end
 

data/lib/sidekiq/redis_connection.rb

@@ -12,6 +12,7 @@ module Sidekiq
           options[key.to_sym] = options.delete(key)
         end
 
+        options[:id] ||= "Sidekiq-#{Sidekiq.server? ? "server" : "client"}-PID-#{$$}"
         options[:url] ||= determine_redis_provider
 
         size = options[:size] || (Sidekiq.server? ? (Sidekiq.options[:concurrency] + 5) : 5)

data/lib/sidekiq/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Sidekiq
-  VERSION = "5.0.2"
+  VERSION = "5.0.3"
 end

data/lib/sidekiq/worker.rb

@@ -27,9 +27,9 @@ module Sidekiq
       raise ArgumentError, "You cannot include Sidekiq::Worker in an ActiveJob: #{base.name}" if base.ancestors.any? {|c| c.name == 'ActiveJob::Base' }
 
       base.extend(ClassMethods)
-      base.class_attribute :sidekiq_options_hash
-      base.class_attribute :sidekiq_retry_in_block
-      base.class_attribute :sidekiq_retries_exhausted_block
+      base.sidekiq_class_attribute :sidekiq_options_hash
+      base.sidekiq_class_attribute :sidekiq_retry_in_block
+      base.sidekiq_class_attribute :sidekiq_retries_exhausted_block
     end
 
     def logger
@@ -142,7 +142,7 @@ module Sidekiq
         Sidekiq::Client.new(pool).push(item)
       end
 
-      def class_attribute(*attrs)
+      def sidekiq_class_attribute(*attrs)
         instance_reader = true
         instance_writer = true
 

data/sidekiq.gemspec

@@ -23,10 +23,4 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency      'minitest', '~> 5.10', '>= 5.10.1'
   gem.add_development_dependency      'rake', '~> 10.0'
   gem.add_development_dependency      'rails', '>= 3.2.0'
-
-  gem.add_development_dependency      'capybara', '~> 2.11'
-  gem.add_development_dependency      'poltergeist', '~> 1.12'
-  gem.add_development_dependency      'percy-capybara', '~> 2.3'
-  gem.add_development_dependency      'timecop', '~> 0.8'
-  gem.add_development_dependency      'mocha', '~> 1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.0.3
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-05 00:00:00.000000000 Z
+date: 2017-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -146,76 +146,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.11'
-- !ruby/object:Gem::Dependency
-  name: poltergeist
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
-- !ruby/object:Gem::Dependency
-  name: percy-capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
-- !ruby/object:Gem::Dependency
-  name: timecop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
 description: Simple, efficient background processing for Ruby.
 email:
 - mperham@gmail.com