sidekiq-debounce 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d39b6577f6d20c62c545e5361d8d7f8405700cba
-  data.tar.gz: 6c95c2c6b5b303c738af67ccb495cb971a7cb121
+  metadata.gz: 78ce6184bc26dfe22fb19365d2bc8c9f7ce32ac3
+  data.tar.gz: 8e7a11a991cd69e828b0a75db060aa3fcd26ec62
 SHA512:
-  metadata.gz: 9ddb67d32936dc9b0eb9d6afb205630d1ec47ee822ed3ad110b6f11ee06570fa59a23f4d7bef1acb30463d33e1628bee085b5f4224b96280dfe5fb6ec5e2ba17
-  data.tar.gz: 59a7058d3e869c52e9cdd108cb914f6c24c60e4a9546aa23427652e06561cdf70341f3da06004e3d47726ff7caae1955b70549d12b6b1ebd41aa8ddab24b3677
+  metadata.gz: 56bbbefafc894a00a9177ddd9b26ad31dfdcbb2dbe0e21c2e31ae5f655d5f952d7803c762410441f3446ef71358a62dceaba060e3da999702b46330209e7b7e7
+  data.tar.gz: 216833ce3d6c2015d293c813bf7de30f75bd0a223934d51888df8827e3d448d9cf48a9854e97cf4328244dc2a1b379de6b7be10baab680b5ae26dfe2eb6b79b2

data/.travis.yml

@@ -1,11 +1,14 @@
 language: ruby
 rvm:
- - 2.0.0
- - 2.1.2
- - jruby-9.0.0.0.pre1
+ - 2.2.5
+ - 2.3.1
+ - jruby-9.0.1.0
+ - jruby-9.0.5.0
 gemfile:
+- gemfiles/Gemfile.sidekiq-2.17.7
 - gemfiles/Gemfile.sidekiq-3.1.0
 - gemfiles/Gemfile.sidekiq-3.3.4
+- gemfiles/Gemfile.sidekiq-4.0.2
 script: bundle exec rake test
 addons:
  code_climate:

data/README.md

@@ -1,10 +1,9 @@
 Sidekiq::Debounce
 =================
- [![Travis CI](http://img.shields.io/travis/NuckChorris/sidekiq-debounce/master.svg)](https://travis-ci.org/NuckChorris/sidekiq-debounce)
- [![CodeClimate](http://img.shields.io/codeclimate/github/NuckChorris/sidekiq-debounce.svg)](https://codeclimate.com/github/NuckChorris/sidekiq-debounce)
- [![Coverage](http://img.shields.io/codeclimate/coverage/github/NuckChorris/sidekiq-debounce.svg)](https://codeclimate.com/github/NuckChorris/sidekiq-debounce)
+ [![Travis CI](http://img.shields.io/travis/hummingbird-me/sidekiq-debounce/master.svg)](https://travis-ci.org/NuckChorris/sidekiq-debounce)
+ [![CodeClimate](http://img.shields.io/codeclimate/github/hummingbird-me/sidekiq-debounce.svg)](https://codeclimate.com/github/NuckChorris/sidekiq-debounce)
+ [![Coverage](http://img.shields.io/codeclimate/coverage/github/hummingbird-me/sidekiq-debounce.svg)](https://codeclimate.com/github/NuckChorris/sidekiq-debounce)
  [![RubyGems](http://img.shields.io/gem/v/sidekiq-debounce.svg)](https://rubygems.org/gems/sidekiq-debounce)
- [![Gittip](http://img.shields.io/gittip/Nuck.svg)](https://www.gittip.com/Nuck/)
 
 Sidekiq::Debounce is a client-side Sidekiq middleware which provides a way to
 easily rate-limit creation of Sidekiq jobs.
@@ -40,7 +39,7 @@ Use `#perform_in` instead of `#perform_async` to set the timeframe.
 
 ## Contributing
 
-1. Fork it ( https://github.com/nuckchorris/sidekiq-debounce/fork )
+1. Fork it ( https://github.com/hummingbird-me/sidekiq-debounce/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/gemfiles/Gemfile.sidekiq-2.17.7

@@ -0,0 +1,5 @@
+source 'http://rubygems.org'
+
+gem 'sidekiq', '2.17.7'
+
+gemspec path: '../'

data/gemfiles/Gemfile.sidekiq-4.0.2

@@ -0,0 +1,5 @@
+source 'http://rubygems.org'
+
+gem 'sidekiq', '4.0.2'
+
+gemspec path: '../'

data/lib/sidekiq/debounce.rb

@@ -3,13 +3,13 @@ require 'sidekiq/api'
 
 module Sidekiq
   class Debounce
-    def call(worker, msg, _queue, redis_pool)
+    def call(worker, msg, _queue, redis_pool = nil)
       @worker = worker.is_a?(String) ? worker.constantize : worker
       @msg = msg
 
       return yield unless debounce?
 
-      redis_pool.with do |conn|
+      block = Proc.new do |conn|
         # Get JID of the already-scheduled job, if there is one
         scheduled_jid = conn.get(debounce_key)
 
@@ -21,6 +21,12 @@ module Sidekiq
         return false if scheduled_jid
         jid
       end
+
+      if redis_pool
+        redis_pool.with(&block)
+      else
+        Sidekiq.redis(&block)
+      end
     end
 
     private

data/lib/sidekiq/debounce/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   class Debounce
-    VERSION = '1.0.2'
+    VERSION = '1.1.0'
   end
 end

data/sidekiq-debounce.gemspec

@@ -17,7 +17,7 @@ calls. If you make another job with the same arguments before the specified
 time has elapsed, the timer is reset and the entire period must pass again
 before the job is executed.
 DESC
-  spec.homepage      = 'https://github.com/NuckChorris/sidekiq-debounce'
+  spec.homepage      = 'https://github.com/hummingbird-me/sidekiq-debounce'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -25,10 +25,11 @@ DESC
   spec.test_files    = spec.files.grep(%r{^spec/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'sidekiq', '>= 3.1.0'
+  spec.add_dependency 'sidekiq', '>= 2.17'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'mock_redis'
   spec.add_development_dependency 'mocha'
   spec.add_development_dependency 'codeclimate-test-reporter'
+  spec.add_development_dependency 'minitest'
 end

data/spec/sidekiq/debounce_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
-require 'sidekiq/api'
-require 'sidekiq/debounce/middleware'
+require 'sidekiq/debounce'
+require 'sidekiq'
 
 class DebouncedWorker
   include Sidekiq::Worker
@@ -20,7 +20,7 @@ describe Sidekiq::Debounce do
   end
 
   let(:set) { Sidekiq::ScheduledSet.new }
-  let(:sorted_entry) { Sidekiq::SortedEntry.new(set, 0, 'jid' => '54321') }
+  let(:sorted_entry) { Sidekiq::SortedEntry.new(set, 0, {jid: '54321'}.to_json) }
 
   it 'queues a job normally at first' do
     DebouncedWorker.perform_in(60, 'foo', 'bar')

data/spec/sidekiq_helper.rb

@@ -9,5 +9,9 @@ Sidekiq.configure_server do |config|
   config.redis = ConnectionPool.new(size: 1) { MockRedis.new }
 end
 Sidekiq.configure_client do |config|
+  config.client_middleware do |chain|
+    chain.add Sidekiq::Debounce
+  end
+
   config.redis = ConnectionPool.new(size: 1) { MockRedis.new }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-debounce
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Peter Lejeck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-09 00:00:00.000000000 Z
+date: 2016-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '2.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '2.17'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   Sidekiq::Debounce provides a way to rate-limit creation of Sidekiq jobs.  When
   you create a job on a Worker with debounce enabled, Sidekiq::Debounce will
@@ -116,15 +130,17 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- gemfiles/Gemfile.sidekiq-2.17.7
 - gemfiles/Gemfile.sidekiq-3.1.0
 - gemfiles/Gemfile.sidekiq-3.3.4
+- gemfiles/Gemfile.sidekiq-4.0.2
 - lib/sidekiq/debounce.rb
 - lib/sidekiq/debounce/version.rb
 - sidekiq-debounce.gemspec
 - spec/sidekiq/debounce_spec.rb
 - spec/sidekiq_helper.rb
 - spec/spec_helper.rb
-homepage: https://github.com/NuckChorris/sidekiq-debounce
+homepage: https://github.com/hummingbird-me/sidekiq-debounce
 licenses:
 - MIT
 metadata: {}
@@ -144,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A client-side middleware for debouncing Sidekiq jobs