sidekiq-unique-jobs 4.0.7 → 4.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d354eaf8918e64ccbe7873ea1bc4a2f04392d78
-  data.tar.gz: 048516acc45e64d59f19e2f080b98d975a4b2d65
+  metadata.gz: 64a81ae8142ce1f78d40061b8c1fbe11cd9ec79a
+  data.tar.gz: 6fe4d1d19eaa60088d3a7a46ee9761b7de1cfecb
 SHA512:
-  metadata.gz: 481a2053ca531710e228bf8d2da432f353c5f14af4f3d82f9748271ee190cf10ff9fcd1fb353bf16942fa56277cef5f31a0413d63ebdc657e653f56809533753
-  data.tar.gz: 104340d1f76fc29dab974c93afe7823ff673fa20a4349a819320fdb1f87916eba3b21f11d8484e8b1abaaca558500eca5a3296bc0fb56eb8b99669162822ed0b
+  metadata.gz: 7b0044b2721c29fa5ffbb342c670c2d8f087719c12e7ad59dc9a30e25b9d9a1ba54bd3cdbbe738202bc4f39a1c27835a1e964837ccdec57fc01c43c2ed0efd6e
+  data.tar.gz: 2429e2b73e64cbbdb2972278309ca45ecb1dccff56777c65f15dacd05162c59c755d7a55a1c93cbbc71c13bcc4bfdb71a03496dda881842ddc0b5a3205237008

data/LICENSE

@@ -1,22 +1,13 @@
-Copyright (c) 2012 Mikael Henriksson
+           DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                       Version 2, December 2004
 
-MIT License
+Copyright (C) 2015 Mikael Henriksson <mikael@zoolutions.se>
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Everyone is permitted to copy and distribute verbatim or modified
+copies of this license document, and changing it is allowed as long
+as the name is changed.
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+           DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+  TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 0. You just DO WHAT THE FUCK YOU WANT TO.

data/README.md

@@ -30,7 +30,7 @@ Or install it yourself as:
 
 ## A word on locking
 
-Like @mperham mentions on (this wiki page)[https://github.com/mperham/sidekiq/wiki/Related-Projects#unique-jobs] it is hard to enforce uniqueness with redis in a distributed redis setting. 
+Like @mperham mentions on [this wiki page](https://github.com/mperham/sidekiq/wiki/Related-Projects#unique-jobs) it is hard to enforce uniqueness with redis in a distributed redis setting. 
 
 To make things worse there are many ways of wanting to enforce uniqueness. 
 

data/lib/sidekiq_unique_jobs/lock/until_timeout.rb

@@ -2,11 +2,8 @@ module SidekiqUniqueJobs
   module Lock
     class UntilTimeout < UntilExecuted
       def unlock(scope)
-        if scope.to_sym == :server
-          return true
-        else
-          fail ArgumentError, "#{scope} middleware can't #{__method__} #{unique_key}"
-        end
+        return true if scope.to_sym == :server
+        fail ArgumentError, "#{scope} middleware can't #{__method__} #{unique_key}"
       end
 
       def execute(_callback)

data/lib/sidekiq_unique_jobs/unique_args.rb

@@ -21,7 +21,7 @@ module SidekiqUniqueJobs
         @item = job
         @worker_class ||= worker_class_constantize(@item[CLASS_KEY])
         @item[UNIQUE_PREFIX_KEY] ||= unique_prefix
-        @item[UNIQUE_ARGS_KEY] ||= unique_args(@item[ARGS_KEY])
+        @item[UNIQUE_ARGS_KEY] = unique_args(@item[ARGS_KEY]) # SIC! Calculate unique_args unconditionally
         @item[UNIQUE_DIGEST_KEY] ||= unique_digest
       end
     end

data/lib/sidekiq_unique_jobs/version.rb

@@ -1,3 +1,3 @@
 module SidekiqUniqueJobs
-  VERSION = '4.0.7'
+  VERSION = '4.0.8'
 end

data/sidekiq-unique-jobs.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.email         = ['mikael@zoolutions.se']
   gem.description   = gem.summary = 'The unique jobs that were removed from sidekiq'
   gem.homepage      = 'https://github.com/mhenrixon/sidekiq-unique-jobs'
-  gem.license       = 'LGPL-3.0'
+  gem.license       = 'WTFPL-2.0'
 
   # gem.executables   = ['']
   gem.files         = `git ls-files`.split("\n")

data/spec/celluloid_with_fallback.rb

@@ -0,0 +1,17 @@
+begin
+  require 'celluloid/current'
+rescue LoadError
+  warn 'Celluloid is old'
+  begin
+    require 'celluloid' rescue LoadError
+  rescue LoadError
+    warn 'Celluloid not found'
+  end
+end
+begin
+  require 'celluloid' rescue LoadError
+rescue LoadError
+  # do nothing we already know
+end
+
+Celluloid.boot if defined?(Celluloid)

data/spec/jobs/custom_queue_job_with_filter_method.rb

@@ -1,7 +1,7 @@
 class CustomQueueJobWithFilterMethod < CustomQueueJob
   sidekiq_options unique: :until_executed, unique_args: :args_filter
 
-  def self.args_filter(*args)
+  def self.args_filter(args)
     args.first
   end
 end

data/spec/jobs/custom_queue_job_with_filter_proc.rb

@@ -2,9 +2,9 @@ class CustomQueueJobWithFilterProc < CustomQueueJob
   # slightly contrived example of munging args to the
   # worker and removing a random bit.
   sidekiq_options unique: :until_timeout,
-                  unique_args: (lambda do |*args|
+                  unique_args: (lambda do |args|
                     options = args.extract_options!
-                    options.delete(:random)
-                    [args, options]
+                    options.delete('random')
+                    args + [options]
                   end)
 end

data/spec/lib/sidekiq_unique_jobs/unique_args_spec.rb

@@ -4,6 +4,49 @@ RSpec.describe SidekiqUniqueJobs::UniqueArgs do
   let(:item) { { 'class' => 'UntilExecutedJob', 'queue' => 'myqueue', 'args' => [[1, 2]] } }
   subject { described_class.new(item) }
 
+  describe '#unique_digest' do
+    let(:item) { item_options.merge('args' => [1, 2, 'type' => 'it'] ) }
+
+    shared_examples 'unique digest' do
+      context 'given another item' do
+        let(:another_subject) { described_class.new(another_item) }
+
+        context 'with the same unique args' do
+          let(:another_item) { item_options.merge('args' => [1, 2, 'type' => 'it']) }
+          it 'equals to unique_digest for that item' do
+            expect(subject.unique_digest).to eq(another_subject.unique_digest)
+          end
+        end
+
+        context 'with different unique args' do
+          let(:another_item) { item_options.merge('args' => [1, 3, 'type' => 'that']) }
+          it 'differs from unique_digest for that item' do
+            expect(subject.unique_digest).to_not eq(another_subject.unique_digest)
+          end
+        end
+      end
+    end
+
+    context 'when unique_args is a proc' do
+      let(:item_options) do
+        { 'class' => 'UntilExecutedJob', 'queue' => 'myqueue',
+          'unique_args' => Proc.new { |args| args[1] } }
+      end
+
+
+      it_behaves_like 'unique digest'
+    end
+
+    context 'when unique_args is a symbol' do
+      let(:item_options) do
+        { 'class' => 'UniqueJobWithFilterMethod', 'queue' => 'myqueue',
+          'unique_args' => :filtered_args }
+      end
+
+      it_behaves_like 'unique digest'
+    end
+  end
+
   describe '#unique_args_enabled?' do
     with_default_worker_options(unique: :until_executed, unique_args: ->(args) { args[1]['test'] }) do
       with_sidekiq_options_for(UntilExecutedJob, unique_args: :unique_args) do

data/spec/spec_helper.rb

@@ -16,14 +16,7 @@ end
 require 'rspec'
 require 'rspec/its'
 
-begin
-  require 'celluloid/current'
-rescue LoadError
-  warn 'Celluloid is old'
-  require 'celluloid'
-end
-require 'celluloid/test'
-Celluloid.boot
+require 'celluloid_with_fallback'
 require 'sidekiq'
 require 'sidekiq/util'
 require 'sidekiq-unique-jobs'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 4.0.7
+  version: 4.0.8
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-15 00:00:00.000000000 Z
+date: 2015-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -150,6 +150,7 @@ files:
 - redis/release_lock.lua
 - redis/synchronize.lua
 - sidekiq-unique-jobs.gemspec
+- spec/celluloid_with_fallback.rb
 - spec/jobs/another_unique_job.rb
 - spec/jobs/custom_queue_job.rb
 - spec/jobs/custom_queue_job_with_filter_method.rb
@@ -191,7 +192,7 @@ files:
 - spec/support/unique_macros.rb
 homepage: https://github.com/mhenrixon/sidekiq-unique-jobs
 licenses:
-- LGPL-3.0
+- WTFPL-2.0
 metadata: {}
 post_install_message: 'WARNING: VERSION 4.0.0 HAS BREAKING CHANGES! Please see Readme
   for info'
@@ -210,9 +211,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: The unique jobs that were removed from sidekiq
 test_files: []
-has_rdoc: