Skip to content

Commit 1dc6098

Browse files
committed
Merge pull request #378 from badboy/scan-command
Scan command, fixes tests and restores ruby<1.9 compatibility
2 parents 461dd43 + ef464ec commit 1dc6098

File tree

3 files changed

+8274
-5
lines changed

3 files changed

+8274
-5
lines changed

lib/redis.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2324,7 +2324,7 @@ def scan(cursor, options={})
23242324
#
23252325
# @return [String, Array<String>] the next cursor and all found keys
23262326
def hscan(key, cursor, options={})
2327-
_scan(:hscan, cursor, options.merge({key: key}))
2327+
_scan(:hscan, cursor, options.merge(:key => key))
23282328
end
23292329

23302330
# Scan a sorted set
@@ -2339,7 +2339,7 @@ def hscan(key, cursor, options={})
23392339
#
23402340
# @return [String, Array<String>] the next cursor and all found scores and members
23412341
def zscan(key, cursor, options={})
2342-
_scan(:zscan, cursor, options.merge({key: key}))
2342+
_scan(:zscan, cursor, options.merge(:key => key))
23432343
end
23442344

23452345
# Scan a set
@@ -2354,7 +2354,7 @@ def zscan(key, cursor, options={})
23542354
#
23552355
# @return [String, Array<String>] the next cursor and all found members
23562356
def sscan(key, cursor, options={})
2357-
_scan(:sscan, cursor, options.merge({key: key}))
2357+
_scan(:sscan, cursor, options.merge(:key => key))
23582358
end
23592359

23602360
def id

0 commit comments

Comments
 (0)