Refactor *scan_each methods to capture and pass the block.

It's faster and cleaner.

Author: djanowski

lib/redis.rb

@@ -2291,12 +2291,12 @@ def scan(cursor, options={})
   #   - `:count => Integer`: return count keys at most per iteration
   #
   # @return [Enumerator] an enumerator for all found keys
-  def scan_each(options={})
+  def scan_each(options={}, &block)
     return to_enum(:scan_each, options) unless block_given?
     cursor = 0
     loop do
       cursor, keys = scan(cursor, options)
-      keys.each {|key| yield key}
+      keys.each(&block)
       break if cursor == "0"
     end
   end
@@ -2329,12 +2329,12 @@ def hscan(key, cursor, options={})
   #   - `:count => Integer`: return count keys at most per iteration
   #
   # @return [Enumerator] an enumerator for all found keys
-  def hscan_each(key, options={})
+  def hscan_each(key, options={}, &block)
     return to_enum(:hscan_each, key, options) unless block_given?
     cursor = 0
     loop do
-      cursor, key_values = hscan(key, cursor, options)
-      key_values.each {|key, val| yield key, val }
+      cursor, values = hscan(key, cursor, options)
+      values.each(&block)
       break if cursor == "0"
     end
   end
@@ -2368,12 +2368,12 @@ def zscan(key, cursor, options={})
   #   - `:count => Integer`: return count keys at most per iteration
   #
   # @return [Enumerator] an enumerator for all found scores and members
-  def zscan_each(key, options={})
+  def zscan_each(key, options={}, &block)
     return to_enum(:zscan_each, key, options) unless block_given?
     cursor = 0
     loop do
-      cursor, member_score = zscan(key, cursor, options)
-      member_score.each {|member, score| yield member, score }
+      cursor, values = zscan(key, cursor, options)
+      values.each(&block)
       break if cursor == "0"
     end
   end
@@ -2404,12 +2404,12 @@ def sscan(key, cursor, options={})
   #   - `:count => Integer`: return count keys at most per iteration
   #
   # @return [Enumerator] an enumerator for all keys in the set
-  def sscan_each(key, options={})
+  def sscan_each(key, options={}, &block)
     return to_enum(:sscan_each, key, options) unless block_given?
     cursor = 0
     loop do
       cursor, keys = sscan(key, cursor, options)
-      keys.each {|key| yield key}
+      keys.each(&block)
       break if cursor == "0"
     end
   end

test/scanning_test.rb

@@ -281,8 +281,8 @@ def test_hscan_each_block
       r.hmset "hash", *elements
 
       keys_from_scan = []
-      r.hscan_each("hash") do |*key_value|
-        keys_from_scan << key_value
+      r.hscan_each("hash") do |field, value|
+        keys_from_scan << [field, value]
       end
       all_keys = r.hgetall("hash").to_a
 
@@ -301,8 +301,8 @@ def test_hscan_each_block_match
       r.hmset "hash", *elements
 
       keys_from_scan = []
-      r.hscan_each("hash", :match => "key:1?") do |*key_value|
-        keys_from_scan << key_value
+      r.hscan_each("hash", :match => "key:1?") do |field, value|
+        keys_from_scan << [field, value]
       end
       all_keys = r.hgetall("hash").to_a.select{|k,v| k =~ /^key:1.$/}
 
@@ -388,8 +388,8 @@ def test_zscan_each_block
       r.zadd "zset", elements
 
       scores_from_scan = []
-      r.zscan_each("zset") do |*key_score|
-        scores_from_scan << key_score
+      r.zscan_each("zset") do |member, score|
+        scores_from_scan << [member, score]
       end
       member_scores = r.zrange("zset", 0, -1, :with_scores => true)
 
@@ -408,8 +408,8 @@ def test_zscan_each_block_match
       r.zadd "zset", elements
 
       scores_from_scan = []
-      r.zscan_each("zset", :match => "key:1??") do |*key_score|
-        scores_from_scan << key_score
+      r.zscan_each("zset", :match => "key:1??") do |member, score|
+        scores_from_scan << [member, score]
       end
       member_scores = r.zrange("zset", 0, -1, :with_scores => true)
       filtered_members = member_scores.select{|k,s| k =~ /^key:1..$/}