sidekiq-throttled 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f24a091044117cd299dc478eca0cdf2592b7e05
-  data.tar.gz: 18cd12c9b4a9a8e4ce273f959a4deae29c7d2c14
+  metadata.gz: 533d15834069284a6d4a781438724390ae8c185e
+  data.tar.gz: e7ef6171c7d1d50f4e73ca2d856ada94a861cd93
 SHA512:
-  metadata.gz: d02ac4f96d6aaf4cae1d0b2a5958efbef48d86410c18b933f9da3fb492c5e6487a7dd6bcf612e1858e0bd0c355827f6b6071341ea2b42ad73b9f59d805cfe8d6
-  data.tar.gz: e9c0d68e0fc016cdbd5369f8d342339fde7c0e67f40cd1a1446025839ccbf7f9c26f9eabed5fafa8521387d93ae3bb61483cfd2f5cae6722488833fc90148939
+  metadata.gz: eb0e8c60fa207fc0c79b051640ee6d0c4312e91f5b5fe327a48a383ff8c21cc706c57de346c71aa5c750e4b19339da3d700858c26574717a130393d20957ae69
+  data.tar.gz: 0d4c82ed8ff3e7af23e4adfeec283c40d4fe200de4342fad333b174e8b9f64ae6fb22641c916fea0aed9bc0a4dbe0611936a350ad691c2b360ded39a3769b6c7

data/.travis.yml

@@ -17,6 +17,9 @@ gemfile:
   - gemfiles/sidekiq_4.0.gemfile
   - gemfiles/sidekiq_4.1.gemfile
   - gemfiles/sidekiq_latest.gemfile
+env:
+  - WITH_REDIS_NAMESPACE=0
+  - WITH_REDIS_NAMESPACE=1
 before_install:
   - gem install bundler -v 1.10.6
 services:

data/CHANGES.md

@@ -1,3 +1,10 @@
+## 0.6.6 (2016-10-16)
+
+* [#24](https://github.com/sensortower/sidekiq-throttled/pull/24)
+  Fix dynamic `:key_suffix` issue.
+  ([@iporsut])
+
+
 ## 0.6.5 (2016-09-04)
 
 * Fix concurrency throttling when redis-namespace is used.
@@ -93,3 +100,4 @@
 [@fhwang]: https://github.com/fhwang
 [@palanglung]: https://github.com/palanglung
 [@azach]: https://github.com/azach
+[@iporsut]: https://github.com/iporsut

data/Gemfile

@@ -6,6 +6,7 @@ gem "appraisal"
 gem "rake"
 gem "rspec"
 gem "rubocop", "~> 0.42.0", :require => false
+gem "redis-namespace", :require => false
 
 group :test do
   gem "coveralls", :require => false

data/gemfiles/sidekiq_4.0.gemfile

@@ -6,10 +6,11 @@ gem "appraisal"
 gem "rake"
 gem "rspec"
 gem "rubocop", "~> 0.42.0", :require => false
+gem "redis-namespace", :require => false
 gem "sidekiq", "~> 4.0.0"
 
 group :test do
-  gem "coveralls"
+  gem "coveralls", :require => false
   gem "rack-test"
   gem "simplecov", ">= 0.9"
   gem "sinatra", "~> 1.4", ">= 1.4.6"

data/gemfiles/sidekiq_4.1.gemfile

@@ -6,10 +6,11 @@ gem "appraisal"
 gem "rake"
 gem "rspec"
 gem "rubocop", "~> 0.42.0", :require => false
+gem "redis-namespace", :require => false
 gem "sidekiq", "~> 4.1.0"
 
 group :test do
-  gem "coveralls"
+  gem "coveralls", :require => false
   gem "rack-test"
   gem "simplecov", ">= 0.9"
   gem "sinatra", "~> 1.4", ">= 1.4.6"

data/gemfiles/sidekiq_latest.gemfile

@@ -6,10 +6,11 @@ gem "appraisal"
 gem "rake"
 gem "rspec"
 gem "rubocop", "~> 0.42.0", :require => false
+gem "redis-namespace", :require => false
 gem "sidekiq"
 
 group :test do
-  gem "coveralls"
+  gem "coveralls", :require => false
   gem "rack-test"
   gem "simplecov", ">= 0.9"
   gem "sinatra", "~> 1.4", ">= 1.4.6"

data/lib/sidekiq/throttled/strategy.rb

@@ -20,23 +20,23 @@ module Sidekiq
 
       # @param [#to_s] name
       # @param [Hash] concurrency Concurrency options.
-      #   See {Strategy::Concurrency#initialize} for details.
+      #   See keyword args of {Strategy::Concurrency#initialize} for details.
       # @param [Hash] threshold Threshold options.
-      #   See {Strategy::Threshold#initialize} for details.
-      # @param [Hash] key_suffix Proc for dynamic keys.
+      #   See keyword args of {Strategy::Threshold#initialize} for details.
+      # @param [#call] key_suffix Dynamic key suffix generator.
       def initialize(name, concurrency: nil, threshold: nil, key_suffix: nil)
         key = "throttled:#{name}"
 
         @concurrency =
           if concurrency
-            concurrency[:key_suffix] = key_suffix
-            Concurrency.new(key, concurrency)
+            concurrency[:key_suffix] ||= key_suffix
+            Concurrency.new(key, **concurrency)
           end
 
         @threshold =
           if threshold
-            threshold[:key_suffix] = key_suffix
-            Threshold.new(key, threshold)
+            threshold[:key_suffix] ||= key_suffix
+            Threshold.new(key, **threshold)
           end
 
         return if @concurrency || @threshold

data/lib/sidekiq/throttled/strategy/concurrency.rb

@@ -18,17 +18,15 @@ module Sidekiq
         private_constant :SCRIPT
 
         # @param [#to_s] strategy_key
-        # @param [Hash] opts
-        # @option opts [#to_i] :limit Amount of allowed concurrent jobs
-        #   processors running for given key
-        # @option opts [#to_i] :ttl (15 minutes) Concurrency lock TTL
-        #   in seconds
-        # @option opts :key_suffix Proc for dynamic key suffix.
-        def initialize(strategy_key, opts)
+        # @param [#to_i, #call] limit Amount of allowed concurrent jobs
+        #   per processors running for given key.
+        # @param [#to_i] ttl Concurrency lock TTL in seconds.
+        # @param [Proc] key_suffix Dynamic key suffix generator.
+        def initialize(strategy_key, limit:, ttl: 900, key_suffix: nil)
           @base_key   = "#{strategy_key}:concurrency".freeze
-          @limit      = opts.fetch(:limit)
-          @ttl        = opts.fetch(:ttl, 900).to_i
-          @key_suffix = opts[:key_suffix]
+          @limit      = limit
+          @ttl        = ttl.to_i
+          @key_suffix = key_suffix
         end
 
         # @return [Integer] Amount of allowed concurrent job processors

data/lib/sidekiq/throttled/strategy/threshold.rb

@@ -30,14 +30,15 @@ module Sidekiq
         private_constant :SCRIPT
 
         # @param [#to_s] strategy_key
-        # @param [Hash] opts
-        # @option opts [#to_i] :limit Amount of jobs allowed per period
-        # @option opts [#to_f] :period Period in seconds
-        def initialize(strategy_key, opts)
+        # @param [#to_i, #call] limit Amount of allowed concurrent jobs
+        #   per period running for given key.
+        # @param [#to_f, #call] :period Period in seconds.
+        # @param [Proc] key_suffix Dynamic key suffix generator.
+        def initialize(strategy_key, limit:, period:, key_suffix: nil)
           @base_key   = "#{strategy_key}:threshold".freeze
-          @limit      = opts.fetch(:limit)
-          @period     = opts.fetch(:period)
-          @key_suffix = opts[:key_suffix]
+          @limit      = limit
+          @period     = period
+          @key_suffix = key_suffix
         end
 
         # @return [Integer] Amount of jobs allowed per period

data/lib/sidekiq/throttled/version.rb

@@ -3,6 +3,6 @@
 module Sidekiq
   module Throttled
     # Gem version
-    VERSION = "0.6.5".freeze
+    VERSION = "0.6.6".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-throttled
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Alexey V Zapparov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-04 00:00:00.000000000 Z
+date: 2016-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq