sidekiq-throttled 0.14.1 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe88fba2840a8a649b6a02951a246176e8b548257997aeaf922c7582e8c27e17
-  data.tar.gz: 76ba37d70509e33a266e7ad1e9e51babd4afd874788a1548b1aabc3a1c1cad87
+  metadata.gz: 0d5b08aaa416f7adec0d56410ddfef0fb59281bc27e18591d3c8544427b76013
+  data.tar.gz: fdad22d2e55acf1f0b3c7d70b415f809773282a506623adf19e35ce200d09cab
 SHA512:
-  metadata.gz: 14979e92d96a56096f19e61a40f8343025de2ccb4a57ede6f311be83acd80cca44d9bae7448ad2453e9539aa599c6154d2eec9f2a285148f14d2ad70fa9d86c4
-  data.tar.gz: 8ad7ee2999f8ab2645bdff54efc2b2592b5d416807795f58454af1a5f03ae3099975db492bbab4658cd2b9d5160af705c5509536c9dd7dddaa1db35c5ebe4448
+  metadata.gz: ff4b9175c7efa4da06551237105de88c0a7a31d6f26fd7121d90c6e0da3b8e063ad8cb013ff62ff735ff8830350bf287362d2f1c3197b668b7abbe55be0c45ab
+  data.tar.gz: d4e6906ea2052f8543707f9ad9fcfeec275b5dae5f99082af9cdf5ba6d9a981c14dc62923913f64fe3c67171865b6289730061eead667aa820531ee0c92554cb

data/.github/workflows/ci.yml

@@ -11,9 +11,10 @@ jobs:
     name: "rspec (ruby:${{ matrix.ruby }} sidekiq:${{ matrix.sidekiq }})"
 
     strategy:
+      fail-fast: false
       matrix:
-        ruby: [ "2.6", "2.7" ]
-        sidekiq: [ "5.0", "5.1", "5.2", "6.0", "6.1" ]
+        ruby: [ "2.6", "2.7", "3.0" ]
+        sidekiq: [ "5.0", "5.1", "5.2", "6.0", "6.1", "6.2", "6.3" ]
 
     runs-on: ubuntu-latest
 
@@ -32,9 +33,7 @@ jobs:
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-
-      - name: bundle install
-        run: bundle install --without development --jobs 4 --retry 3
+          bundler-cache: true
 
       - run: bundle exec rspec
 
@@ -46,9 +45,7 @@ jobs:
 
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "2.4"
-
-      - name: bundle install
-        run: bundle install --without development --jobs 4 --retry 3
+          ruby-version: "2.6"
+          bundler-cache: true
 
       - run: bundle exec rubocop

data/.rubocop.yml

@@ -16,4 +16,4 @@ AllCops:
     - gemfiles/**/*
     - vendor/**/*
   NewCops: enable
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.6

data/Appraisals

@@ -19,3 +19,11 @@ end
 appraise "sidekiq-6.1" do
   gem "sidekiq", "~> 6.1.0"
 end
+
+appraise "sidekiq-6.2" do
+  gem "sidekiq", "~> 6.2.0"
+end
+
+appraise "sidekiq-6.3" do
+  gem "sidekiq", "~> 6.3.0"
+end

data/CHANGES.md

@@ -1,3 +1,33 @@
+## 0.15.1 (2023-04-10)
+
+* Lock `redis-prescription` to `~> 2.5` and update the code
+
+## 0.15.0 (2021-12-16)
+
+* [#102](https://github.com/sensortower/sidekiq-throttled/pull/102)
+  Support Ruby 3.0 and Sidekiq 6.2+.
+  ([@ybiquitous])
+
+* [#97](https://github.com/sensortower/sidekiq-throttled/pull/97)
+  Fix kwargs usage in strategy collection.
+  ([@baptistejub])
+
+## 0.14.0 (2021-09-21)
+
+* [#98](https://github.com/sensortower/sidekiq-throttled/pull/98)
+  Remove warning for strategy override.
+  ([@mattiagiuffrida-st])
+
+* [#65](https://github.com/sensortower/sidekiq-throttled/pull/65)
+  Support composite (multi-key) strategies.
+  ([@holyketzer])
+
+* [#89](https://github.com/sensortower/sidekiq-throttled/pull/89),
+  [#96](https://github.com/sensortower/sidekiq-throttled/pull/96), and
+  [#93](https://github.com/sensortower/sidekiq-throttled/pull/93)
+  Improve documentation.
+  ([@hubertjakubiak], [@khaile], and [@kylerippey])
+
 ## 0.13.0 (2020-07-28)
 
 * [#85](https://github.com/sensortower/sidekiq-throttled/pull/85)
@@ -221,3 +251,10 @@
 [@lenon]: https://github.com/lenon
 [@vaot]: https://github.com/vaot
 [@hmaack]: https://github.com/hmaack
+[@holyketzer]: https://github.com/holyketzer
+[@hubertjakubiak]: https://github.com/hubertjakubiak
+[@kylerippey]: https://github.com/kylerippey
+[@khaile]: https://github.com/khaile
+[@mattiagiuffrida-st]: https://github.com/mattiagiuffrida-st
+[@baptistejub]: https://github.com/baptistejub
+[@ybiquitous]: https://github.com/ybiquitous

data/LICENSE.md

@@ -1,5 +1,6 @@
 The MIT License (MIT)
 
+Copyright (c) 2020-2021 Alexey Zapparov, SensorTower Inc.
 Copyright (c) 2015-2020 SensorTower Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

data/README.md

@@ -235,6 +235,7 @@ versions:
 
 * Ruby 2.6.x
 * Ruby 2.7.x
+* Ruby 3.0.x
 
 If something doesn't work on one of these versions, it's a bug.
 
@@ -259,6 +260,8 @@ This library aims to support work with following [Sidekiq][sidekiq] versions:
 * Sidekiq 5.2.x
 * Sidekiq 6.0.x
 * Sidekiq 6.1.x
+* Sidekiq 6.2.x
+* Sidekiq 6.3.x
 
 
 ## Contributing
@@ -286,7 +289,7 @@ Don't forget to run `appraisal update` after any changes to `Gemfile`.
 
 ## Copyright
 
-Copyright (c) 2015-2020 SensorTower Inc.
+Copyright (c) 2020-2021 Alexey Zapparov, SensorTower Inc.
 See LICENSE.md for further details.
 
 

data/gemfiles/sidekiq_5.0.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", "~> 5.0.0"
 
 group :development do

data/gemfiles/sidekiq_5.1.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", "~> 5.1.0"
 
 group :development do

data/gemfiles/sidekiq_5.2.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", "~> 5.2.0"
 
 group :development do

data/gemfiles/sidekiq_6.0.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", "~> 6.0.0"
 
 group :development do

data/gemfiles/sidekiq_6.1.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", "~> 6.1.0"
 
 group :development do

data/gemfiles/sidekiq_6.2.gemfile

@@ -0,0 +1,31 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rake"
+gem "rspec"
+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", "~> 6.2.0"
+
+group :development do
+  gem "byebug"
+  gem "guard", require: false
+  gem "guard-rspec", require: false
+  gem "guard-rubocop", require: false
+end
+
+group :test do
+  gem "apparition"
+  gem "capybara"
+  gem "coveralls", require: false
+  gem "puma"
+  gem "rack-test"
+  gem "simplecov"
+  gem "sinatra"
+  gem "timecop"
+end
+
+gemspec path: "../"

data/gemfiles/sidekiq_6.3.gemfile

@@ -0,0 +1,31 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rake"
+gem "rspec"
+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", "~> 6.3.0"
+
+group :development do
+  gem "byebug"
+  gem "guard", require: false
+  gem "guard-rspec", require: false
+  gem "guard-rubocop", require: false
+end
+
+group :test do
+  gem "apparition"
+  gem "capybara"
+  gem "coveralls", require: false
+  gem "puma"
+  gem "rack-test"
+  gem "simplecov"
+  gem "sinatra"
+  gem "timecop"
+end
+
+gemspec path: "../"

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

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

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

@@ -20,7 +20,7 @@ module Sidekiq
         #       PUSH(@key, @jid)
         #       return 0
         #     end
-        SCRIPT = Redis::Prescription.read "#{__dir__}/concurrency.lua"
+        SCRIPT = RedisPrescription.new(File.read("#{__dir__}/concurrency.lua"))
         private_constant :SCRIPT
 
         # @param [#to_s] strategy_key
@@ -50,7 +50,7 @@ module Sidekiq
           argv = [jid.to_s, job_limit, @ttl, Time.now.to_f]
 
           Sidekiq.redis do |redis|
-            1 == SCRIPT.eval(redis, :keys => keys, :argv => argv)
+            1 == SCRIPT.call(redis, :keys => keys, :argv => argv)
           end
         end
 

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

@@ -30,7 +30,7 @@ module Sidekiq
         #
         #     increase!
         #     return 0
-        SCRIPT = Redis::Prescription.read "#{__dir__}/threshold.lua"
+        SCRIPT = RedisPrescription.new(File.read("#{__dir__}/threshold.lua"))
         private_constant :SCRIPT
 
         # @param [#to_s] strategy_key
@@ -67,7 +67,7 @@ module Sidekiq
           argv = [job_limit, period(job_args), Time.now.to_f]
 
           Sidekiq.redis do |redis|
-            1 == SCRIPT.eval(redis, :keys => keys, :argv => argv)
+            1 == SCRIPT.call(redis, :keys => keys, :argv => argv)
           end
         end
 

data/lib/sidekiq/throttled/strategy_collection.rb

@@ -60,10 +60,9 @@ module Sidekiq
       def make_strategy(strategy, name, key_suffix, options)
         return unless options
 
-        strategy.new("throttled:#{name}", {
+        strategy.new("throttled:#{name}",
           :key_suffix => key_suffix,
-          **options
-        })
+          **options)
       end
     end
   end

data/lib/sidekiq/throttled/version.rb

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

data/sidekiq-throttled.gemspec

@@ -24,11 +24,11 @@ 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.required_ruby_version = ">= 2.6"
 
   spec.add_runtime_dependency "concurrent-ruby"
-  spec.add_runtime_dependency "redis-prescription"
+  spec.add_runtime_dependency "redis-prescription", "~> 2.5"
   spec.add_runtime_dependency "sidekiq"
 
-  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "bundler", ">= 2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-throttled
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.15.1
 platform: ruby
 authors:
 - Alexey V Zapparov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-21 00:00:00.000000000 Z
+date: 2023-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -28,16 +28,16 @@ dependencies:
   name: redis-prescription
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -56,14 +56,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 description: Concurrency and threshold throttling for Sidekiq.
@@ -99,6 +99,8 @@ files:
 - gemfiles/sidekiq_5.2.gemfile
 - gemfiles/sidekiq_6.0.gemfile
 - gemfiles/sidekiq_6.1.gemfile
+- gemfiles/sidekiq_6.2.gemfile
+- gemfiles/sidekiq_6.3.gemfile
 - lib/sidekiq/throttled.rb
 - lib/sidekiq/throttled/communicator.rb
 - lib/sidekiq/throttled/communicator/callbacks.rb
@@ -141,7 +143,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -150,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Concurrency and threshold throttling for Sidekiq.