sidekiq-rate-limiter 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da0ce704c9994a18ca7c39d7538a5ae94c39077b13cbb778268852257b6a3f32
-  data.tar.gz: cfef0d3b9cbd392603bdcc7e7f2110f10a91714623968dc058c425efc7ec871f
+  metadata.gz: f6a789f11daae2a1ae0f8d876c9a87e4245ba2604b22f6c980afbcb640127b61
+  data.tar.gz: 6525e4db367acc2bed4d215c6fce4f525e6432801761efdb44f6e03fb282a17f
 SHA512:
-  metadata.gz: facff020ca688b54a9ce5b294b14f5f7a931c45efb9af22cbfbbb7c1d85c772697e076220ae17e7b6a249adf9c1f4c024de670072e15d8b520a799e15907babf
-  data.tar.gz: fa1f1d598646e7601bd505cf6c5dab9979ae2bd3b39fb14e93d32c248036ef044ab1125d5f5e2e35dfbe70eb7f0d6869fc4fa2a1130fde06eba1f6a40cb94162
+  metadata.gz: 2277e1beeaa770bf971a22763ab7c0eb6bbd4fdb2e331bd65af5dba09df138e7c4b7ecc2fc91bfe3ef45e5dd4b06495db7edbfe41202664f72e78c64fac004bd
+  data.tar.gz: 9c23eee484ea10a10ccffec8bf733b9c6cfdbdca003158fb803e6a9fdfc703dc4bfcc489ad27967aaa5b2b08f5788ffa4c8c63a0fc21d624ab1681ec94eacc32

data/.travis.yml

@@ -2,14 +2,12 @@ language: ruby
 cache: bundler
 sudo: false
 rvm:
-  - 2.3.0
-  - 2.2.4
-  - 2.1.8
+  - 2.5.1
+  - 2.4.4
 
 gemfile:
-  - 'gemfiles/sidekiq_2.gemfile'
-  - 'gemfiles/sidekiq_3.gemfile'
   - 'gemfiles/sidekiq_4.gemfile'
+  - 'gemfiles/sidekiq_5.gemfile'
 
 deploy:
   provider: rubygems

data/README.md

@@ -4,16 +4,15 @@ sidekiq-rate-limiter
 [![Gem Version](https://badge.fury.io/rb/sidekiq-rate-limiter.svg)](https://rubygems.org/gems/sidekiq-rate-limiter)
 [![Build Status](https://secure.travis-ci.org/enova/sidekiq-rate-limiter.svg?branch=master)](http://travis-ci.org/enova/sidekiq-rate-limiter)
 [![Coverage Status](https://coveralls.io/repos/github/enova/sidekiq-rate-limiter/badge.svg?branch=master)](https://coveralls.io/github/enova/sidekiq-rate-limiter?branch=master)
-[![Dependency Status](https://gemnasium.com/enova/sidekiq-rate-limiter.svg)](https://gemnasium.com/enova/sidekiq-rate-limiter)
 
 Redis-backed, per-worker rate limits for job processing.
 
 ## Compatibility
 
-sidekiq-rate-limiter is actively tested against MRI versions 2.1, 2.2, and 2.3.
+sidekiq-rate-limiter is actively tested against MRI versions 2.4 and 2.5.
 
 sidekiq-rate-limiter works by using a custom fetch class, the class responsible
-for pulling work from the queue stored in redis. Consequently you'll want to be
+for pulling work from the queue stored in Redis. Consequently you'll want to be
 careful about using other gems that use a same strategy, [sidekiq-priority](https://github.com/socialpandas/sidekiq-priority)
 being one example.
 
@@ -32,7 +31,7 @@ class MyWorker
 end
 ```
 
-Then you wouldn't need to change anything. 
+Then you wouldn't need to change anything.
 
 ## Installation
 
@@ -60,12 +59,14 @@ require 'sidekiq-rate-limiter/server'
 
 Or, if you prefer, amend your Gemfile like so:
 
-    gem 'sidekiq-rate-limiter', :require => 'sidekiq-rate-limiter/server'
+```ruby
+gem 'sidekiq-rate-limiter', require: 'sidekiq-rate-limiter/server'
+```
 
-By default the limiter uses the name 'sidekiq-rate-limiter'. You can define the
-constant ```Sidekiq::RateLimiter::DEFAULT_LIMIT_NAME``` prior to requiring to
-change this. Alternatively, you can include a 'name' parameter in the configuration
-hash included in sidekiq_options
+By default the limiter uses the name `sidekiq-rate-limiter`. You can define the
+constant `Sidekiq::RateLimiter::DEFAULT_LIMIT_NAME` prior to requiring to
+change this. Alternatively, you can include a `name` parameter in the configuration
+hash included in `sidekiq_options`
 
 For example, the following:
 
@@ -73,11 +74,11 @@ For example, the following:
   class Job
     include Sidekiq::Worker
 
-    sidekiq_options :queue => 'some_silly_queue',
-                    :rate  => {
-                      :name   => 'my_super_awesome_rate_limit',
-                      :limit  => 50,
-                      :period => 3600, ## An hour
+    sidekiq_options queue: 'some_silly_queue',
+                    rate: {
+                      name:   'my_super_awesome_rate_limit',
+                      limit:  50,
+                      period: 3600, ## An hour
                     }
 
     def perform(*args)
@@ -86,7 +87,7 @@ For example, the following:
 ```
 
 The configuration above would result in any jobs beyond the first 50 in a one
-hour period being delayed. The server will continue to fetch items from redis, &
+hour period being delayed. The server will continue to fetch items from Redis, &
 will place any items that are beyond the threshold at the back of their queue.
 
 ### Dynamic Configuration
@@ -99,11 +100,11 @@ The `Proc` may receive as its arguments the same values that will be passed to `
 class Job
   include Sidekiq::Worker
 
-  sidekiq_options :queue => "my_queue",
-                  :rate => {
-                    :name   => ->(user_id, rate_limit) { user_id },
-                    :limit  => ->(user_id, rate_limit) { rate_limit },
-                    :period => ->{ Date.today.monday? ? 2.hours : 4.hours }, # can ignore arguments
+  sidekiq_options queue: "my_queue",1
+                  rate: {
+                    name:   ->(user_id, rate_limit) { user_id },
+                    limit:  ->(user_id, rate_limit) { rate_limit },
+                    period: ->{ Date.today.monday? ? 2.hours : 4.hours }, # can ignore arguments
                   }
 
   def perform(user_id, rate_limit)
@@ -120,9 +121,9 @@ limited multiple times are counted as 'processed' each time, so the stats balloo
 
 ## TODO
 
-* While it subclasses instead of monkey patching, setting Sidekiq.options[:fetch]
+* While it subclasses instead of monkey patching, setting `Sidekiq.options[:fetch]`
 is still asking for interaction issues. It would be better for this to be directly
-in sidekiq or to use some other means to accomplish this goal.
+in Sidekiq or to use some other means to accomplish this goal.
 
 ## Contributing
 

data/gemfiles/{sidekiq_2.gemfile → sidekiq_5.gemfile}

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 
-gem 'sidekiq', '~> 2.0'
+gem 'sidekiq', '~> 5.0'
 
 gemspec path: '../'

data/lib/sidekiq-rate-limiter/fetch.rb

@@ -1,5 +1,4 @@
 require 'sidekiq'
-require 'celluloid' if Sidekiq::VERSION < "4"
 require 'sidekiq/fetch'
 require 'redis_rate_limiter'
 
@@ -27,7 +26,7 @@ module Sidekiq::RateLimiter
 
       options = {
         :limit    => (limit.respond_to?(:call) ? limit.call(*args) : limit).to_i,
-        :interval => (interval.respond_to?(:call) ? interval.call(*args) : interval).to_f,
+        :interval => (interval.respond_to?(:call) ? interval.call(*args) : interval).to_i,
         :name     => (name.respond_to?(:call) ? name.call(*args) : name).to_s,
       }
 
@@ -90,7 +89,7 @@ module Sidekiq::RateLimiter
       worker_class = @message['class']
       options = Object.const_get(worker_class).get_sidekiq_options rescue {}
       server_rate = options['rate'] || options['throttle'] || {}
-      @server_rate = server_rate.stringify_keys
+      @server_rate = server_rate.map { |k, v| [k.to_s, v] }.to_h
     end
   end
 

data/lib/sidekiq-rate-limiter/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module RateLimiter
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

data/sidekiq-rate-limiter.gemspec

@@ -26,6 +26,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec", '~> 3.4'
   s.add_development_dependency "coveralls", '~> 0.8'
 
-  s.add_dependency "sidekiq", ">= 2.0", "< 6.0"
+  s.add_dependency "sidekiq", ">= 4.0", "< 6.0"
   s.add_dependency "redis_rate_limiter"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-rate-limiter
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Docady
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-05 00:00:00.000000000 Z
+date: 2019-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -88,7 +88,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
@@ -132,9 +132,8 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- gemfiles/sidekiq_2.gemfile
-- gemfiles/sidekiq_3.gemfile
 - gemfiles/sidekiq_4.gemfile
+- gemfiles/sidekiq_5.gemfile
 - lib/sidekiq-rate-limiter.rb
 - lib/sidekiq-rate-limiter/fetch.rb
 - lib/sidekiq-rate-limiter/server.rb

data/gemfiles/sidekiq_3.gemfile

@@ -1,5 +0,0 @@
-source "https://rubygems.org"
-
-gem 'sidekiq', '~> 3.0'
-
-gemspec path: '../'