#hscan returns an array of key/value pairs

Author: joshuaflanagan

lib/redis.rb

@@ -2322,9 +2322,11 @@ def scan(cursor, options={})
   #   - `:match => String`: only return keys matching the pattern
   #   - `:count => Integer`: return count keys at most per iteration
   #
-  # @return [String, Array<String>] the next cursor and all found keys
+  # @return [String, Array<[String, String]>] the next cursor and all found keys
   def hscan(key, cursor, options={})
-    _scan(:hscan, cursor, options.merge(:key => key))
+    _scan(:hscan, cursor, options.merge(:key => key)) do |reply|
+      [reply[0], reply[1].each_slice(2).to_a]
+    end
   end
 
   # Scan a sorted set

test/scanning_test.rb

@@ -98,15 +98,15 @@ def test_hscan_with_encoding
         assert_equal enc.to_s, r.object("encoding", "hash")
 
         cursor = 0
-        all_keys   = []
+        all_key_values   = []
         loop {
-          cursor, keys = r.hscan "hash", cursor
-          all_keys += keys
+          cursor, key_values = r.hscan "hash", cursor
+          all_key_values.concat key_values
           break if cursor == "0"
         }
 
         keys2 = []
-        all_keys.each_slice(2) do |k, v|
+        all_key_values.each do |k, v|
           assert_equal "key:#{v}", k
           keys2 << k
         end