@@ -3,7 +3,6 @@ class <%= migration_name %> < ActiveRecord::Migration create_table :<%= table_name %> do |t| t.string :queue_name t.text :data - t.string :token, :default => nil t.boolean :processed, :default => false, :null => false <% unless options[:skip_timestamps] %> t.timestamps @@ -16,4 +15,4 @@ class <%= migration_name %> < ActiveRecord::Migration def self.down drop_table :<%= table_name %> end -end \ No newline at end of file +end generators/rude_q/templates/rude_q_migration.rb @@ -1,5 +1,4 @@ # RudeQ -require 'digest/sha1' # simply doing; # class RudeQueue < ActiveRecord::Base @@ -86,9 +85,20 @@ module RudeQ end # A snapshot count of unprocessed items for the given +queue_name+ - def backlog(queue_name) - qname = sanitize_queue_name(queue_name) - self.count(:conditions => {:queue_name => qname, :processed => false}) + # + # >> RudeQueue.backlog + # -> 265 + # >> RudeQueue.backlog(:one_queue) + # -> 212 + # >> RudeQueue.backlog(:another_queue) + # -> 53 + # + def backlog(queue_name=nil) + conditions = {:processed => false} + if queue_name + conditions[:queue_name] = sanitize_queue_name(queue_name) + end + self.count(:conditions => conditions) end def fetch_with_lock(qname, &block) # :nodoc: @@ -161,9 +171,12 @@ module RudeQ # which misses the point # # also, it doesn't work on SQLite as it requires "UPDATE ... LIMIT 1 ORDER id ASC" + # and as of RudeQueue2, you'll need to manually add the "token" column module TokenLock class << self + require 'digest/sha1' + def fetch_with_lock(klass, qname) # :nodoc: token = get_unique_token klass.update_all(["token = ?", token], ["queue_name = ? AND processed = ? AND token IS NULL", qname, false], :limit => 1, :order => "id ASC") lib/rude_q.rb @@ -197,18 +197,24 @@ describe RudeQ::ClassMethods do # ProcessQueue extends ClassMethods describe ".backlog" do it "should count the unprocessed items for the provided queue_name" do + ProcessQueue.delete_all + ProcessQueue.backlog(:abcde).should == 0 - + ProcessQueue.backlog().should == 0 + ProcessQueue.set(:abcde, "a value") ProcessQueue.backlog(:abcde).should == 1 - + ProcessQueue.backlog().should == 1 + ProcessQueue.set(:something_else, "another value") 3.times { ProcessQueue.set(:abcde, :add_three_more)} ProcessQueue.backlog(:abcde).should == 4 - + ProcessQueue.backlog().should == 5 + ProcessQueue.get(:abcde).should == "a value" ProcessQueue.backlog(:abcde).should == 3 + ProcessQueue.backlog().should == 4 end end spec/rude_q_spec.rb c338cd86880337d000df1387ae6eab00299cc916 Matthew Rudy Jacobs matthewrudyjacobs@gmail.com http://github.com/matthewrudy/rudeq/commit/22baea8d1e95e5c0efe0fef1aa3c3382c3fafcda 22baea8d1e95e5c0efe0fef1aa3c3382c3fafcda 2009-02-12T13:49:01-08:00 2009-02-12T13:49:01-08:00 RudeQueue.backlog() counts all the unprocessed Queue items, RudeQueue.backlog(:some_queue) scopes that count the particular Queue 6d518963c10db37366759c1d8934beb761e620b0 Matthew Rudy Jacobs matthewrudyjacobs@gmail.com