sidekiq-throttled 0.2.0 → 0.3.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d035a47cfda4397f044828ef34ce2adfba25f4a
-  data.tar.gz: d41409aa677dd84626738d1f3860d39acd951d72
+  metadata.gz: 1ab882d56754f6c3919be0df6fcac0c28f8fd636
+  data.tar.gz: bf5faf08f5addaef7328c3e49f042f9fcfcd5579
 SHA512:
-  metadata.gz: f313f44d9f897fffc7bb1c3e503fdac7f6884bd3733eab89ede741a208b071207d7c7e09854fa631a00a0fde7308a6ba1753f8953211c66a55b3d53bfdac6342
-  data.tar.gz: 01f919a66399826c5e67f05b44e86d5440e5e63b6565b5cada2980a12d24f27e296d8d10f76ec4cd1d575e927d84666afa22066eb69d7c49d76374b3cd59cae8
+  metadata.gz: 44411490a00f21cea8dffc48295d98055568d678431dbb6d1cf25da5d463017605c411aaf0252d7ebd9337f797d6fa5b759af3909ab8831aa402de3080ddc2a7
+  data.tar.gz: 477e5b5ce0fb9f72f2bc3815d58af655239f14ba7198321e3cb2800458a96d852fdca8c06d42d17bd86e197a68a616c26ea5b69b8ba7131ec7d603b15d9225ce

data/.gitignore

@@ -1,6 +1,7 @@
 /.bundle/
 /.yardoc
 /Gemfile.lock
+/gemfiles/*.gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/.rubocop.yml

@@ -1,3 +1,6 @@
+AllCops:
+  DisplayCopNames: true
+
 ## Styles ######################################################################
 
 Style/AlignParameters:
@@ -24,6 +27,9 @@ Style/FrozenStringLiteralComment:
 Style/HashSyntax:
   EnforcedStyle: hash_rockets
 
+Style/IndentArray:
+  EnforcedStyle: consistent
+
 Style/IndentHash:
   EnforcedStyle: consistent
 

data/.travis.yml

@@ -18,6 +18,9 @@ matrix:
     - rvm: ruby-head
     - rvm: rbx-2
   fast_finish: true
+gemfile:
+  - gemfiles/sidekiq_3.gemfile
+  - gemfiles/sidekiq_4.gemfile
 before_install:
   - gem install bundler -v 1.10.6
 services:

data/Appraisals

@@ -0,0 +1,8 @@
+appraise "sidekiq-3" do
+  gem "celluloid"
+  gem "sidekiq", "~> 3.0"
+end
+
+appraise "sidekiq-4" do
+  gem "sidekiq", "~> 4.0"
+end

data/CHANGES.md

@@ -1,3 +1,10 @@
+## 0.3.0.pre (2016-04-25)
+
+* [#1](https://github.com/sensortower/sidekiq-throttled/issues/1):
+  Add Sidekiq 4.0 support.
+  ([@ixti])
+
+
 ## 0.2.0 (2016-02-29)
 
 * [#6](https://github.com/sensortower/sidekiq-throttled/pull/6):

data/Gemfile

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 source "https://rubygems.org"
 
+gem "appraisal"
+gem "rspec"
+gem "rubocop", "~> 0.39.0"
+
 group :test do
   gem "coveralls"
   gem "rack-test"
-  gem "rspec"
-  gem "rubocop"
   gem "simplecov", ">= 0.9"
   gem "sinatra", "~> 1.4", ">= 1.4.6"
   gem "timecop"

data/gemfiles/sidekiq_3.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rspec"
+gem "rubocop", "~> 0.39.0"
+gem "celluloid"
+gem "sidekiq", "~> 3.0"
+
+group :test do
+  gem "coveralls"
+  gem "rack-test"
+  gem "simplecov", ">= 0.9"
+  gem "sinatra", "~> 1.4", ">= 1.4.6"
+  gem "timecop"
+end
+
+gemspec :path => "../"

data/gemfiles/sidekiq_4.gemfile

@@ -0,0 +1,18 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rspec"
+gem "rubocop", "~> 0.39.0"
+gem "sidekiq", "~> 4.0"
+
+group :test do
+  gem "coveralls"
+  gem "rack-test"
+  gem "simplecov", ">= 0.9"
+  gem "sinatra", "~> 1.4", ">= 1.4.6"
+  gem "timecop"
+end
+
+gemspec :path => "../"

data/lib/sidekiq/throttled/basic_fetch.rb

@@ -3,7 +3,7 @@
 require "thread"
 
 # 3rd party
-require "celluloid"
+require "celluloid" if Sidekiq::VERSION < "4.0.0"
 require "sidekiq"
 require "sidekiq/fetch"
 
@@ -11,6 +11,12 @@ module Sidekiq
   module Throttled
     # Throttled version of `Sidekiq::BasicFetch` fetcher strategy.
     class BasicFetch < ::Sidekiq::BasicFetch
+      TIMEOUT = 2
+
+      class UnitOfWork < ::Sidekiq::BasicFetch::UnitOfWork
+        alias job message if Sidekiq::VERSION < "4.0.0"
+      end
+
       # Class constructor
       def initialize(*args)
         @mutex      = Mutex.new
@@ -24,13 +30,13 @@ module Sidekiq
         work = brpop
         return unless work
 
-        work = ::Sidekiq::BasicFetch::UnitOfWork.new(*work)
-        return work unless Throttled.throttled? work.message
+        work = UnitOfWork.new(*work)
+        return work unless Throttled.throttled? work.job
 
         queue = "queue:#{work.queue_name}"
 
         @mutex.synchronize { @suspended << queue }
-        Sidekiq.redis { |conn| conn.lpush(queue, work.message) }
+        Sidekiq.redis { |conn| conn.lpush(queue, work.job) }
 
         nil
       end
@@ -53,11 +59,11 @@ module Sidekiq
         end
 
         if queues.empty?
-          sleep Sidekiq::Fetcher::TIMEOUT
+          sleep TIMEOUT
           return
         end
 
-        Sidekiq.redis { |conn| conn.brpop(*queues, Sidekiq::Fetcher::TIMEOUT) }
+        Sidekiq.redis { |conn| conn.brpop(*queues, TIMEOUT) }
       end
     end
   end

data/lib/sidekiq/throttled/strategy.rb

@@ -25,16 +25,17 @@ module Sidekiq
       def initialize(name, concurrency: nil, threshold: nil, key_suffix: nil)
         key = "throttled:#{name}"
 
-        if concurrency
-          @concurrency = Concurrency.new(
-            key, concurrency.merge(:key_suffix => key_suffix)
-          )
-        end
-        if threshold
-          @threshold = Threshold.new(
-            key, threshold.merge(:key_suffix => key_suffix)
-          )
-        end
+        @concurrency =
+          if concurrency
+            concurrency[:key_suffix] = key_suffix
+            Concurrency.new(key, concurrency)
+          end
+
+        @threshold =
+          if threshold
+            threshold[:key_suffix] = key_suffix
+            Threshold.new(key, threshold)
+          end
 
         return if @concurrency || @threshold
 

data/lib/sidekiq/throttled/version.rb

@@ -2,6 +2,6 @@
 module Sidekiq
   module Throttled
     # Gem version
-    VERSION = "0.2.0".freeze
+    VERSION = "0.3.0.pre".freeze
   end
 end

data/sidekiq-throttled.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency     "sidekiq", "< 4"
+  spec.add_runtime_dependency "sidekiq"
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-throttled
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0.pre
 platform: ruby
 authors:
 - Alexey V Zapparov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2016-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -64,12 +64,15 @@ files:
 - ".rubocop.yml"
 - ".travis.yml"
 - ".yardopts"
+- Appraisals
 - CHANGES.md
 - Gemfile
 - LICENSE.md
 - README.md
 - Rakefile
 - bin/setup
+- gemfiles/sidekiq_3.gemfile
+- gemfiles/sidekiq_4.gemfile
 - lib/sidekiq/throttled.rb
 - lib/sidekiq/throttled/basic_fetch.rb
 - lib/sidekiq/throttled/errors.rb
@@ -103,9 +106,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1