smq 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/smq/queue.rb

@@ -58,7 +58,7 @@ module SMQ
 
     def delete_queue_items(where = nil, limit = nil)
       # delete_all doesn't support a :limit clause, so we have to fake it
-      msg = SMQ::Message.find(:first, :offset => limit) if !limit.nil?
+      msg = SMQ::Message.find(:first, :select => 'id', :conditions => ["queue = ?", @name], :offset => limit) if !limit.nil?
       if (msg.nil?)
         SMQ::Message.delete_all(["queue = ? #{where ? 'AND ' + where : ''}", @name])
       else

data/test/test_queue.rb

@@ -63,6 +63,13 @@ class QueueTest < Test::Unit::TestCase
     assert_equal 4, SMQ::Message.count(:conditions => ["queue = ?", @queue.name])
   end
 
+  def test_clearing_completed_should_limit_correctly_with_more_than_one_queue
+    populate_and_ack_all_but_fail_one SMQ::Queue.new("another_queue")
+    populate_and_ack_all_but_fail_one
+    @queue.clear_completed! 2
+    assert_equal 3, SMQ::Message.count(:conditions => ["queue = ?", @queue.name])
+  end
+
   def test_clearing_failures_should_not_touch_successful_messages
     populate_and_ack_all_but_fail_one
     @queue.clear_failed!
@@ -84,8 +91,9 @@ class QueueTest < Test::Unit::TestCase
 
   private
 
-  def populate_and_ack_all_but_fail_one
-    populate_queue(@queue, 5)
+  def populate_and_ack_all_but_fail_one(queue = nil)
+    queue ||= @queue
+    populate_queue(queue, 5)
     msg = SMQ::Message.find(:first)
     msg.fail
     msg.save!

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Tim Blair
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-16 00:00:00 +00:00
+date: 2010-04-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency