Merge 5800beb into 304981b

lib/mock_redis/set_methods.rb

@@ -81,11 +81,22 @@ def smove(src, dest, member)
       end
     end
 
-    def spop(key)
+    def spop(key, count = nil)
       with_set_at(key) do |set|
-        member = set.first
-        set.delete(member)
-        member
+        if count.nil?
+          member = set.first
+          set.delete(member)
+          member
+        else
+          members = []
+          count.times do
+            member = set.first
+            break if member.nil?
+            set.delete(member)
+            members << member
+          end
+          members
+        end
       end
     end
 

spec/commands/spop_spec.rb

@@ -21,5 +21,20 @@
     @redises.spop(@key).should be_nil
   end
 
+  it 'returns an array if count is not nil' do
+    @redises.sadd(@key, 'value2')
+    @redises.spop(@key, 2).should == ['value', 'value2']
+  end
+
+  it 'returns only whats in the set' do
+    @redises.spop(@key, 2).should == ['value']
+    @redises.smembers(@key).should == []
+  end
+
+  it 'returns an empty array if count is not nil and the set it empty' do
+    @redises.spop(@key)
+    @redises.spop(@key, 100).should == []
+  end
+
   it_should_behave_like 'a set-only command'
 end