sidekiq-limit_fetch 0.9 → 1.0

data/README.md

@@ -67,6 +67,12 @@ enable global mode by setting global option, eg:
   :global: true
 ```
 
+or
+
+```ruby
+  Sidekiq.options[:global] = true
+```
+
 
 If you use strict queue ordering (it will be used if you don't specify queue weights)
 then you can set blocking status for queues. It means if a blocking
@@ -78,7 +84,7 @@ be ran. Eg,
     - a
     - b
     - c
-  :limits:
+  :blocking:
     - b
 ```
 

data/lib/sidekiq/limit_fetch/queues.rb

@@ -9,6 +9,7 @@ class Sidekiq::LimitFetch
 
       set_selector options[:global]
       set_limits options[:limits]
+      set_blocks options[:blocking]
     end
 
     def acquire
@@ -16,7 +17,7 @@ class Sidekiq::LimitFetch
         .tap {|it| save it }
         .map {|it| "queue:#{it}" }
     end
-    
+
     def release_except(full_name)
       @selector.release restore.delete_if {|name| full_name.to_s.include? name }
     end
@@ -28,10 +29,15 @@ class Sidekiq::LimitFetch
     end
 
     def set_limits(limits)
-      ordered_queues.each do |name|
-        Sidekiq::Queue[name].tap do |it|
-          it.limit = (limits || {})[name]
-        end
+      return unless limits
+      limits.each do |name, limit|
+        Sidekiq::Queue[name].limit = limit
+      end
+    end
+
+    def set_blocks(blocks)
+      blocks.to_a.each do |name|
+        Sidekiq::Queue[name].block
       end
     end
 

data/sidekiq-limit_fetch.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = 'sidekiq-limit_fetch'
-  gem.version       = '0.9'
+  gem.version       = '1.0'
   gem.authors       = 'brainopia'
   gem.email         = 'brainopia@evilmartians.com'
   gem.summary       = 'Sidekiq strategy to support queue limits'

data/spec/sidekiq/limit_fetch/queues_spec.rb

@@ -7,9 +7,14 @@ describe Sidekiq::LimitFetch::Queues do
   let(:limits) {{ 'queue1' => 3 }}
   let(:strict) { true }
   let(:global) { false }
+  let(:blocking) { nil }
 
   let(:options) do
-    { queues: queues, limits: limits, strict: strict, global: global }
+    { queues: queues,
+      limits: limits,
+      strict: strict,
+      global: global,
+      blocking: blocking }
   end
 
   after(:each ) do
@@ -23,7 +28,7 @@ describe Sidekiq::LimitFetch::Queues do
       Sidekiq::Queue['queue2'].busy.should == 1
     end
 
-    it 'should acquire blocking queues' do
+    it 'should acquire dynamically blocking queues' do
       subject.acquire
       Sidekiq::Queue['queue1'].busy.should == 1
       Sidekiq::Queue['queue2'].busy.should == 1
@@ -48,8 +53,18 @@ describe Sidekiq::LimitFetch::Queues do
       Sidekiq::Queue['queue1'].busy.should == 1
       Sidekiq::Queue['queue2'].busy.should == 0
     end
+
+    context 'blocking' do
+      let(:blocking) { %w(queue1) }
+
+      it 'should acquire blocking queues' do
+        3.times { subject.acquire }
+        Sidekiq::Queue['queue1'].busy.should == 3
+        Sidekiq::Queue['queue2'].busy.should == 1
+      end
+    end
   end
-  
+
   context 'without global flag' do
     it_should_behave_like :selector
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-limit_fetch
 version: !ruby/object:Gem::Version
-  version: '0.9'
+  version: '1.0'
   prerelease: 
 platform: ruby
 authors:
@@ -109,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -145279622185044901
+      hash: -2462116291235109509
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -145279622185044901
+      hash: -2462116291235109509
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24