sidekiq-rate-limiter 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: eed802823e01b40545973fe5e2ddd21c5fa85002
-  data.tar.gz: 33ffa14b502ca8872d1573752c0e3eab5fc9799e
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NzYyZTNjZTE0YjQzMjQzNzMzZWJlOWU3Y2VkY2ZhNmVlYzQxZTQ1Ng==
+  data.tar.gz: !binary |-
+    ZjA1MjIyNzEzNzU0NWRkMzMxMzE2YWJkZWZiODM5YmY3MTM2MzY4Yg==
 SHA512:
-  metadata.gz: ae5a1738821693e8a9bde19b9495cdbf4e87fd9ec7d20457460ec42a76c327cac522db118032178e833b2c83ec7328b89d0f75d19bac2f0fd6c34c0d4bbd30a3
-  data.tar.gz: 79e48fc5d5b222bdb3e1bc0cedb0b4a9b32372508ef284b4f246fd8c235c5cbaedf1d80f3d9e9048241bbcf2e3f3ade04756284a8169e6d4f49f508d30706e7a
+  metadata.gz: !binary |-
+    MzdmZTI5NThhY2VhY2MxNmFlMTg5NGUwNjFjM2ZkZjA3ZDQ5NjQ4NTY0MTA2
+    MTc0YTEwMDFjODA1Y2Y2MDBmNDQwNGM1MTc5OTE3ZmRiNWQzN2E2ZjBiMGEw
+    NDQ1MzA3NTQ1MjdmYjdkMjA4OTY5OGM0NjU4OWMwNDA4MDkzNGI=
+  data.tar.gz: !binary |-
+    ZWZlNzNhOTg0MzRkZmYyYWYzM2U2ZDhlMzgwMjQ0MmJlNjQ5NzdkOTMwNWNh
+    NmMyOTBmNTMwNzQ4NWUwZmRmOWY3NmNhM2E5ZjMzNmZiMmQyYWNhMmE4YmQ3
+    YjNjYjMxNDRmZGFkZWIxOTgxNWVjYmEzOGZkOWNlYmVlZjVjNDQ=

data/.gitignore

@@ -5,3 +5,7 @@ pkg/
 coverage/
 *.swp
 spec/support/redis/
+dump.rdb
+.pryrc
+.byebug_history
+*.gemfile.lock

data/.simplecov

@@ -1,12 +1,6 @@
-unless ENV['COVERAGE'] == 'false'
-  require 'simplecov-rcov'
+require 'coveralls'
 
-  class SimpleCov::Formatter::MergedFormatter
-    def format(result)
-      SimpleCov::Formatter::HTMLFormatter.new.format(result)
-      SimpleCov::Formatter::RcovFormatter.new.format(result)
-    end
-  end
-
-  SimpleCov.formatter = SimpleCov::Formatter::MergedFormatter
+Coveralls.wear! do
+  add_filter "vendor"
+  add_filter "spec"
 end

data/.travis.yml

@@ -1,4 +1,20 @@
 language: ruby
+cache: bundler
+sudo: false
 rvm:
-  - 2.0.0
-  - 1.9.3
+  - 2.3.0
+  - 2.2.4
+  - 2.1.8
+
+gemfile:
+  - 'gemfiles/sidekiq_2.gemfile'
+  - 'gemfiles/sidekiq_3.gemfile'
+  - 'gemfiles/sidekiq_4.gemfile'
+
+deploy:
+  provider: rubygems
+  api_key:
+    secure: "VX48kpd9UySMWSDMwjxaNZy14RW1usU7eFLGNeohjCzxUsCywn+mS5/IZHl56vDXWJp7JwnboDiIa74hGV86PcSEM7kr+DAZO33iCazMNTpoWDiH1iJfj0jZbO2rOvx0rGI9fGYcC9xfyKQ37hVb13Eo0bnKa0YX30HArnx7EFo="
+  on:
+    tags: true
+    all_branches: true

data/Gemfile

@@ -1,2 +1,2 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 gemspec

data/README.md

@@ -1,13 +1,16 @@
 sidekiq-rate-limiter
 ====================
 
-[![Build Status](https://secure.travis-ci.org/enova/sidekiq-rate-limiter.png)](http://travis-ci.org/enova/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.0.0 and 1.9.3.
+sidekiq-rate-limiter is actively tested against MRI versions 2.1, 2.2, and 2.3.
 
 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

data/gemfiles/sidekiq_2.gemfile

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

data/gemfiles/sidekiq_3.gemfile

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

data/gemfiles/sidekiq_4.gemfile

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

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

@@ -1,4 +1,5 @@
-require 'celluloid'
+require 'sidekiq'
+require 'celluloid' if Sidekiq::VERSION < "4"
 require 'sidekiq/fetch'
 require 'redis_rate_limiter'
 
@@ -12,7 +13,7 @@ module Sidekiq::RateLimiter
     end
 
     def limit(work)
-      message = JSON.parse(work.message) rescue {}
+      message = JSON.parse(work.respond_to?(:message) ? work.message : work.job) rescue {}
 
       args      = message['args']
       klass     = message['class']
@@ -33,7 +34,7 @@ module Sidekiq::RateLimiter
       Sidekiq.redis do |conn|
         lim = Limit.new(conn, options)
         if lim.exceeded?(klass)
-          conn.lpush("queue:#{work.queue_name}", work.message)
+          conn.lpush("queue:#{work.queue_name}", work.respond_to?(:message) ? work.message : work.job)
           nil
         else
           lim.add(klass)

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

@@ -1,5 +1,5 @@
 module Sidekiq
   module RateLimiter
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/sidekiq-rate-limiter.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.license     = 'MIT'
   s.version     = Sidekiq::RateLimiter::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Blake Thomas", "Enova"]
+  s.authors     = ["Docady", "Blake Thomas", "Enova"]
   s.email       = ["bwthomas@gmail.com"]
   s.homepage    = "https://github.com/enova/sidekiq-rate-limiter"
   s.summary     = %q{Redis-backed, per-worker rate limits for job processing}
@@ -21,12 +21,12 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency "pry"
+  s.add_development_dependency "pry-byebug"
   s.add_development_dependency "rake"
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "simplecov"
-  s.add_development_dependency "simplecov-rcov"
+  s.add_development_dependency "rspec", '~> 3.4'
+  s.add_development_dependency "coveralls", '~> 0.8'
 
   s.add_dependency "redis"
-  s.add_dependency "sidekiq", ">= 2.0", "< 4.0"
+  s.add_dependency "sidekiq", ">= 2.0", "< 5.0"
   s.add_dependency "redis_rate_limiter"
 end

data/spec/sidekiq-rate-limiter/fetch_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'sidekiq'
 require 'sidekiq/api'
 
-describe Sidekiq::RateLimiter::Fetch do
+RSpec.describe Sidekiq::RateLimiter::Fetch do
   before(:all) do
     class Job
       include Sidekiq::Worker
@@ -36,48 +36,58 @@ describe Sidekiq::RateLimiter::Fetch do
   let(:redis_class)   { Sidekiq.redis { |conn| conn.class } }
 
   it 'should inherit from Sidekiq::BasicFetch' do
-    described_class.should < Sidekiq::BasicFetch
+    expect(described_class).to be < Sidekiq::BasicFetch
   end
 
   it 'should retrieve work with strict setting' do
+    timeout =
+      if defined? Sidekiq::BasicFetch::TIMEOUT
+        Sidekiq::BasicFetch::TIMEOUT
+      else
+        Sidekiq::Fetcher::TIMEOUT
+      end
+
     fetch = described_class.new options.merge(:strict => true)
-    fetch.queues_cmd.should eql(["queue:#{queue}", "queue:#{another_queue}", 1])
+    expect(fetch.queues_cmd).to eql(["queue:#{queue}", "queue:#{another_queue}", timeout])
   end
 
   it 'should retrieve work', queuing: true do
     worker.perform_async(*args)
-    fetch = described_class.new(options)
+    fetch   = described_class.new(options)
     work    = fetch.retrieve_work
-    parsed  = JSON.parse(work.message)
+    parsed  = JSON.parse(work.respond_to?(:message) ? work.message : work.job)
 
-    work.should_not be_nil
-    work.queue_name.should eql(queue)
-    work.acknowledge.should be_nil
+    expect(work).not_to be_nil
+    expect(work.queue_name).to eql(queue)
+    expect(work.acknowledge).to be_nil
 
-    parsed.should include(worker.get_sidekiq_options)
-    parsed.should include("class" => worker.to_s, "args" => args)
-    parsed.should include("jid", "enqueued_at")
+    expect(parsed).to include(worker.get_sidekiq_options)
+    expect(parsed).to include("class" => worker.to_s, "args" => args)
+    expect(parsed).to include("jid", "enqueued_at")
 
     q = Sidekiq::Queue.new(queue)
-    q.size.should == 0
+    expect(q.size).to eq 0
   end
 
   it 'should place rate-limited work at the back of the queue', queuing: true do
     worker.perform_async(*args)
-    Sidekiq::RateLimiter::Limit.any_instance.should_receive(:exceeded?).and_return(true)
-    redis_class.any_instance.should_receive(:lpush).exactly(:once).and_call_original
+    expect_any_instance_of(Sidekiq::RateLimiter::Limit).to receive(:exceeded?).and_return(true)
+    expect_any_instance_of(redis_class).to receive(:lpush).exactly(:once).and_call_original
 
     fetch = described_class.new(options)
-    fetch.retrieve_work.should be_nil
+    expect(fetch.retrieve_work).to be_nil
 
     q = Sidekiq::Queue.new(queue)
-    q.size.should == 1
+    expect(q.size).to eq 1
   end
 
   it 'should accept procs for limit, name, and period config keys', queuing: true do
     proc_worker.perform_async(1,2)
 
-    Sidekiq::RateLimiter::Limit.should_receive(:new).with(anything(), {:limit => 2, :interval => 2, :name => "2"}).and_call_original
+    expect(Sidekiq::RateLimiter::Limit).
+      to receive(:new).
+      with(anything(), {:limit => 2, :interval => 2, :name => "2"}).
+      and_call_original
 
     fetch = described_class.new(options)
     work   = fetch.retrieve_work

data/spec/sidekiq-rate-limiter/server_spec.rb

@@ -1,20 +1,20 @@
 require 'spec_helper'
 
-describe Sidekiq::RateLimiter, 'server configuration' do
+RSpec.describe Sidekiq::RateLimiter, 'server configuration' do
   before do
-    Sidekiq.stub(:server? => true)
+    allow(Sidekiq).to receive(:server?).and_return true
     require 'sidekiq-rate-limiter/server'
   end
 
   it 'should set Sidekiq.options[:fetch] as desired' do
     Sidekiq.configure_server do |config|
-      Sidekiq.options[:fetch].should eql(Sidekiq::RateLimiter::Fetch)
+      expect(Sidekiq.options[:fetch]).to eql(Sidekiq::RateLimiter::Fetch)
     end
   end
 
   it 'should inherit from Sidekiq::BasicFetch' do
     Sidekiq.configure_server do |config|
-      Sidekiq.options[:fetch].should < Sidekiq::BasicFetch
+      expect(Sidekiq.options[:fetch]).to be < Sidekiq::BasicFetch
     end
   end
 end

data/spec/spec_helper.rb

@@ -45,19 +45,16 @@ Sidekiq.configure_server do |config|
 end
 ##
 
-## Configuring simplecov
 require 'simplecov'
 
-SimpleCov.start do
-  add_filter "vendor"
-  add_filter "spec"
-end
-
 require File.expand_path("../../lib/sidekiq-rate-limiter", __FILE__)
 ##
 
 ## Hook to set Sidekiq::Testing mode using rspec tags
 RSpec.configure do |config|
+  config.disable_monkey_patching!
+  config.expose_current_running_example_as :example
+
   config.before(:each) do
     ## Use metadata to determine testing behavior
     ## for queuing.

metadata

@@ -1,132 +1,133 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-rate-limiter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
+- Docady
 - Blake Thomas
 - Enova
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2016-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   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'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry-byebug
   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'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   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'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: simplecov-rcov
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.0'
     - - <
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.0'
     - - <
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: redis_rate_limiter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Redis-backed, per-worker rate limits for job processing
@@ -145,6 +146,9 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- gemfiles/sidekiq_2.gemfile
+- gemfiles/sidekiq_3.gemfile
+- gemfiles/sidekiq_4.gemfile
 - lib/sidekiq-rate-limiter.rb
 - lib/sidekiq-rate-limiter/fetch.rb
 - lib/sidekiq-rate-limiter/server.rb
@@ -164,22 +168,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: nowarning
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Redis-backed, per-worker rate limits for job processing
-test_files:
-- spec/sidekiq-rate-limiter/fetch_spec.rb
-- spec/sidekiq-rate-limiter/server_spec.rb
-- spec/spec_helper.rb
-- spec/support/redis/.keep
+test_files: []