Merge pull request #628 from ceritium/spop-count

Add spop count support

Author: badboy

lib/redis.rb

@@ -1336,13 +1336,18 @@ def srem(key, member)
     end
   end
 
-  # Remove and return a random member from a set.
+  # Remove and return one or more random member from a set.
   #
   # @param [String] key
   # @return [String]
-  def spop(key)
+  # @param [Fixnum] count
+  def spop(key, count = nil)
     synchronize do |client|
-      client.call([:spop, key])
+      if count.nil?
+        client.call([:spop, key])
+      else
+        client.call([:spop, key, count])
+      end
     end
   end
 

lib/redis/distributed.rb

@@ -483,8 +483,8 @@ def srem(key, member)
     end
 
     # Remove and return a random member from a set.
-    def spop(key)
-      node_for(key).spop(key)
+    def spop(key, count = nil)
+      node_for(key).spop(key, count)
     end
 
     # Get a random member from a set.

test/lint/sets.rb

@@ -52,6 +52,21 @@ def test_spop
       assert_equal nil, r.spop("foo")
     end
 
+    def test_spop_with_positive_count
+      target_version "3.2.0" do
+        r.sadd "foo", "s1"
+        r.sadd "foo", "s2"
+        r.sadd "foo", "s3"
+        r.sadd "foo", "s4"
+
+        pops = r.spop("foo", 3)
+
+        assert !(["s1", "s2", "s3", "s4"] & pops).empty?
+        assert_equal 3, pops.size
+        assert_equal 1, r.scard("foo")
+      end
+    end
+
     def test_scard
       assert_equal 0, r.scard("foo")