mock_redis 0.15.4 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 067542610c0d8223c9b08324c9855c036e1fe199
-  data.tar.gz: 4c79481ce9e4404063cda484fa8d74709d5e9171
+  metadata.gz: cfac83d82686c7ae7355880b0ecc9263b44f0b2a
+  data.tar.gz: 65edf9e01b7cdc5da7f02bc88cf4703b12d4e043
 SHA512:
-  metadata.gz: a14d2235b776964f5fc38ecbb77ac27c125d4436e405c4cd093697272c103c6ca934e86099053fd2be943f6cbc69d8f8cd6a01a3239080be9d5b1b747b98b402
-  data.tar.gz: 963c9b2b60490745a4b905a012ba6131a18b8fade75b04c0c7c5e8efa3592951e27c48c6ccf97ab47f0a1c7bd6cc6f8abf8450f890d5c537eb5e0882b589e070
+  metadata.gz: d6e80d56dfcbad007f71b0c58f1de1f056592880f0d10516224f3d91e0e1ef3bfb405d4b5a482668146bfee978d8c7a4307ee25951960ebd18a8d9d19c0eff0a
+  data.tar.gz: 43900cd389c65597930932a4c95de2469909131396840a2a693ddbe77b7dbae024546c21dfae487e2b73c5fb8fa3e568b58af6503f1c7e18a24f8a0888fb76a7

data/.rubocop.yml

@@ -83,9 +83,10 @@ Style/SignalException:
 Style/SingleLineBlockParams:
   Enabled: false
 
-# Disabled since as of RuboCop 0.35.1 it reports false positives for trailing
-# commas in lists with a single item
-Style/TrailingComma:
+Style/TrailingCommaInArguments:
+  Enabled: false
+
+Style/TrailingCommaInLiteral:
   Enabled: false
 
 Style/WhenThen:

data/.travis.yml

@@ -12,6 +12,7 @@ rvm:
   - 2.0
   - 2.1
   - 2.2
+  - 2.3.0
   - jruby-19mode
 
 before_script:
@@ -20,6 +21,7 @@ before_script:
 
 script:
   - bundle exec rspec
+  - bundle exec overcommit --sign
   - bundle exec overcommit --run
 
 matrix:

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # MockRedis Changelog
 
+### 0.16.0
+
+* Add stub implementations for `script`/`eval`/`evalsha` commands
+* Add implementations for `SCAN` family (`sscan`/`hscan`/`zscan`)
+  family of commands
+
 ### 0.15.4
 
 * Fix `zrange`/`zrevrange` to return elements with equal values in

data/Gemfile

@@ -4,10 +4,10 @@ source 'http://rubygems.org'
 gemspec
 
 # Run all pre-commit hooks via Overcommit during CI runs
-gem 'overcommit', '0.28.0'
+gem 'overcommit', '0.30.0'
 
 # Pin tool versions (which are executed by Overcommit) for Travis builds
-gem 'rubocop', '0.35.1'
+gem 'rubocop', '0.36.0'
 gem 'travis', '~> 1.7'
 
 gem 'coveralls', require: false

data/README.md

@@ -80,6 +80,8 @@ Ruby process.
 
 * `#slowlog` isn't available.
 
+* Scripting commands (`#script`, `#eval`, `#evalsha`) are just stubs—they won't execute anything
+
 ## Remaining Work
 
 There are some things we want to have in here, but that we just

data/lib/mock_redis.rb

@@ -23,7 +23,7 @@ class MockRedis
     :password => nil,
     :db => 0,
     :time_class => Time,
-  }
+  }.freeze
 
   def self.connect(*args)
     new(*args)
@@ -42,7 +42,7 @@ class MockRedis
   def id
     "redis://#{host}:#{port}/#{db}"
   end
-  alias_method :location, :id
+  alias location id
 
   def call(command, &_block)
     send(*command)
@@ -63,7 +63,7 @@ class MockRedis
   def now
     options[:time_class].now
   end
-  alias_method :time, :now
+  alias time now
 
   def time_at(timestamp)
     options[:time_class].at(timestamp)

data/lib/mock_redis/database.rb

@@ -8,6 +8,7 @@ require 'mock_redis/zset_methods'
 require 'mock_redis/sort_method'
 require 'mock_redis/indifferent_hash'
 require 'mock_redis/info_method'
+require 'mock_redis/utility_methods'
 
 class MockRedis
   class Database
@@ -18,6 +19,7 @@ class MockRedis
     include ZsetMethods
     include SortMethod
     include InfoMethod
+    include UtilityMethods
 
     attr_reader :data, :expire_times
 
@@ -119,14 +121,17 @@ class MockRedis
     end
 
     def scan(cursor, opts = {})
-      count = (opts[:count] || 10).to_i
-      match = opts[:match] || '*'
-
-      keys = data.keys
-      limit = cursor + count
-      next_cursor = limit >= keys.length ? '0' : limit.to_s
+      common_scan(data.keys, cursor, opts)
+    end
 
-      [next_cursor, keys[cursor..limit].grep(redis_pattern_to_ruby_regex(match))]
+    def scan_each(opts = {}, &block)
+      return to_enum(:scan_each, opts) unless block_given?
+      cursor = 0
+      loop do
+        cursor, keys = scan(cursor, opts)
+        keys.each(&block)
+        break if cursor == '0'
+      end
     end
 
     def lastsave
@@ -224,6 +229,15 @@ class MockRedis
       end
     end
 
+    def script(subcommand, *args)
+    end
+
+    def evalsha(*args)
+    end
+
+    def eval(*args)
+    end
+
     private
 
     def assert_valid_timeout(timeout)

data/lib/mock_redis/hash_methods.rb

@@ -109,6 +109,21 @@ class MockRedis
       hmset(key, *kvpairs)
     end
 
+    def hscan(key, cursor, opts = {})
+      opts = opts.merge(key: lambda { |x| x[0] })
+      common_scan(hgetall(key).to_a, cursor, opts)
+    end
+
+    def hscan_each(key, opts = {}, &block)
+      return to_enum(:hscan_each, key, opts) unless block_given?
+      cursor = 0
+      loop do
+        cursor, values = hscan(key, cursor, opts)
+        values.each(&block)
+        break if cursor == '0'
+      end
+    end
+
     def hset(key, field, value)
       with_hash_at(key) { |h| h[field.to_s] = value.to_s }
       true

data/lib/mock_redis/info_method.rb

@@ -15,14 +15,14 @@ class MockRedis
       'tcp_port' => '6379',
       'uptime_in_days' => '0',
       'uptime_in_seconds' => '84215',
-    }
+    }.freeze
 
     CLIENTS_INFO = {
       'blocked_clients' => '0',
       'client_biggest_input_buf' => '0',
       'client_longest_output_list' => '0',
       'connected_clients' => '1',
-    }
+    }.freeze
 
     MEMORY_INFO = {
       'mem_allocator' => 'libc',
@@ -33,7 +33,7 @@ class MockRedis
       'used_memory_peak' => '1005424',
       'used_memory_peak_human' => '981.86K',
       'used_memory_rss' => '1904640',
-    }
+    }.freeze
 
     PERSISTENCE_INFO = {
       'aof_current_rewrite_time_sec' => '-1',
@@ -49,7 +49,7 @@ class MockRedis
       'rdb_last_bgsave_status' => 'ok',
       'rdb_last_bgsave_time_sec' => '-1',
       'rdb_last_save_time' => '1361423635',
-    }
+    }.freeze
 
     STATS_INFO = {
       'evicted_keys' => '0',
@@ -63,23 +63,23 @@ class MockRedis
       'rejected_connections' => '0',
       'total_commands_processed' => '196800',
       'total_connections_received' => '4359',
-    }
+    }.freeze
 
     REPLICATION_INFO = {
       'role' => 'master',
       'connected_slaves' => '0',
-    }
+    }.freeze
 
     CPU_INFO = {
       'used_cpu_sys' => '5.54',
       'used_cpu_sys_childrens' => '0.00',
       'used_cpu_user' => '7.65',
       'used_cpu_user_childrens' => '0.02',
-    }
+    }.freeze
 
     KEYSPACE_INFO = {
       'db0' => 'keys=8,expires=0',
-    }
+    }.freeze
 
     # The Ruby Redis client returns commandstats differently when it's called as
     # "INFO commandstats".
@@ -102,7 +102,7 @@ class MockRedis
       'slowlog' => { 'calls' => '136', 'usec' => '16815', 'usec_per_call' => '123.64' },
       'smembers' => { 'calls' => '58', 'usec' => '231', 'usec_per_call' => '3.98' },
       'sunionstore' => { 'calls' => '4185027', 'usec' => '11762454022', 'usec_per_call' => '2810.60' },
-    }
+    }.freeze
 
     COMMAND_STATS_COMBINED_INFO = {
       'cmdstat_auth' => 'calls=572506,usec=2353182,usec_per_call=4.11',
@@ -122,7 +122,7 @@ class MockRedis
       'cmdstat_slowlog' => 'calls=136,usec=16815,usec_per_call=123.64',
       'cmdstat_smembers' => 'calls=58,usec=231,usec_per_call=3.98',
       'cmdstat_sunionstore' => 'calls=4185027,usec=11762454022,usec_per_call=2810.60',
-    }
+    }.freeze
     # rubocop:enable Metrics/LineLength
 
     DEFAULT_INFO = [

data/lib/mock_redis/list_methods.rb

@@ -136,7 +136,7 @@ class MockRedis
       end
 
       index = index.to_i
-      unless (0...llen(key)).include?(index)
+      unless (0...llen(key)).cover?(index)
         raise Redis::CommandError, 'ERR index out of range'
       end
 

data/lib/mock_redis/multi_db_wrapper.rb

@@ -44,7 +44,7 @@ class MockRedis
       else
         case current_db.type(key)
         when 'hash'
-          dest.hmset(key, *(src.hgetall(key).map { |k, v| [k, v] }.flatten))
+          dest.hmset(key, *src.hgetall(key).map { |k, v| [k, v] }.flatten)
         when 'list'
           while value = src.rpop(key)
             dest.lpush(key, value)

data/lib/mock_redis/set_methods.rb

@@ -95,7 +95,7 @@ class MockRedis
         if count > 0
           members.sample(count)
         else
-          count.abs.times.map { members[rand(members.length)] }
+          Array.new(count.abs) { members[rand(members.length)] }
         end
       else
         members[rand(members.length)]
@@ -114,6 +114,20 @@ class MockRedis
       end
     end
 
+    def sscan(key, cursor, opts = {})
+      common_scan(smembers(key), cursor, opts)
+    end
+
+    def sscan_each(key, opts = {}, &block)
+      return to_enum(:sscan_each, key, opts) unless block_given?
+      cursor = 0
+      loop do
+        cursor, keys = sscan(key, cursor, opts)
+        keys.each(&block)
+        break if cursor == '0'
+      end
+    end
+
     def sunion(*keys)
       assert_has_args(keys, 'sunion')
       with_sets_at(*keys) { |*sets| sets.reduce(&:+).to_a }
@@ -140,7 +154,7 @@ class MockRedis
       else
         with_set_at(keys.first) do |set|
           with_sets_at(*(keys[1..-1])) do |*sets|
-            blk.call(*([set] + sets))
+            yield(*([set] + sets))
           end
         end
       end

data/lib/mock_redis/utility_methods.rb

@@ -22,5 +22,21 @@ class MockRedis
         del(key)
       end
     end
+
+    def common_scan(values, cursor, opts = {})
+      count = (opts[:count] || 10).to_i
+      cursor = cursor.to_i
+      match = opts[:match] || '*'
+      key = opts[:key] || lambda { |x| x }
+
+      limit = cursor + count
+      next_cursor = limit >= values.length ? '0' : limit.to_s
+
+      filtered_values = values[cursor...limit].select do |val|
+        redis_pattern_to_ruby_regex(match).match(key.call(val))
+      end
+
+      [next_cursor, filtered_values]
+    end
   end
 end

data/lib/mock_redis/version.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 # Defines the gem version.
 class MockRedis
-  VERSION = '0.15.4'
+  VERSION = '0.16.0'.freeze
 end

data/lib/mock_redis/zset.rb

@@ -23,11 +23,12 @@ class MockRedis
 
     def add(score, member)
       members.add(member)
-      if score.to_f.to_i == score.to_f
-        scores[member] = score.to_f.to_i
-      else
-        scores[member] = score.to_f
-      end
+      scores[member] =
+        if score.to_f.to_i == score.to_f
+          score.to_f.to_i
+        else
+          score.to_f
+        end
       self
     end
 

data/lib/mock_redis/zset_methods.rb

@@ -128,6 +128,21 @@ class MockRedis
       with_zset_at(key) { |z| z.sorted_members.reverse.index(member.to_s) }
     end
 
+    def zscan(key, cursor, opts = {})
+      opts = opts.merge(key: lambda { |x| x[0] })
+      common_scan(zrange(key, 0, -1, withscores: true), cursor, opts)
+    end
+
+    def zscan_each(key, opts = {}, &block)
+      return to_enum(:zscan_each, key, opts) unless block_given?
+      cursor = 0
+      loop do
+        cursor, values = zscan(key, cursor, opts)
+        values.each(&block)
+        break if cursor == '0'
+      end
+    end
+
     def zscore(key, member)
       with_zset_at(key) do |z|
         score = z.score(member.to_s)
@@ -205,7 +220,7 @@ class MockRedis
       else
         with_zset_at(keys.first) do |set|
           with_zsets_at(*(keys[1..-1])) do |*sets|
-            blk.call(*([set] + sets))
+            yield(*([set] + sets))
           end
         end
       end
@@ -230,7 +245,7 @@ class MockRedis
     def assert_scorey(value, message = 'ERR value is not a valid float')
       return if value =~ /\(?(\-|\+)inf/
 
-      value = $1 if value.to_s.match(/\((.*)/)
+      value = $1 if value.to_s =~ /\((.*)/
       unless looks_like_float?(value)
         raise Redis::CommandError, message
       end

data/spec/commands/eval_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe '#eval(*)' do
+  it 'returns nothing' do
+    @redises.eval('return nil').should be_nil
+  end
+end

data/spec/commands/evalsha_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe '#evalsha(*)' do
+  let(:script) { 'return nil' }
+  let(:script_digest) { Digest::SHA1.hexdigest(script) }
+
+  it 'returns nothing' do
+    @redises.evalsha(script_digest).should be_nil
+  end
+end

data/spec/commands/hscan_each_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe '#hscan_each' do
+  subject { MockRedis::Database.new(self) }
+
+  let(:key) { 'mock-redis-test:hscan_each' }
+
+  before do
+    allow(subject).to receive(:hgetall).and_return(collection)
+  end
+
+  context 'when no keys are found' do
+    let(:collection) { [] }
+
+    it 'does not iterate over any elements' do
+      results = subject.hscan_each(key).map do |k, v|
+        [k, v]
+      end
+      expect(results).to match_array(collection)
+    end
+  end
+
+  context 'when keys are found' do
+    context 'when no match filter is supplied' do
+      let(:collection) { Array.new(20) { |i| ["k#{i}", "v#{i}"] } }
+
+      it 'iterates over each item in the collection' do
+        results = subject.hscan_each(key).map do |k, v|
+          [k, v]
+        end
+        expect(results).to match_array(collection)
+      end
+    end
+
+    context 'when giving a custom match filter' do
+      let(:match) { 'k1*' }
+      let(:collection) { Array.new(12) { |i| ["k#{i}", "v#{i}"] } }
+      let(:expected) { [%w[k1 v1], %w[k10 v10], %w[k11 v11]] }
+
+      it 'iterates over each item in the filtered collection' do
+        results = subject.hscan_each(key, match: match).map do |k, v|
+          [k, v]
+        end
+        expect(results).to match_array(expected)
+      end
+    end
+  end
+end

data/spec/commands/hscan_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe '#hscan' do
+  let(:count) { 10 }
+  let(:match) { '*' }
+  let(:key) { 'mock-redis-test:hscan' }
+
+  context 'when the hash does not exist' do
+    it 'returns a 0 cursor and an empty collection' do
+      expect(@redises.hscan(key, 0, count: count, match: match)).to eq(['0', []])
+    end
+  end
+
+  context 'when the hash exists' do
+    before do
+      @redises.hset(key, 'k1', 'v1')
+      @redises.hset(key, 'k2', 'v2')
+      @redises.hset(key, 'k3', 'v3')
+    end
+
+    let(:expected) { ['0', [%w[k1 v1], %w[k2 v2], %w[k3 v3]]] }
+
+    it 'returns a 0 cursor and the collection' do
+      expect(@redises.hscan(key, 0, count: 10)).to eq(expected)
+    end
+  end
+end

data/spec/commands/keys_spec.rb

@@ -48,7 +48,7 @@ describe '#keys()' do
         ]
       end
 
-      it "treats \? as a literal ?" do
+      it 'treats \\? as a literal ?' do
         @redises.keys('mock-redis-test:special-key\?').sort.should == [
           'mock-redis-test:special-key?',
         ]
@@ -68,7 +68,7 @@ describe '#keys()' do
         ]
       end
 
-      it "treats \* as a literal *" do
+      it 'treats \\* as a literal *' do
         @redises.keys('mock-redis-test:special-key\*').sort.should == [
           'mock-redis-test:special-key*',
         ]
@@ -101,7 +101,7 @@ describe '#keys()' do
     end
 
     describe 'character classes ([a-c])' do
-      it "specifies a range which matches any lowercase letter from \"a\" to \"c\"" do
+      it 'specifies a range which matches any lowercase letter from "a" to "c"' do
         @redises.keys('mock-redis-test:regexp-key4[a-c]').sort.should == [
           'mock-redis-test:regexp-key4a',
           'mock-redis-test:regexp-key4b',

data/spec/commands/scan_each_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe '#scan_each' do
+  subject { MockRedis::Database.new(self) }
+
+  let(:match) { '*' }
+
+  before do
+    allow(subject).to receive_message_chain(:data, :keys).and_return(collection)
+  end
+
+  context 'when no keys are found' do
+    let(:collection) { [] }
+
+    it 'does not iterate over any elements' do
+      expect(subject.scan_each.to_a).to be_empty
+    end
+  end
+
+  context 'when keys are found' do
+    context 'when no match filter is supplied' do
+      let(:collection) { Array.new(20) { |i| "mock:key#{i}" } }
+
+      it 'iterates over each item in the collection' do
+        expect(subject.scan_each.to_a).to match_array(collection)
+      end
+    end
+
+    context 'when giving a custom match filter' do
+      let(:match) { 'mock:key*' }
+      let(:collection) { %w[mock:key mock:key2 mock:otherkey] }
+      let(:expected) { %w[mock:key mock:key2] }
+
+      it 'iterates over each item in the filtered collection' do
+        expect(subject.scan_each(match: match).to_a).to match_array(expected)
+      end
+    end
+  end
+end

data/spec/commands/scan_spec.rb

@@ -7,7 +7,7 @@ describe '#scan' do
   let(:match) { '*' }
 
   before do
-    expect(subject).to receive_message_chain(:data, :keys).and_return(collection)
+    allow(subject).to receive_message_chain(:data, :keys).and_return(collection)
   end
 
   context 'when no keys are found' do
@@ -20,16 +20,21 @@ describe '#scan' do
 
   context 'when keys are found' do
     context 'when count is lower than collection size' do
-      let(:collection) { (count + 1).times.map { |i| "mock:key#{i}" } }
-      let(:expected) { [count.to_s, collection] }
+      let(:collection) { Array.new(count * 2) { |i| "mock:key#{i}" } }
+      let(:expected_first) { [count.to_s, collection[0...count]] }
+      let(:expected_second) { ['0', collection[count..-1]] }
 
       it 'returns a the next cursor and the collection' do
-        expect(subject.scan(0, count: count, match: match)).to eq(expected)
+        expect(subject.scan(0, count: count, match: match)).to eq(expected_first)
+      end
+
+      it 'returns the correct results of the next cursor' do
+        expect(subject.scan(count, count: count, match: match)).to eq(expected_second)
       end
     end
 
     context 'when count is greater or equal than collection size' do
-      let(:collection) { count.times.map { |i| "mock:key#{i}" } }
+      let(:collection) { Array.new(count) { |i| "mock:key#{i}" } }
       let(:expected) { ['0', collection] }
 
       it 'returns a 0 cursor and the collection' do

data/spec/commands/script_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe '#script(subcommand, *args)' do
+  before { @key = 'mock-redis-test:script' }
+
+  it 'works with load subcommand' do
+    expect { @redises.send_without_checking(:script, :load, 'return 1') }.to_not raise_error
+  end
+end

data/spec/commands/sscan_each_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe '#sscan_each' do
+  subject { MockRedis::Database.new(self) }
+
+  let(:key) { 'mock-redis-test:sscan_each' }
+
+  before do
+    allow(subject).to receive(:smembers).and_return(collection)
+  end
+
+  context 'when no keys are found' do
+    let(:collection) { [] }
+
+    it 'does not iterate over any elements' do
+      results = subject.sscan_each(key).map do |k|
+        k
+      end
+      expect(results).to match_array(collection)
+    end
+  end
+
+  context 'when keys are found' do
+    context 'when no match filter is supplied' do
+      let(:collection) { Array.new(20) { |i| "k#{i}" } }
+
+      it 'iterates over each item in the collection' do
+        results = subject.sscan_each(key).map do |k|
+          k
+        end
+        expect(results).to match_array(collection)
+      end
+    end
+
+    context 'when giving a custom match filter' do
+      let(:match) { 'k1*' }
+      let(:collection) { Array.new(12) { |i| "k#{i}" } }
+      let(:expected) { %w[k1 k10 k11] }
+
+      it 'iterates over each item in the filtered collection' do
+        results = subject.sscan_each(key, match: match).map do |k|
+          k
+        end
+        expect(results).to match_array(expected)
+      end
+    end
+  end
+end

data/spec/commands/sscan_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe '#sscan' do
+  let(:count) { 10 }
+  let(:match) { '*' }
+  let(:key) { 'mock-redis-test:sscan' }
+
+  before do
+    # The return order of the members is non-deterministic, so we sort them to compare
+    expect_any_instance_of(Redis).to receive(:sscan).and_wrap_original do |m, *args|
+      result = m.call(*args)
+      [result[0], result[1].sort]
+    end
+    expect_any_instance_of(MockRedis).to receive(:sscan).and_wrap_original do |m, *args|
+      result = m.call(*args)
+      [result[0], result[1].sort]
+    end
+  end
+
+  context 'when the set does not exist' do
+    it 'returns a 0 cursor and an empty collection' do
+      expect(@redises.sscan(key, 0, count: count, match: match)).to eq(['0', []])
+    end
+  end
+
+  context 'when the set exists' do
+    before do
+      @redises.sadd(key, 'Hello')
+      @redises.sadd(key, 'World')
+      @redises.sadd(key, 'Test')
+    end
+
+    let(:expected) { ['0', %w[Hello Test World]] }
+
+    it 'returns a 0 cursor and the collection' do
+      expect(@redises.sscan(key, 0, count: count)).to eq(expected)
+    end
+  end
+end

data/spec/commands/zscan_each_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe '#zscan_each' do
+  subject { MockRedis::Database.new(self) }
+
+  let(:key) { 'mock-redis-test:zscan_each' }
+
+  before do
+    allow(subject).to receive(:zrange).and_return(collection)
+  end
+
+  context 'when no keys are found' do
+    let(:collection) { [] }
+
+    it 'does not iterate over any elements' do
+      results = subject.zscan_each(key).map do |m, s|
+        [m, s]
+      end
+      expect(results).to match_array(collection)
+    end
+  end
+
+  context 'when keys are found' do
+    context 'when no match filter is supplied' do
+      let(:collection) { Array.new(20) { |i| ["m#{i}", i] } }
+
+      it 'iterates over each item in the collection' do
+        results = subject.zscan_each(key).map do |m, s|
+          [m, s]
+        end
+        expect(results).to match_array(collection)
+      end
+    end
+
+    context 'when giving a custom match filter' do
+      let(:match) { 'm1*' }
+      let(:collection) { Array.new(12) { |i| ["m#{i}", i] } }
+      let(:expected) { [['m1', 1], ['m10', 10], ['m11', 11]] }
+
+      it 'iterates over each item in the filtered collection' do
+        results = subject.zscan_each(key, match: match).map do |m, s|
+          [m, s]
+        end
+        expect(results).to match_array(expected)
+      end
+    end
+  end
+end

data/spec/commands/zscan_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe '#zscan' do
+  let(:count) { 10 }
+  let(:match) { '*' }
+  let(:key) { 'mock-redis-test:zscan' }
+
+  context 'when the zset does not exist' do
+    it 'returns a 0 cursor and an empty collection' do
+      expect(@redises.zscan(key, 0, count: count, match: match)).to eq(['0', []])
+    end
+  end
+
+  context 'when the zset exists' do
+    before do
+      @redises.zadd(key, 1.0, 'member1')
+      @redises.zadd(key, 2.0, 'member2')
+    end
+
+    it 'returns a 0 cursor and the collection' do
+      result = @redises.zscan(key, 0)
+      expect(result[0]).to eq('0')
+      expect(result[1]).to match_array([['member1', 1.0], ['member2', 2.0]])
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mock_redis
 version: !ruby/object:Gem::Version
-  version: 0.15.4
+  version: 0.16.0
 platform: ruby
 authors:
 - Brigade Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -126,6 +126,8 @@ files:
 - spec/commands/del_spec.rb
 - spec/commands/disconnect_spec.rb
 - spec/commands/echo_spec.rb
+- spec/commands/eval_spec.rb
+- spec/commands/evalsha_spec.rb
 - spec/commands/exists_spec.rb
 - spec/commands/expire_spec.rb
 - spec/commands/expireat_spec.rb
@@ -147,6 +149,8 @@ files:
 - spec/commands/hlen_spec.rb
 - spec/commands/hmget_spec.rb
 - spec/commands/hmset_spec.rb
+- spec/commands/hscan_each_spec.rb
+- spec/commands/hscan_spec.rb
 - spec/commands/hset_spec.rb
 - spec/commands/hsetnx_spec.rb
 - spec/commands/hvals_spec.rb
@@ -191,8 +195,10 @@ files:
 - spec/commands/rpushx_spec.rb
 - spec/commands/sadd_spec.rb
 - spec/commands/save_spec.rb
+- spec/commands/scan_each_spec.rb
 - spec/commands/scan_spec.rb
 - spec/commands/scard_spec.rb
+- spec/commands/script_spec.rb
 - spec/commands/sdiff_spec.rb
 - spec/commands/sdiffstore_spec.rb
 - spec/commands/select_spec.rb
@@ -212,6 +218,8 @@ files:
 - spec/commands/spop_spec.rb
 - spec/commands/srandmember_spec.rb
 - spec/commands/srem_spec.rb
+- spec/commands/sscan_each_spec.rb
+- spec/commands/sscan_spec.rb
 - spec/commands/strlen_spec.rb
 - spec/commands/sunion_spec.rb
 - spec/commands/sunionstore_spec.rb
@@ -233,6 +241,8 @@ files:
 - spec/commands/zrevrange_spec.rb
 - spec/commands/zrevrangebyscore_spec.rb
 - spec/commands/zrevrank_spec.rb
+- spec/commands/zscan_each_spec.rb
+- spec/commands/zscan_spec.rb
 - spec/commands/zscore_spec.rb
 - spec/commands/zunionstore_spec.rb
 - spec/mock_redis_spec.rb
@@ -287,6 +297,8 @@ test_files:
 - spec/commands/del_spec.rb
 - spec/commands/disconnect_spec.rb
 - spec/commands/echo_spec.rb
+- spec/commands/eval_spec.rb
+- spec/commands/evalsha_spec.rb
 - spec/commands/exists_spec.rb
 - spec/commands/expire_spec.rb
 - spec/commands/expireat_spec.rb
@@ -308,6 +320,8 @@ test_files:
 - spec/commands/hlen_spec.rb
 - spec/commands/hmget_spec.rb
 - spec/commands/hmset_spec.rb
+- spec/commands/hscan_each_spec.rb
+- spec/commands/hscan_spec.rb
 - spec/commands/hset_spec.rb
 - spec/commands/hsetnx_spec.rb
 - spec/commands/hvals_spec.rb
@@ -352,8 +366,10 @@ test_files:
 - spec/commands/rpushx_spec.rb
 - spec/commands/sadd_spec.rb
 - spec/commands/save_spec.rb
+- spec/commands/scan_each_spec.rb
 - spec/commands/scan_spec.rb
 - spec/commands/scard_spec.rb
+- spec/commands/script_spec.rb
 - spec/commands/sdiff_spec.rb
 - spec/commands/sdiffstore_spec.rb
 - spec/commands/select_spec.rb
@@ -373,6 +389,8 @@ test_files:
 - spec/commands/spop_spec.rb
 - spec/commands/srandmember_spec.rb
 - spec/commands/srem_spec.rb
+- spec/commands/sscan_each_spec.rb
+- spec/commands/sscan_spec.rb
 - spec/commands/strlen_spec.rb
 - spec/commands/sunion_spec.rb
 - spec/commands/sunionstore_spec.rb
@@ -394,6 +412,8 @@ test_files:
 - spec/commands/zrevrange_spec.rb
 - spec/commands/zrevrangebyscore_spec.rb
 - spec/commands/zrevrank_spec.rb
+- spec/commands/zscan_each_spec.rb
+- spec/commands/zscan_spec.rb
 - spec/commands/zscore_spec.rb
 - spec/commands/zunionstore_spec.rb
 - spec/mock_redis_spec.rb