sidekiq-unique-jobs 4.0.16 → 4.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa74d419e8964813243a427ec860730ac44dfe36
-  data.tar.gz: e4e1850f812e286a59e4de00c9ea2f6b4ff6d392
+  metadata.gz: ed1a8ffb2ff6f320e5304d4d205b8e1b0d45e98b
+  data.tar.gz: a65deff79a35909d35259361b430211bb30fb65a
 SHA512:
-  metadata.gz: f6d6e3e9c95acfc333bb8d697121d53a2a8208fbca08ce9790c5457f08f6680c7469d7493cdc5eeb2bf49046c4094ebf23cb5a1449e63793169a9ad3d5d9bffc
-  data.tar.gz: 810c75a9aafd58ef30cb4a99568ac9a24d49062fe69ef7a11512e9c261d5e2e8af730a109c4213f083024dcc9ae10d0f6d9c56ae41c80a7ed68f41df8b34df40
+  metadata.gz: 5e88464e143a66dd207f509b1739bb7d838f08131694ce3c7dca2d0eae16d10e751c24731a7e41f1a1ea68085c9850326a16685e6c254726d778cbf89bdbf13f
+  data.tar.gz: 90416313c946c6bbf96cfe2c6399714d2720254755db8d4505c24bfd6e4f7e9aac364487c6dc5ffba9cd64947bfd9cbee9472ff9d197606395b05d9871200165

data/README.md

@@ -1,10 +1,10 @@
-# SidekiqUniqueJobs [![Join the chat at https://gitter.im/mhenrixon/sidekiq-unique-jobs](https://badges.gitter.im/mhenrixon/sidekiq-unique-jobs.svg)](https://gitter.im/mhenri
-xon/sidekiq-unique-jobs?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build Status](https://travis-ci.org/mhenrixon/sidekiq-unique-jobs.png?branch=master)](https://travis-ci.org/mhenrixon/sidekiq-unique-jobs) [![Code Climate](https://codeclimate.com/github/mhenrixon/sidekiq-unique-jobs.png)](https://codeclimate.com/github/mhenrixon/sidekiq-unique-jobs) [![Test Coverage](https://codeclimate.com/github/mhenrixon/sidekiq-unique-jobs/badges/coverage.svg)](https://codeclimate.com/github/mhenrixon/sidekiq-unique-jobs/coverage)
+# SidekiqUniqueJobs [![Join the chat at https://gitter.im/mhenrixon/sidekiq-unique-jobs](https://badges.gitter.im/mhenrixon/sidekiq-unique-jobs.svg)](https://gitter.im/mhenrixon/sidekiq-unique-jobs?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build Status](https://travis-ci.org/mhenrixon/sidekiq-unique-jobs.png?branch=master)](https://travis-ci.org/mhenrixon/sidekiq-unique-jobs) [![Code Climate](https://codeclimate.com/github/mhenrixon/sidekiq-unique-jobs.png)](https://codeclimate.com/github/mhenrixon/sidekiq-unique-jobs) [![Test Coverage](https://codeclimate.com/github/mhenrixon/sidekiq-unique-jobs/badges/coverage.svg)](https://codeclimate.com/github/mhenrixon/sidekiq-unique-jobs/coverage)
 
 The missing unique jobs for sidekiq
 
 ## Requirements
 
+
 See https://github.com/mperham/sidekiq#requirements for what is required. Starting from 3.0.13 only sidekiq 3 is supported and support for MRI 1.9 is dropped (it might work but won't be worked on)
 
 ### Version 4 Upgrade instructions
@@ -81,7 +81,7 @@ The difference is that this job has two types of uniqueness:
 1. It is unique until execution
 2. It is unique while executing
 
-That means it locks for any job with the same arguments to be persisted into redis and just like you would expect it will only ever allow one job of the same unique arguments to run at any given time but as soon as the runtime lock has been aquired the schedule/async lock is released.
+That means it locks for any job with the same arguments to be persisted into redis and just like you would expect it will only ever allow one job of the same unique arguments to run at any given time but as soon as the runtime lock has been acquired the schedule/async lock is released.
 
 ### Uniqueness Scope
 

data/bin/bench

@@ -13,7 +13,7 @@ ITERATIONS ||= 10_000
 Benchmark.ips do |x|
   x.config(time: 5, warmup: 2)
   x.report('new_shit') do |_times|
-    SidekiqUniqueJobs::Scripts.call(:aquire_lock, nil, keys: [SecureRandom.hex], argv: [SecureRandom.hex])
+    SidekiqUniqueJobs::Scripts.call(:acquire_lock, nil, keys: [SecureRandom.hex], argv: [SecureRandom.hex])
   end
   x.compare!
 end

data/circle.yml

@@ -1,7 +1,7 @@
 machine:
   ruby:
     version:
-      2.2.3
+      2.3.0
   java:
     version: oraclejdk8
   environment:
@@ -14,19 +14,21 @@ dependencies:
     - rvm install rbx-2
     - rvm install 2.0.0
     - rvm install 2.1.7
+    - rvm install 2.2.3
   override:
     - rvm-exec jruby-9.0.0.0 bundle install
     - rvm-exec jruby-1.7 bundle install
     - rvm-exec rbx-2 bundle install
     - rvm-exec 2.0.0 bundle install
-    - rvm-exec 2.1.7 bundle install
-    - rvm-exec 2.2.3 bundle install
+    - rvm-exec 2.1.8 bundle install
+    - rvm-exec 2.2.4 bundle install
     - rvm-exec jruby-9.0.0.0 bundle exec appraisal install
     - rvm-exec jruby-1.7 bundle exec appraisal install
     - rvm-exec rbx-2 bundle exec appraisal install
     - rvm-exec 2.0.0 bundle exec appraisal install
     - rvm-exec 2.1.7 bundle exec appraisal install
     - rvm-exec 2.2.3 bundle exec appraisal install
+    - rvm-exec 2.3.0 bundle exec appraisal install
 
 test:
   override:
@@ -36,3 +38,4 @@ test:
     - rvm-exec 2.0.0 bundle exec appraisal rspec
     - rvm-exec 2.1.7 bundle exec appraisal rspec
     - rvm-exec 2.2.3 bundle exec appraisal rspec
+    - rvm-exec 2.3.0 bundle exec appraisal rspec

data/lib/sidekiq_unique_jobs/client/middleware.rb

@@ -23,10 +23,10 @@ module SidekiqUniqueJobs
       attr_reader :item, :worker_class, :redis_pool, :queue
 
       def disabled_or_successfully_locked?
-        unique_disabled? || aquire_lock
+        unique_disabled? || acquire_lock
       end
 
-      def aquire_lock
+      def acquire_lock
         return true unless lock.respond_to?(:lock)
         locked = lock.lock(:client)
         warn_about_duplicate(item) unless locked

data/lib/sidekiq_unique_jobs/lock/until_executed.rb

@@ -37,7 +37,7 @@ module SidekiqUniqueJobs
           raise ArgumentError, "#{scope} middleware can't #{__method__} #{unique_key}"
         end
 
-        result = Scripts.call(:aquire_lock, redis_pool,
+        result = Scripts.call(:acquire_lock, redis_pool,
                               keys: [unique_key],
                               argv: [item[JID_KEY], max_lock_time])
         case result
@@ -45,7 +45,7 @@ module SidekiqUniqueJobs
           logger.debug { "successfully locked #{unique_key} for #{max_lock_time} seconds" }
           true
         when 0
-          logger.debug { "failed to aquire lock for #{unique_key}" }
+          logger.debug { "failed to acquire lock for #{unique_key}" }
           false
         else
           raise "#{__method__} returned an unexpected value (#{result})"

data/lib/sidekiq_unique_jobs/version.rb

@@ -1,3 +1,3 @@
 module SidekiqUniqueJobs
-  VERSION = '4.0.16'.freeze
+  VERSION = '4.0.17'.freeze
 end

data/redis/release_lock.lua

@@ -4,10 +4,9 @@ local stored_jid = redis.pcall('get', unique_key)
 
 if stored_jid then
   if stored_jid == job_id or stored_jid == '2' then
-    if redis.pcall('del', unique_key) then
-      redis.pcall('hdel', 'uniquejobs', job_id)
-      return 1
-    end
+    redis.pcall('del', unique_key)
+    redis.pcall('hdel', 'uniquejobs', job_id)
+    return 1
   else
     return 0
   end

data/spec/lib/sidekiq_unique_jobs/scripts_spec.rb

@@ -24,14 +24,14 @@ RSpec.describe SidekiqUniqueJobs::Scripts do
     end
 
     def lock_for(seconds = 1, jid = JID, key = UNIQUE_KEY)
-      subject.call(:aquire_lock, nil, keys: [key], argv: [jid, seconds])
+      subject.call(:acquire_lock, nil, keys: [key], argv: [jid, seconds])
     end
 
     def unlock(key = UNIQUE_KEY, jid = JID)
       subject.call(:release_lock, nil, keys: [key], argv: [jid])
     end
 
-    describe '.aquire_lock' do
+    describe '.acquire_lock' do
       context 'when job is unique' do
         specify { expect(lock_for).to eq(1) }
         specify do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 4.0.16
+  version: 4.0.17
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-17 00:00:00.000000000 Z
+date: 2016-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -230,7 +230,7 @@ files:
 - rails_example/simple.ru
 - rails_example/vendor/assets/javascripts/.keep
 - rails_example/vendor/assets/stylesheets/.keep
-- redis/aquire_lock.lua
+- redis/acquire_lock.lua
 - redis/release_lock.lua
 - redis/synchronize.lua
 - sidekiq-unique-jobs.gemspec
@@ -304,7 +304,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: The unique jobs that were removed from sidekiq