resque-queue-priority 0.5.3 → 0.6.0

data/lib/resque/plugins/queue_priority/priority.rb

@@ -31,14 +31,35 @@ module Resque
               next
             end
 
-            patstr = bucket_pattern.gsub(/\*/, ".*")
-            pattern = /^#{patstr}$/
-            bucket_queues, remaining = all_queues.partition {|q| q =~ pattern }
-
+            bucket_queues, remaining = [], []
+            
+            patterns = bucket_pattern.split(',')
+            patterns.each do |pattern|
+              pattern = pattern.strip
+              
+              if pattern[0] == '!'
+                negated = true
+                pattern = pattern[1..-1]
+              end
+              
+              patstr = pattern.gsub(/\*/, ".*")
+              pattern = /^#{patstr}$/
+            
+            
+              if negated
+                bucket_queues -= bucket_queues.grep(pattern)
+              else
+                bucket_queues.concat(all_queues.grep(pattern))
+              end
+            
+            end
+            
+            bucket_queues.uniq!
             bucket_queues.shuffle! if fairly
-            all_queues = remaining
-
+            all_queues = all_queues - bucket_queues
+            
             result << bucket_queues
+            
           end
 
           # insert the remaining queues at the position the default item was at (or last)

data/lib/resque/plugins/queue_priority/version.rb

@@ -1,7 +1,7 @@
 module Resque
   module Plugins
     module QueuePriority
-      VERSION = "0.5.3"
+      VERSION = "0.6.0"
     end
   end
 end

data/spec/priority_spec.rb

@@ -112,6 +112,34 @@ describe "Queue Priority" do
       worker.queues.should == ["high_x", "high_y", "foo", "superhigh_z"]
     end
 
+    it "should prioritize simple wildcard pattern with correct matching" do
+      Resque.priority_buckets = [{'pattern' => '*high*', 'fairly' => false},
+                                 {'pattern' => 'default', 'fairly' => false}]
+      worker = Resque::Worker.new("*")
+      worker.queues.should == ["high_x", "high_y", "superhigh_z", "foo"]
+    end
+    
+    it "should prioritize negation patterns" do
+      Resque.priority_buckets = [{'pattern' => 'high*,!high_x', 'fairly' => false},
+                                 {'pattern' => 'default', 'fairly' => false}]
+      worker = Resque::Worker.new("*")
+      worker.queues.should == ["high_y", "foo", "high_x", "superhigh_z"]
+    end
+
+    it "should not be affected by standalone negation patterns" do
+      Resque.priority_buckets = [{'pattern' => '!high_x', 'fairly' => false},
+                                 {'pattern' => 'default', 'fairly' => false}]
+      worker = Resque::Worker.new("*")
+      worker.queues.should == ["foo", "high_x", "high_y", "superhigh_z"]
+    end
+
+    it "should allow multiple inclusive patterns" do
+      Resque.priority_buckets = [{'pattern' => 'high_x, superhigh*', 'fairly' => false},
+                                 {'pattern' => 'default', 'fairly' => false}]
+      worker = Resque::Worker.new("*")
+      worker.queues.should == ["high_x", "superhigh_z", "foo", "high_y"]
+    end
+
     it "should prioritize fully inclusive wildcard pattern" do
       Resque.priority_buckets = [{'pattern' => '*high*', 'fairly' => false},
                                  {'pattern' => 'default', 'fairly' => false}]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-queue-priority
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-14 00:00:00.000000000Z
+date: 2011-12-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &2253842400 !ruby/object:Gem::Requirement
+  requirement: &2154438400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.10'
   type: :runtime
   prerelease: false
-  version_requirements: *2253842400
+  version_requirements: *2154438400
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2253841980 !ruby/object:Gem::Requirement
+  requirement: &2154437980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2253841980
+  version_requirements: *2154437980
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2253841440 !ruby/object:Gem::Requirement
+  requirement: &2154437440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *2253841440
+  version_requirements: *2154437440
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2253840940 !ruby/object:Gem::Requirement
+  requirement: &2154436940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 0.5.4
   type: :development
   prerelease: false
-  version_requirements: *2253840940
+  version_requirements: *2154436940
 description: A resque plugin for specifying the priority between queues that workers
   use to determine what to work on next
 email: