smq 0.1.1 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/smq/queue.rb

@@ -44,20 +44,26 @@ module SMQ
       delete_queue_items
     end
 
-    def clear_completed!
-      delete_queue_items "completed_at IS NOT NULL"
+    def clear_completed!(limit = nil)
+      delete_queue_items "completed_at IS NOT NULL", limit
     end
-    def clear_successful!
-      delete_queue_items "completed_at IS NOT NULL AND failed_at IS NULL"
+    def clear_successful!(limit = nil)
+      delete_queue_items "completed_at IS NOT NULL AND failed_at IS NULL", limit
     end
-    def clear_failed!
-      delete_queue_items "completed_at IS NOT NULL AND failed_at IS NOT NULL"
+    def clear_failed!(limit = nil)
+      delete_queue_items "completed_at IS NOT NULL AND failed_at IS NOT NULL", limit
     end
 
     private
 
-    def delete_queue_items(where = nil)
-      SMQ::Message.delete_all(["queue = ? #{where ? 'AND ' + where : ''}", @name])
+    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?
+      if (msg.nil?)
+        SMQ::Message.delete_all(["queue = ? #{where ? 'AND ' + where : ''}", @name])
+      else
+        SMQ::Message.delete_all(["queue = ? AND id < ? #{where ? 'AND ' + where : ''}", @name, msg.id])
+      end
     end
 
   end

data/test/test_queue.rb

@@ -57,6 +57,12 @@ class QueueTest < Test::Unit::TestCase
     assert_equal 1, SMQ::Message.count(:conditions => ["queue = ?", @queue.name])
   end
 
+  def test_clearing_completed_should_limit_correctly
+    populate_and_ack_all_but_fail_one
+    @queue.clear_completed! 1
+    assert_equal 4, 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!

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Tim Blair
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-10 00:00:00 +00:00
+date: 2010-03-16 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency