sidekiq-throttled 0.13.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b1f0237b14be26ff2b25aeaedd80e4029610cfa7c2be331827c5b865c338f48
-  data.tar.gz: 3a5be191a1f02b2ce21b766be820201b6f4d06b74323456412096a0beef38d11
+  metadata.gz: fe88fba2840a8a649b6a02951a246176e8b548257997aeaf922c7582e8c27e17
+  data.tar.gz: 76ba37d70509e33a266e7ad1e9e51babd4afd874788a1548b1aabc3a1c1cad87
 SHA512:
-  metadata.gz: e9da0e99d328b6825ab3f47e1ea94c255717a01d05e28c90399aaf826a8d43a0e10de82baee329ddd8d846ac4e4ff0cb6f09ef11277fef2143972c50b2c3a55b
-  data.tar.gz: d73d011be01f319460fe87fda608aea9550e1f560bf778dfd5628874f0f074fc2020ad5e2f36ec8413a349c6dcd620f7aaa84a48f15e59dab8bf508e3e769354
+  metadata.gz: 14979e92d96a56096f19e61a40f8343025de2ccb4a57ede6f311be83acd80cca44d9bae7448ad2453e9539aa599c6154d2eec9f2a285148f14d2ad70fa9d86c4
+  data.tar.gz: 8ad7ee2999f8ab2645bdff54efc2b2592b5d416807795f58454af1a5f03ae3099975db492bbab4658cd2b9d5160af705c5509536c9dd7dddaa1db35c5ebe4448

data/.github/workflows/ci.yml

@@ -12,10 +12,8 @@ jobs:
 
     strategy:
       matrix:
-        ruby: [ "2.4", "2.5", "2.6", "2.7" ]
-        sidekiq: [ "5.0", "5.1", "5.2", "6.0" ]
-        exclude:
-          - { ruby: "2.4", sidekiq: "6.0" }
+        ruby: [ "2.6", "2.7" ]
+        sidekiq: [ "5.0", "5.1", "5.2", "6.0", "6.1" ]
 
     runs-on: ubuntu-latest
 

data/.rubocop/layout.yml

@@ -0,0 +1,24 @@
+Layout/ArgumentAlignment:
+  EnforcedStyle: with_fixed_indentation
+
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
+
+Layout/FirstArrayElementIndentation:
+  EnforcedStyle: consistent
+
+Layout/FirstHashElementIndentation:
+  Enabled: true
+  EnforcedStyle: consistent
+
+Layout/HashAlignment:
+  Enabled: true
+  EnforcedHashRocketStyle: table
+  EnforcedColonStyle: table
+
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+
+Layout/MultilineMethodCallIndentation:
+  Enabled: true
+  EnforcedStyle: indented

data/.rubocop/lint.yml

@@ -0,0 +1,41 @@
+Lint/BinaryOperatorWithIdenticalOperands:
+  Enabled: true
+
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: true
+
+Lint/DuplicateElsifCondition:
+  Enabled: true
+
+Lint/DuplicateRescueException:
+  Enabled: true
+
+Lint/EmptyConditionalBody:
+  Enabled: true
+
+Lint/FloatComparison:
+  Enabled: true
+
+Lint/MissingSuper:
+  Enabled: true
+
+Lint/MixedRegexpCaptureTypes:
+  Enabled: true
+
+Lint/OutOfRangeRegexpRef:
+  Enabled: true
+
+Lint/RaiseException:
+  Enabled: true
+
+Lint/SelfAssignment:
+  Enabled: true
+
+Lint/StructNewOverride:
+  Enabled: true
+
+Lint/TopLevelReturnWithArgument:
+  Enabled: true
+
+Lint/UnreachableLoop:
+  Enabled: true

data/.rubocop/metrics.yml

@@ -0,0 +1,4 @@
+Metrics/BlockLength:
+  Exclude:
+    - "spec/**/*_spec.rb"
+    - "**/*.gemspec"

data/.rubocop/performance.yml

@@ -0,0 +1,25 @@
+Performance/AncestorsInclude:
+  Enabled: true
+
+Performance/BigDecimalWithNumericArgument:
+  Enabled: true
+
+Performance/RedundantSortBlock:
+  Enabled: true
+
+Performance/RedundantStringChars:
+  Enabled: true
+
+Performance/ReverseFirst:
+  Enabled: true
+
+Performance/SortReverse:
+  Enabled: true
+
+Performance/Squeeze:
+  Enabled: true
+
+Performance/StringInclude:
+  Enabled: true
+
+

data/.rubocop/rspec.yml

@@ -0,0 +1,3 @@
+RSpec/ExampleLength:
+  Enabled: true
+  Max: 10

data/.rubocop/style.yml

@@ -0,0 +1,84 @@
+Style/AccessorGrouping:
+  Enabled: true
+
+Style/ArrayCoercion:
+  Enabled: true
+
+Style/BisectedAttrAccessor:
+  Enabled: true
+
+Style/CaseLikeIf:
+  Enabled: true
+
+Style/Documentation:
+  Enabled: false
+
+Style/ExplicitBlockArgument:
+  Enabled: true
+
+Style/ExponentialNotation:
+  Enabled: true
+
+Style/GlobalStdStream:
+  Enabled: true
+
+Style/HashAsLastArrayItem:
+  Enabled: true
+
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashLikeCase:
+  Enabled: true
+
+Style/HashSyntax:
+  Enabled: true
+  EnforcedStyle: hash_rockets
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+
+Style/OptionalBooleanParameter:
+  Enabled: true
+
+Style/RedundantAssignment:
+  Enabled: true
+
+Style/RedundantFetchBlock:
+  Enabled: true
+
+Style/RedundantFileExtensionInRequire:
+  Enabled: true
+
+Style/RedundantRegexpCharacterClass:
+  Enabled: true
+
+Style/RedundantRegexpEscape:
+  Enabled: true
+
+Style/RegexpLiteral:
+  Enabled: true
+  EnforcedStyle: percent_r
+
+Style/RescueStandardError:
+  Enabled: true
+  EnforcedStyle: implicit
+
+Style/SingleArgumentDig:
+  Enabled: true
+
+Style/SlicingWithRange:
+  Enabled: true
+
+Style/StringConcatenation:
+  Enabled: true
+
+Style/StringLiterals:
+  Enabled: true
+  EnforcedStyle: double_quotes
+
+Style/YodaCondition:
+  Enabled: false

data/.rubocop.yml

@@ -1,100 +1,19 @@
-inherit_from:
-  - .rubocop_todo.yml
-
 require:
+  - rubocop-performance
   - rubocop-rspec
 
-################################################################################
+inherit_from:
+  - .rubocop_todo.yml
+  - .rubocop/layout.yml
+  - .rubocop/lint.yml
+  - .rubocop/metrics.yml
+  - .rubocop/performance.yml
+  - .rubocop/rspec.yml
+  - .rubocop/style.yml
 
 AllCops:
-  DisplayCopNames: true
-  TargetRubyVersion: 2.4
   Exclude:
-    - "gemfiles/*"
-
-## Layout ######################################################################
-
-Layout/ArgumentAlignment:
-  EnforcedStyle: with_fixed_indentation
-
-Layout/FirstArrayElementIndentation:
-  EnforcedStyle: consistent
-
-Layout/FirstHashElementIndentation:
-  EnforcedStyle: consistent
-
-Layout/HashAlignment:
-  EnforcedHashRocketStyle: table
-
-Layout/LineLength:
-  Max: 100
-
-Layout/MultilineMethodCallIndentation:
-  EnforcedStyle: indented
-
-Layout/ParameterAlignment:
-  EnforcedStyle: with_fixed_indentation
-
-Layout/SpaceAroundMethodCallOperator:
-  Enabled: true
-
-Layout/SpaceInLambdaLiteral:
-  EnforcedStyle: require_space
-
-## Lint ########################################################################
-
-Lint/RaiseException:
-  Enabled: true
-
-Lint/StructNewOverride:
-  Enabled: true
-
-## Metrics #####################################################################
-
-Metrics/BlockLength:
-  Exclude:
-    - "Guardfile"
-    - "spec/**/*"
-
-## Styles ######################################################################
-
-Style/Documentation:
-  Enabled: false
-
-Style/ExponentialNotation:
-  Enabled: true
-
-Style/HashEachMethods:
-  Enabled: true
-
-Style/HashSyntax:
-  EnforcedStyle: hash_rockets
-
-Style/HashTransformKeys:
-  Enabled: true
-
-Style/HashTransformValues:
-  Enabled: true
-
-# Follow your heart where it makes sense to use lambda or lambda literal.
-# Enforcing it makes some pieces of code look REALLY terrible, e.g. in
-# case of empty (noop) lambdas: `lambda { |_| }`.
-Style/Lambda:
-  Enabled: false
-
-# Enabling this cop makes Guardfile (which is full of pathname regexps)
-# look absolutley style-inconsistent and terrible. In any case, this should
-# be on developer's choice whenever to use `%r` or not. Just like we don't
-# enforce to use `["foo"]` over `%w(foo)` and so on.
-Style/RegexpLiteral:
-  Enabled: false
-
-Style/RescueStandardError:
-  EnforcedStyle: implicit
-
-Style/StringLiterals:
-  EnforcedStyle: double_quotes
-
-# I prefer Yoda style instead, but there's no such enforcement style.
-Style/YodaCondition:
-  Enabled: false
+    - gemfiles/**/*
+    - vendor/**/*
+  NewCops: enable
+  TargetRubyVersion: 2.4

data/.rubocop_todo.yml

@@ -1,57 +1,32 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2018-09-10 23:47:55 +0000 using RuboCop version 0.58.2.
+# on 2020-09-14 13:53:26 UTC using RuboCop version 0.90.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 5
-# Configuration parameters: CountComments.
-Metrics/MethodLength:
-  Max: 13
-
-# Offense count: 25
-# Configuration parameters: Max.
-RSpec/ExampleLength:
-  Exclude:
-    - 'spec/sidekiq/throttled/communicator/callbacks_spec.rb'
-    - 'spec/sidekiq/throttled/communicator/listener_spec.rb'
-    - 'spec/sidekiq/throttled/communicator_spec.rb'
-    - 'spec/sidekiq/throttled/fetch_spec.rb'
-    - 'spec/sidekiq/throttled/queues_pauser_spec.rb'
-    - 'spec/sidekiq/throttled/strategy_spec.rb'
-    - 'spec/sidekiq/throttled/web/queues_spec.rb'
-    - 'spec/sidekiq/throttled_spec.rb'
-
-# Offense count: 62
+# Offense count: 68
 # Configuration parameters: .
 # SupportedStyles: have_received, receive
 RSpec/MessageSpies:
   EnforcedStyle: receive
 
-# Offense count: 20
-# Configuration parameters: AggregateFailuresByDefault.
+# Offense count: 22
 RSpec/MultipleExpectations:
   Max: 4
 
-# Offense count: 33
+# Offense count: 7
+# Configuration parameters: AllowSubject.
+RSpec/MultipleMemoizedHelpers:
+  Max: 6
+
+# Offense count: 46
 RSpec/NestedGroups:
   Max: 5
 
-# Offense count: 3
+# Offense count: 4
 RSpec/SubjectStub:
   Exclude:
     - 'spec/sidekiq/throttled/communicator_spec.rb'
     - 'spec/sidekiq/throttled/queues_pauser_spec.rb'
-
-# Offense count: 1
-# Configuration parameters: IgnoreSymbolicNames.
-RSpec/VerifiedDoubles:
-  Exclude:
-    - 'spec/sidekiq/throttled/registry_spec.rb'
-
-# Offense count: 1
-Security/MarshalLoad:
-  Exclude:
-    - 'lib/sidekiq/throttled/communicator/listener.rb'

data/Gemfile

@@ -5,9 +5,9 @@ source "https://rubygems.org"
 gem "appraisal"
 gem "rake"
 gem "rspec"
-gem "rubocop",             "~> 0.82.0", :require => false
-gem "rubocop-performance", "~>1.5.2",   :require => false
-gem "rubocop-rspec",       "~> 1.39.0", :require => false
+gem "rubocop",             "~> 0.90.0", :require => false
+gem "rubocop-performance", "~> 1.8.0",  :require => false
+gem "rubocop-rspec",       "~> 1.43.2", :require => false
 gem "sidekiq"
 
 group :development do

data/README.md

@@ -49,12 +49,12 @@ class MyWorker
 
   sidekiq_options :queue => :my_queue
 
-  sidekiq_throttle({
+  sidekiq_throttle(
     # Allow maximum 10 concurrent jobs of this class at a time.
     :concurrency => { :limit => 10 },
     # Allow maximum 1K jobs being processed within one hour window.
     :threshold => { :limit => 1_000, :period => 1.hour }
-  })
+  )
 
   def perform
     # ...
@@ -78,11 +78,11 @@ class MyWorker
 
   sidekiq_options :queue => :my_queue
 
-  sidekiq_throttle({
+  sidekiq_throttle(
     :concurrency => { :limit => 10 },
     :threshold   => { :limit => 100, :period => 1.hour }
     :observer    => MY_OBSERVER
-  })
+  )
 
   def perform(*args)
     # ...
@@ -106,10 +106,10 @@ class MyWorker
 
   sidekiq_options :queue => :my_queue
 
-  sidekiq_throttle({
+  sidekiq_throttle(
     # Allow maximum 10 concurrent jobs per user at a time.
     :concurrency => { :limit => 10, :key_suffix => -> (user_id) { user_id } }
-  })
+  )
 
   def perform(user_id)
     # ...
@@ -128,7 +128,7 @@ class MyWorker
 
   sidekiq_options :queue => :my_queue
 
-  sidekiq_throttle({
+  sidekiq_throttle(
     # Allow maximum 1000 concurrent jobs of this class at a time for VIPs and 10 for all other users.
     :concurrency => {
       :limit      => ->(user_id) { User.vip?(user_id) ? 1_000 : 10 },
@@ -139,7 +139,7 @@ class MyWorker
       :limit      => ->(user_id) { User.vip?(user_id) ? 1_000 : 10 },
       :period     => ->(user_id) { User.vip?(user_id) ? 1.hour : 1.day },
       :key_suffix => ->(user_id) { User.vip?(user_id) ? "vip" : "std" }
-  })
+  )
 
   def perform(user_id)
     # ...
@@ -147,6 +147,30 @@ class MyWorker
 end
 ```
 
+You also can use several different keys to throttle one worker.
+
+``` ruby
+class MyWorker
+  include Sidekiq::Worker
+  include Sidekiq::Throttled::Worker
+
+  sidekiq_options :queue => :my_queue
+
+  sidekiq_throttle(
+    # Allow maximum 10 concurrent jobs per project at a time and maximum 2 jobs per user
+    :concurrency => [
+      { :limit => 10, :key_suffix => -> (project_id, user_id) { project_id } },
+      { :limit => 2, :key_suffix => -> (project_id, user_id) { user_id } }
+    ]
+    # For :threshold it works the same
+  )
+
+  def perform(project_id, user_id)
+    # ...
+  end
+end
+```
+
 **NB** Don't forget to specify `:key_suffix` and make it return different values
 if you are using dynamic limit/period options. Otherwise you risk getting into
 some trouble.
@@ -209,9 +233,8 @@ end
 This library aims to support and is [tested against][travis] the following Ruby
 versions:
 
-* Ruby 2.4.x
-* Ruby 2.5.x
 * Ruby 2.6.x
+* Ruby 2.7.x
 
 If something doesn't work on one of these versions, it's a bug.
 

data/lib/sidekiq/throttled/communicator/callbacks.rb

@@ -53,19 +53,19 @@ module Sidekiq
         # @param [#to_s] event
         # @param [Object] payload
         # @return [void]
-        def run(event, payload = nil)
+        def run(event, payload = nil) # rubocop:disable Metrics/MethodLength
           @mutex.synchronize do
-            Fiber.new do
+            fiber = Fiber.new do
               @handlers[event.to_s].each do |callback|
                 begin
                   callback.call(payload)
                 rescue => e
-                  handle_exception(e, {
-                    :context => "sidekiq:throttled"
-                  })
+                  handle_exception(e, :context => "sidekiq:throttled")
                 end
               end
-            end.resume
+            end
+
+            fiber.resume
           end
         end
       end

data/lib/sidekiq/throttled/communicator/listener.rb

@@ -62,7 +62,7 @@ module Sidekiq
         # - `Exception` is recorded to the log and re-raised.
         #
         # @return [void]
-        def listen
+        def listen # rubocop:disable Metrics/MethodLength
           subscribe
         rescue Sidekiq::Shutdown
           @terminated = true
@@ -88,7 +88,7 @@ module Sidekiq
         # @see http://redis.io/commands/subscribe
         # @see Callbacks#run
         # @return [void]
-        def subscribe
+        def subscribe # rubocop:disable Metrics/MethodLength
           Sidekiq.redis do |conn|
             conn.subscribe @channel do |on|
               on.subscribe do
@@ -97,7 +97,7 @@ module Sidekiq
               end
 
               on.message do |_channel, data|
-                message, payload = Marshal.load(data)
+                message, payload = Marshal.load(data) # rubocop:disable Security/MarshalLoad:
                 @callbacks.run("message:#{message}", payload)
               end
             end

data/lib/sidekiq/throttled/queue_name.rb

@@ -7,7 +7,7 @@ module Sidekiq
     # @private
     module QueueName
       # RegExp used to stip out any redisr-namespace prefixes with `queue:`.
-      QUEUE_NAME_PREFIX_RE = /.*queue:/.freeze
+      QUEUE_NAME_PREFIX_RE = %r{.*queue:}.freeze
       private_constant :QUEUE_NAME_PREFIX_RE
 
       class << self

data/lib/sidekiq/throttled/registry.rb

@@ -18,20 +18,16 @@ module Sidekiq
 
         # Adds strategy to the registry.
         #
-        # @note prints a warning to STDERR upon duplicate strategy name
         # @param (see Strategy#initialize)
         # @return [Strategy]
         def add(name, **kwargs)
           name = name.to_s
 
-          warn "Duplicate strategy name: #{name}" if @strategies[name]
-
           @strategies[name] = Strategy.new(name, **kwargs)
         end
 
         # Adds alias for existing strategy.
         #
-        # @note prints a warning to STDERR upon duplicate strategy name
         # @param (#to_s) new_name
         # @param (#to_s) old_name
         # @raise [RuntimeError] if no strategy found with `old_name`
@@ -40,7 +36,6 @@ module Sidekiq
           new_name = new_name.to_s
           old_name = old_name.to_s
 
-          warn "Duplicate strategy name: #{new_name}" if @strategies[new_name]
           raise "Strategy not found: #{old_name}" unless @strategies[old_name]
 
           @aliases[new_name] = @strategies[old_name]

data/lib/sidekiq/throttled/strategy.rb

@@ -2,6 +2,7 @@
 
 # internal
 require "sidekiq/throttled/errors"
+require "sidekiq/throttled/strategy_collection"
 require "sidekiq/throttled/strategy/concurrency"
 require "sidekiq/throttled/strategy/threshold"
 
@@ -30,15 +31,20 @@ module Sidekiq
       #   See keyword args of {Strategy::Threshold#initialize} for details.
       # @param [#call] key_suffix Dynamic key suffix generator.
       # @param [#call] observer Process called after throttled.
-      def initialize(
-        name,
-        concurrency: nil, threshold: nil, key_suffix: nil, observer: nil
-      )
-        @observer    = observer
-        @concurrency = make_strategy(Concurrency, name, key_suffix, concurrency)
-        @threshold   = make_strategy(Threshold, name, key_suffix, threshold)
+      def initialize(name, concurrency: nil, threshold: nil, key_suffix: nil, observer: nil) # rubocop:disable Metrics/MethodLength
+        @observer = observer
 
-        return if @concurrency || @threshold
+        @concurrency = StrategyCollection.new(concurrency,
+          :strategy   => Concurrency,
+          :name       => name,
+          :key_suffix => key_suffix)
+
+        @threshold = StrategyCollection.new(threshold,
+          :strategy   => Threshold,
+          :name       => name,
+          :key_suffix => key_suffix)
+
+        return if @concurrency.any? || @threshold.any?
 
         raise ArgumentError, "Neither :concurrency nor :threshold given"
       end
@@ -60,6 +66,7 @@ module Sidekiq
 
         if @threshold&.throttled?(*job_args)
           @observer&.call(:threshold, *job_args)
+
           finalize!(jid, *job_args)
           return true
         end
@@ -79,15 +86,6 @@ module Sidekiq
         @concurrency&.reset!
         @threshold&.reset!
       end
-
-      private
-
-      # @return [Base, nil]
-      def make_strategy(strategy, name, key_suffix, options)
-        return unless options
-
-        strategy.new("throttled:#{name}", :key_suffix => key_suffix, **options)
-      end
     end
   end
 end

data/lib/sidekiq/throttled/strategy_collection.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+# internal
+module Sidekiq
+  module Throttled
+    # Collection which transparently group several meta-strategies of one kind
+    #
+    # @private
+    class StrategyCollection
+      include Enumerable
+
+      attr_reader :strategies
+
+      # @param [Hash, Array, nil] strategies Concurrency or Threshold options
+      #   or array of options.
+      #   See keyword args of {Strategy::Concurrency#initialize} for details.
+      #   See keyword args of {Strategy::Threshold#initialize} for details.
+      # @param [Class] strategy class of strategy: Concurrency or Threshold
+      # @param [#to_s] name
+      # @param [#call] key_suffix Dynamic key suffix generator.
+      def initialize(strategies, strategy:, name:, key_suffix:)
+        strategies = (strategies.is_a?(Hash) ? [strategies] : Array(strategies))
+        @strategies = strategies.map do |options|
+          make_strategy(strategy, name, key_suffix, options)
+        end
+      end
+
+      # @param [#call] block
+      # Iterates each strategy in collection
+      def each(&block)
+        @strategies.each(&block)
+      end
+
+      # @return [Boolean] whenever any strategy in collection has dynamic config
+      def dynamic?
+        any?(&:dynamic?)
+      end
+
+      # @return [Boolean] whenever job is throttled or not
+      # by any strategy in collection.
+      def throttled?(*args)
+        any? { |s| s.throttled?(*args) }
+      end
+
+      # Marks job as being processed.
+      # @return [void]
+      def finalize!(*args)
+        each { |c| c.finalize!(*args) }
+      end
+
+      # Resets count of jobs of all avaliable strategies
+      # @return [void]
+      def reset!
+        each(&:reset!)
+      end
+
+      private
+
+      # @return [Base, nil]
+      def make_strategy(strategy, name, key_suffix, options)
+        return unless options
+
+        strategy.new("throttled:#{name}", {
+          :key_suffix => key_suffix,
+          **options
+        })
+      end
+    end
+  end
+end

data/lib/sidekiq/throttled/utils.rb

@@ -9,7 +9,7 @@ module Sidekiq
       # @param name [#to_s] Constant name
       # @return [Object, nil] Resolved constant or nil if failed.
       def constantize(name)
-        name.to_s.sub(/^::/, "").split("::").inject(Object, &:const_get)
+        name.to_s.sub(%r{^::}, "").split("::").inject(Object, &:const_get)
       rescue NameError
         Sidekiq.logger.warn { "Failed to constantize: #{name}" }
         nil

data/lib/sidekiq/throttled/version.rb

@@ -3,6 +3,6 @@
 module Sidekiq
   module Throttled
     # Gem version
-    VERSION = "0.13.0"
+    VERSION = "0.14.1"
   end
 end

data/lib/sidekiq/throttled/web/summary_fix.rb

@@ -4,7 +4,7 @@ module Sidekiq
   module Throttled
     module Web
       module SummaryFix
-        JAVASCRIPT = [File.read(__FILE__.sub(/\.rb$/, ".js")).freeze].freeze
+        JAVASCRIPT = [File.read(File.expand_path("summary_fix.js", __dir__)).freeze].freeze
         HEADERS    = { "Content-Type" => "application/javascript" }.freeze
 
         class << self

data/lib/sidekiq/throttled/web/throttled.html.erb

@@ -14,10 +14,14 @@
       <tr>
         <td style="vertical-align:middle;"><%= name %></td>
         <td style="vertical-align:middle;text-align:center;">
-          <%= Sidekiq::Throttled::Web::Stats.new(strategy.concurrency).to_html %>
+          <% strategy.concurrency.each do |concurrency| %>
+            <%= Sidekiq::Throttled::Web::Stats.new(concurrency).to_html %>
+          <% end %>
         </td>
         <td style="vertical-align:middle;text-align:center;">
-          <%= Sidekiq::Throttled::Web::Stats.new(strategy.threshold).to_html %>
+          <% strategy.threshold.each do |threshold| %>
+            <%= Sidekiq::Throttled::Web::Stats.new(threshold).to_html %>
+          <% end %>
         </td>
         <td style="vertical-align:middle;text-align:center;">
           <form action="<%= root_path %>throttled/<%= CGI.escape name %>/reset" method="post">

data/lib/sidekiq/throttled/web.rb

@@ -57,7 +57,7 @@ module Sidekiq
         end
 
         # rubocop:disable Metrics/AbcSize
-        def register_enhanced_queues_tab(app)
+        def register_enhanced_queues_tab(app) # rubocop:disable Metrics/MethodLength
           pauser = QueuesPauser.instance
 
           app.get("/enhanced-queues") do

data/lib/sidekiq/throttled/worker.rb

@@ -77,7 +77,7 @@ module Sidekiq
           Registry.add(self, **kwargs)
         end
 
-        # Adds current worker to preconfigured throtttling strtegy. Allows
+        # Adds current worker to preconfigured throttling strategy. Allows
         # sharing same pool for multiple workers.
         #
         # First of all we need to create shared throttling strategy:
@@ -85,7 +85,7 @@ module Sidekiq
         #     # Create google_api throttling strategy
         #     Sidekiq::Throttled::Registry.add(:google_api, {
         #       :threshold => { :limit => 123, :period => 1.hour },
-        #       :concurrency => { :limit => 123 }
+        #       :concurrency => { :limit => 10 }
         #     })
         #
         # Now we can assign it to our workers:

data/sidekiq-throttled.gemspec

@@ -24,6 +24,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = "~> 2.6"
+
   spec.add_runtime_dependency "concurrent-ruby"
   spec.add_runtime_dependency "redis-prescription"
   spec.add_runtime_dependency "sidekiq"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-throttled
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.1
 platform: ruby
 authors:
 - Alexey V Zapparov
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-28 00:00:00.000000000 Z
+date: 2021-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -78,6 +78,12 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".rubocop/layout.yml"
+- ".rubocop/lint.yml"
+- ".rubocop/metrics.yml"
+- ".rubocop/performance.yml"
+- ".rubocop/rspec.yml"
+- ".rubocop/style.yml"
 - ".rubocop_todo.yml"
 - ".travis.yml"
 - ".yardopts"
@@ -113,6 +119,7 @@ files:
 - lib/sidekiq/throttled/strategy/concurrency.rb
 - lib/sidekiq/throttled/strategy/threshold.lua
 - lib/sidekiq/throttled/strategy/threshold.rb
+- lib/sidekiq/throttled/strategy_collection.rb
 - lib/sidekiq/throttled/testing.rb
 - lib/sidekiq/throttled/utils.rb
 - lib/sidekiq/throttled/version.rb
@@ -128,23 +135,23 @@ homepage: https://github.com/sensortower/sidekiq-throttled
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Concurrency and threshold throttling for Sidekiq.
 test_files: []