sidekiq-unique-jobs 5.0.10 → 5.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 53332a20911a2add535139974709245c03425d86
-  data.tar.gz: f9b4bd20a09320b593f5e6d30ad7c10b1e8868de
+SHA256:
+  metadata.gz: 87c40a03b7114fd7c5b1c56ceaaf8f4d96b19939bd06f0b76e0c3ce088e34ee1
+  data.tar.gz: 7b41fc69c8cd77117a56beb1d15a17b523f4bff7a742317735cfcc28cda121de
 SHA512:
-  metadata.gz: b2164f8cd400bb144f5f6fd562177703ef935d55b9310d38dd94a29fd4e514748fdb50e57a5d690f2803c7a58392c534bf5900277af675764242435e53453e82
-  data.tar.gz: 71368b0d324404d60a1ebfc217dc417e7a70e233da312005184030089361c8f9755032f42f256bde1e31c4d6f5a1ec3873e4120af961cb0da1179bf81bc3a882
+  metadata.gz: 78dbf85901350c5b9e9e10889b25de771ef1c9757ac1e9a3565bc7b447501d0505770a3e9befda2242f855319c373777fee01e9c92c37bf1facdbeac87cb052e
+  data.tar.gz: ae243b12f6a0b4db056f474584e53017076226a93e87cc9fd45f7525f7e4a0e44da076a5725895405a3f6db6588578664cd0bc3fba746f139bb0ff65aba8f565

data/.gitignore

@@ -16,3 +16,9 @@ rails_example/spec/examples.txt
 *.sublime-*
 
 /sidekiq/
+
+/spec/examples.txt
+
+/gemfiles/.bundle/
+
+/.rspec_status

data/.rubocop.yml

@@ -1,13 +1,13 @@
 AllCops:
   Include:
     - '**/Rakefile'
-    - '**/lib'
-    - '**/bin'
-    - '**/spec'
+    - 'lib/**/*.rb'
+    - 'bin/**/*.rb'
+    - 'spec/**/*.rb'
   Exclude:
     - 'Gemfile.lock'
     - 'gemfiles/**/*'
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
 
 Lint/HandleExceptions:
   Enabled: true
@@ -35,19 +35,13 @@ Metrics/BlockLength:
 Metrics/PerceivedComplexity:
   Max: 8
 
-Style/AccessorMethodName:
+Naming/AccessorMethodName:
   Enabled: true
 
-Style/ConstantName:
+Naming/ConstantName:
   Enabled: true
 
-Style/FrozenStringLiteralComment:
-  Enabled: true
-
-Style/Documentation:
-  Enabled: false
-
-Style/FileName:
+Naming/FileName:
   Enabled: true
   Exclude:
     - 'lib/sidekiq-unique-jobs.rb'
@@ -55,6 +49,12 @@ Style/FileName:
     - '**/Appraisals'
     - '**/*.gemspec'
 
+Style/FrozenStringLiteralComment:
+  Enabled: true
+
+Style/Documentation:
+  Enabled: false
+
 Style/GlobalVars:
   Enabled: true
 
@@ -80,6 +80,10 @@ Style/TrailingCommaInArguments:
   Enabled: true
   EnforcedStyleForMultiline: comma
 
-Style/TrailingCommaInLiteral:
+Style/TrailingCommaInArrayLiteral:
+  Enabled: true
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInHashLiteral:
   Enabled: true
   EnforcedStyleForMultiline: comma

data/.simplecov

@@ -2,7 +2,7 @@ require 'simplecov-json'
 require 'codeclimate-test-reporter'
 
 SimpleCov.command_name 'rspec'
-SimpleCov.refuse_coverage_drop
+# SimpleCov.refuse_coverage_drop
 SimpleCov.formatters = [
   SimpleCov::Formatter::HTMLFormatter,
   SimpleCov::Formatter::JSONFormatter,

data/.travis.yml

@@ -1,38 +1,48 @@
-sudo: false
+env:
+  matrix:
+    - COV=false
+  global:
+    - CC_TEST_REPORTER_ID=88e524e8f638efe690def7a6e2c72b1a9db5cdfa74548921b734d609a5858ee5
+    - GIT_COMMITTED_AT=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then git log -1 --pretty=format:%ct; else git log -1 --skip 1 --pretty=format:%ct; fi)
+dist: trusty
+sudo: required
 language: ruby
 cache: bundler
-# before_install:
-#   - rvm get head
-#   - gem update --system
-#   - gem install bundler
 services:
   - redis-server
+
+before_install:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+before_script:
+  - ./cc-test-reporter before-build
 script:
-  - if [[ "${STYLE}" = "true" ]]; then bundle exec rubocop - P; fi;
-  - bundle exec rspec spec
-  - if [[ "${STYLE}" = "true" ]]; then CODECLIMATE_REPO_TOKEN=88e524e8f638efe690def7a6e2c72b1a9db5cdfa74548921b734d609a5858ee5 bundle exec codeclimate-test-reporter; fi;
+  - if [[ "${COV}" = "true" ]]; then bundle exec rubocop -P; fi;
+  - bundle exec rspec
+after_script:
+  - if [[ "${COV}" = "true" ]]; then ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT; fi;
 rvm:
-  - 2.4.1
+  - 2.5.3
+  - 2.4.2
   - 2.3.2
-  - jruby-9.1.8.0
-env: STYLE=false
+  - 2.2.7
+  - jruby-9.2.0.0
+matrix:
+  fast_finish: true
+  include:
+    - rvm: 2.5.3
+      gemfile: gemfiles/sidekiq_develop.gemfile
+      env: COV=true
 gemfile:
   - gemfiles/sidekiq_develop.gemfile
   - gemfiles/sidekiq_4.0.gemfile
   - gemfiles/sidekiq_4.1.gemfile
   - gemfiles/sidekiq_4.2.gemfile
   - gemfiles/sidekiq_5.0.gemfile
+  - gemfiles/sidekiq_5.1.gemfile
+  - gemfiles/sidekiq_5.2.gemfile
 
 notifications:
   email:
     recipients:
       - mikael@zoolutions.se
-matrix:
-  fast_finish: true
-  include:
-    - rvm: 2.4.1
-      gemfile: gemfiles/sidekiq_develop.gemfile
-      env: STYLE=true
-addons:
-  code_climate:
-    repo_token: 88e524e8f638efe690def7a6e2c72b1a9db5cdfa74548921b734d609a5858ee5

data/Appraisals

@@ -17,5 +17,13 @@ appraise 'sidekiq-4.2' do
 end
 
 appraise 'sidekiq-5.0' do
-  gem 'sidekiq', '>= 5.0.0.beta', '< 6'
+  gem 'sidekiq', '>= 5.0.0', '< 5.1'
+end
+
+appraise 'sidekiq-5.1' do
+  gem 'sidekiq', '>= 5.1.0', '< 5.2'
+end
+
+appraise 'sidekiq-5.2' do
+  gem 'sidekiq', '>= 5.2.0', '< 6'
 end

data/Gemfile

@@ -3,18 +3,19 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'appraisal', '~> 2.0.0'
+gem 'appraisal', '>= 2.0.0'
 gem 'rspec-its',  require: false
 gem 'rspec-wait', require: false
 
-platforms :mri_24 do
-  gem 'benchmark-ips',             require: false
-  gem 'codeclimate-test-reporter', require: false
-  gem 'fasterer',                  require: false
-  gem 'memory_profiler',           require: false
-  gem 'mock_redis',                require: false
-  gem 'pry-byebug',                require: false
-  gem 'rubocop',                   require: false
-  gem 'simplecov-json',            require: false
-  gem 'travis',                    require: false
+platforms :mri_25 do
+  gem 'benchmark-ips',                         require: false
+  gem 'codeclimate-test-reporter', '>= 1.0.8', require: false
+  gem 'fasterer',                              require: false
+  gem 'memory_profiler',                       require: false
+  gem 'mock_redis',                            require: false
+  gem 'pry-byebug',                            require: false
+  gem 'rubocop',                               require: false
+  gem 'simplecov', '>= 0.13',                  require: false
+  gem 'simplecov-json',                        require: false
+  gem 'travis',                                require: false
 end

data/lib/sidekiq_unique_jobs/lock/until_executed.rb

@@ -38,9 +38,7 @@ module SidekiqUniqueJobs
       end
 
       def lock(scope)
-        if scope.to_sym != :client
-          raise ArgumentError, "#{scope} middleware can't #{__method__} #{unique_key}"
-        end
+        raise ArgumentError, "#{scope} middleware can't #{__method__} #{unique_key}" if scope.to_sym != :client
 
         Scripts::AcquireLock.execute(
           redis_pool,
@@ -49,7 +47,6 @@ module SidekiqUniqueJobs
           max_lock_time,
         )
       end
-      # rubocop:enable MethodLength
 
       def unique_key
         @unique_key ||= UniqueArgs.digest(item)

data/lib/sidekiq_unique_jobs/lock/while_executing.rb

@@ -43,8 +43,8 @@ module SidekiqUniqueJobs
       end
 
       def create_digest
-        @unique_digest ||= @item[UNIQUE_DIGEST_KEY]
-        @unique_digest ||= SidekiqUniqueJobs::UniqueArgs.digest(@item)
+        @create_digest ||= @item[UNIQUE_DIGEST_KEY]
+        @create_digest ||= SidekiqUniqueJobs::UniqueArgs.digest(@item)
       end
     end
   end

data/lib/sidekiq_unique_jobs/script_mock.rb

@@ -56,14 +56,11 @@ module SidekiqUniqueJobs
 
         stored_time = conn.get(unique_key)
         if stored_time && stored_time < time
-          if conn.set(unique_key, time + expires, xx: true, ex: expires)
-            return 1
-          end
+          return 1 if conn.set(unique_key, time + expires, xx: true, ex: expires)
         end
 
         return 0
       end
     end
   end
-  # rubocop:enable MethodLength
 end

data/lib/sidekiq_unique_jobs/scripts.rb

@@ -37,8 +37,8 @@ module SidekiqUniqueJobs
       end
     end
 
-    def handle_error(ex, file_name, redis_pool, options = {})
-      if ex.message == 'NOSCRIPT No matching script. Please use EVAL.' # rubocop:disable Style/GuardClause
+    def handle_error(exception, file_name, redis_pool, options = {})
+      if exception.message == 'NOSCRIPT No matching script. Please use EVAL.' # rubocop:disable Style/GuardClause
         SCRIPT_SHAS.delete(file_name)
         call(file_name, redis_pool, options)
       else

data/lib/sidekiq_unique_jobs/sidekiq_unique_ext.rb

@@ -7,7 +7,6 @@ module Sidekiq
     module UniqueExtension
       def self.included(base)
         base.class_eval do
-          include SidekiqUniqueJobs::Unlockable
           alias_method :delete_orig, :delete
           alias_method :delete, :delete_ext
           alias_method :remove_job_orig, :remove_job
@@ -36,7 +35,6 @@ module Sidekiq
     module UniqueExtension
       def self.included(base)
         base.class_eval do
-          include SidekiqUniqueJobs::Unlockable
           alias_method :delete_orig, :delete
           alias_method :delete, :delete_ext
         end
@@ -45,13 +43,6 @@ module Sidekiq
       def delete_ext
         SidekiqUniqueJobs::Unlockable.unlock(item) if delete_orig
       end
-
-      def remove_job_ext
-        remove_job_orig do |message|
-          SidekiqUniqueJobs::Unlockable.unlock(Sidekiq.load_json(message))
-          yield message
-        end
-      end
     end
     include UniqueExtension
   end
@@ -60,15 +51,14 @@ module Sidekiq
     module UniqueExtension
       def self.included(base)
         base.class_eval do
-          include SidekiqUniqueJobs::Unlockable
           alias_method :delete_orig, :delete
           alias_method :delete, :delete_ext
         end
       end
 
       def delete_ext
-        SidekiqUniqueJobs::Unlockable.unlock(item)
         delete_orig
+        SidekiqUniqueJobs::Unlockable.unlock(item)
       end
     end
 
@@ -79,7 +69,6 @@ module Sidekiq
     module UniqueExtension
       def self.included(base)
         base.class_eval do
-          include SidekiqUniqueJobs::Unlockable
           alias_method :clear_orig, :clear
           alias_method :clear, :clear_ext
         end
@@ -98,7 +87,6 @@ module Sidekiq
     module UniqueExtension
       def self.included(base)
         base.class_eval do
-          include SidekiqUniqueJobs::Unlockable
           if base.method_defined?(:clear)
             alias_method :clear_orig, :clear
             alias_method :clear, :clear_ext

data/lib/sidekiq_unique_jobs/unique_args.rb

@@ -146,4 +146,5 @@ module SidekiqUniqueJobs
       @unique_args_method ||= Sidekiq.default_worker_options.stringify_keys[UNIQUE_ARGS_KEY]
     end
   end
+  # rubocop:enable ClassLength
 end

data/lib/sidekiq_unique_jobs/unlockable.rb

@@ -10,12 +10,9 @@ module SidekiqUniqueJobs
     end
 
     def unlock_by_key(unique_key, jid, redis_pool = nil)
-      return false unless Scripts::ReleaseLock.execute(redis_pool, unique_key, jid)
-      after_unlock(jid)
-    end
-
-    def after_unlock(jid)
+      lock_released = Scripts::ReleaseLock.execute(redis_pool, unique_key, jid)
       ensure_job_id_removed(jid)
+      lock_released
     end
 
     def ensure_job_id_removed(jid)

data/lib/sidekiq_unique_jobs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SidekiqUniqueJobs
-  VERSION = '5.0.10'
+  VERSION = '5.0.11'
 end

data/redis/acquire_lock.lua

@@ -12,7 +12,7 @@ if stored_jid then
 end
 
 if redis.pcall('set', unique_key, job_id, 'nx', 'ex', expires) then
-  redis.pcall('hsetnx', 'uniquejobs', job_id, unique_key)
+  -- redis.pcall('hsetnx', 'uniquejobs', job_id, unique_key)
   return 1
 else
   return 0

data/sidekiq-unique-jobs.gemspec

@@ -20,7 +20,8 @@ Gem::Specification.new do |spec|
   end
 
   spec.require_paths = ['lib']
-  spec.add_dependency 'sidekiq', '>= 4.0', '<= 6.0'
+  spec.add_dependency 'sidekiq', '>= 4.0', '< 6.0'
+  spec.add_dependency 'concurrent-ruby', '>= 1.0.2'
   spec.add_dependency 'thor', '~> 0'
 
   spec.add_development_dependency 'rspec', '~> 3.1'
@@ -28,5 +29,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'timecop', '~> 0.8'
   spec.add_development_dependency 'yard', '~> 0.9'
   spec.add_development_dependency 'gem-release', '~> 0.7'
-  spec.add_development_dependency 'codeclimate-test-reporter', '~> 1.0', '>= 1.0.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 5.0.10
+  version: 5.0.11
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-19 00:00:00.000000000 Z
+date: 2018-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -17,7 +17,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
   type: :runtime
@@ -27,9 +27,23 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -114,26 +128,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-- !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.8
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.8
 description: Handles various types of unique jobs for Sidekiq
 email:
 - mikael@zoolutions.se
@@ -217,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Uniqueness for Sidekiq Jobs