resque-fairly 1.0.1 → 1.1.0

data/README.md

@@ -8,6 +8,24 @@ distributed across the set of queues with pending jobs fairly.  This
 results in a much more predictable mean time to handling for jobs in
 queues that are not the first in the list.
 
+Weighted Priorites
+----
+
+resque-fairly works by sorting the queues randomly before assigning
+the next queue on the list to a worker. You can add weights to 
+your various queues to alter their likelihood of being selected, by 
+using /priorities/. The priorities select queues by regular expression.
+
+Example:
+
+    Resque::Plugins::Fairly.prioritize(/^a/, 2)
+
+The above will prioritize queues whose names start with 'a' to
+be selected twice as often as the default.
+
+You can use floating point numbers, 0 and/or negative numbers as
+the multiplier.
+
 Note on Patches/Pull Requests
 ----
  

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.1.0

data/lib/resque/plugins/fairly.rb

@@ -2,6 +2,17 @@ require 'resque/worker'
 
 module Resque::Plugins
   module Fairly
+    # Define an 'unfair' priority multiplier to queues whose name
+    # matches the specified regex
+    def self.prioritize(regex, multiplier)
+      raise ArgumentError, '`regex` must be a regular expression' unless Regexp === regex
+      priorities << [regex, multiplier]
+    end
+    
+    def self.priorities
+      @priorities ||= []
+    end
+
     # Returns a list of queues to use when searching for a job.  A
     # splat ("*") means you want every queue 
     #
@@ -9,8 +20,14 @@ module Resque::Plugins
     # with every call.  This prevents any particular queue for being
     # starved.  Workers will process queues in a random order each
     # time the poll for new work.
+    #
+    # If priorities have been established, the randomness of the order
+    # will be weighted according to the multipliers
     def queues_randomly_ordered
-      queues_alpha_ordered.sort_by{rand}
+      queues_alpha_ordered.sort_by do |queue|
+        multiplier = Fairly.priorities.select{|p|p[0] === queue}[0][1] rescue 1
+        rand * multiplier
+      end.reverse
     end
 
     def self.included(klass)

data/spec/resque/plugins/fairly_spec.rb

@@ -5,14 +5,28 @@ describe Resque::Plugins::Fairly do
     worker = Resque::Worker.new('a','b')
 
     srand(2) 
-    worker.queues.should == ['b', 'a']
+    worker.queues.should == ['a', 'b']
   end
 
   it "changes Resque::Worker#queues to return queues in a random order (rand seeded w/ 1)" do
     worker = Resque::Worker.new('a','b')
 
     srand(1)
-    worker.queues.should == ['a', 'b']
+    worker.queues.should == ['b', 'a']
   end
 
+  it "changes Resque::Worker#queues to return queues in a weighted random order" do
+    worker = Resque::Worker.new('a','b')
+    Resque::Plugins::Fairly.prioritize(/a/, 2)
+
+    as, bs = [], []
+    1.upto 100 do 
+      arr = worker.queues
+      as << arr if arr.first == 'a'
+      bs << arr if arr.first == 'b'
+    end
+
+    as.size.should == 66
+    bs.size.should == 34
+  end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: resque-fairly
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 1
-  - 0
   - 1
-  version: 1.0.1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Peter Williams
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-23 00:00:00 -06:00
+date: 2011-03-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: resque
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 0
@@ -34,9 +37,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -57,7 +62,6 @@ extra_rdoc_files:
 - README.md
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.md
 - Rakefile
@@ -73,32 +77,36 @@ homepage: http://github.com/pezra/resque-fairly
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Fair queue processing for Resque
 test_files: 
-- spec/resque/plugins/fairly_spec.rb
 - spec/resque-fairly_spec.rb
+- spec/resque/plugins/fairly_spec.rb
 - spec/spec_helper.rb

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC