mock_redis 0.23.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd9fd0d5b4ccad106eee03697d49082baa7e34065ff76f67b7e18da9991847a9
-  data.tar.gz: 11f940cdee40f2646c3e6087faac7ac1c70e0aae5eaff7ddfc8839f0fb50e1b6
+  metadata.gz: e4a2d7e6a155059cb97120f7f95c1e992a87a3933be5fe337a443dc0a9ac30df
+  data.tar.gz: 135172a723e9d5bfb058eec85863387093d56e3a6d7729f28da425f2b239e4bb
 SHA512:
-  metadata.gz: 347930a11a59575cd3a4bbc48cb689d46d25b27c6cfbdc28c28b6bfdfa1d833c317dd5ce7566ba016aae7b13b909629d078486bd95dee68f4e7e6b5cfc7e1e44
-  data.tar.gz: 689b8dc84b58c38201bf3220641f467cd56b3ef2d6c4efc12829ec08c3a84f6dbc1e2c8207fdb18808c10bdb71f878cc571d21df2548a9d240881fff8b9ddd68
+  metadata.gz: 1e1b5cba39d01b11b2c85442c5d9485285bf661316e5196448484bc78dd9d866c3829648cd547ac0996d454f113d054c3bc43728f917740870f5fe191c97b15c
+  data.tar.gz: bf5d20de1111be19c03cacb2639f303d0ced578656bfc5b4dae4e8cd6e28991be003e7a20702ab6825526fbee6f91ebcd676fbb27c9010792abd37a2e7eab218

data/.rubocop.yml

@@ -3,10 +3,10 @@ inherit_from: .rubocop_todo.yml
 AllCops:
   TargetRubyVersion: 2.4
 
-Layout/AlignArguments:
+Layout/ArgumentAlignment:
   Enabled: false
 
-Layout/AlignParameters:
+Layout/ParameterAlignment:
   Enabled: false
 
 Layout/DotPosition:
@@ -15,9 +15,21 @@ Layout/DotPosition:
 Layout/EmptyLineAfterGuardClause:
   Enabled: false
 
+Layout/LineLength:
+  Max: 100
+
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+
 Lint/AssignmentInCondition:
   Enabled: false
 
+Lint/RaiseException:
+  Enabled: true
+
+Lint/StructNewOverride:
+  Enabled: true
+
 # We use this a lot in specs where it's perfectly valid
 Lint/Void:
   Exclude:
@@ -35,9 +47,6 @@ Metrics/CyclomaticComplexity:
 Metrics/ClassLength:
   Enabled: false
 
-Metrics/LineLength:
-  Max: 100
-
 Metrics/MethodLength:
   Enabled: false
 
@@ -57,6 +66,18 @@ Style/Documentation:
 Style/DoubleNegation:
   Enabled: false
 
+Style/ExponentialNotation:
+  Enabled: true
+
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+
 # We have too much code that relies on modifying strings
 Style/FrozenStringLiteralComment:
   Enabled: false

data/.rubocop_todo.yml

@@ -9,7 +9,7 @@
 # Offense count: 17
 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
 # AllowedNames: io, id, to, by, on, in, at, ip
-Naming/UncommunicativeMethodParamName:
+Naming/MethodParameterName:
   Exclude:
     - 'lib/mock_redis/database.rb'
     - 'lib/mock_redis/expire_wrapper.rb'

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # MockRedis Changelog
 
+### 0.25.0
+
+* Add support for `xread` command ([#190](https://github.com/sds/mock_redis/pull/190))
+* Fix `mget` to raise error when passing empty array ([#191](https://github.com/sds/mock_redis/pull/191))
+* Fix `xadd` when `maxlen` is zero ([#192](https://github.com/sds/mock_redis/pull/192))
+
+### 0.24.0
+
+* Fix handling of blocks within `multi` blocks ([#185](https://github.com/sds/mock_redis/pull/185))
+* Fix handling of multiple consecutive `?` characters in key pattern matching ([#186](https://github.com/sds/mock_redis/pull/186))
+* Change `exists` to return an integer and add `exists?` ([#188](https://github.com/sds/mock_redis/pull/188))
+
 ### 0.23.0
 
 * Raise error when `setex` called with negative timeout ([#174](https://github.com/sds/mock_redis/pull/174))

data/Gemfile

@@ -4,9 +4,9 @@ source 'http://rubygems.org'
 gemspec
 
 # Run all pre-commit hooks via Overcommit during CI runs
-gem 'overcommit', '0.48.0'
+gem 'overcommit', '0.53.0'
 
 # Pin tool versions (which are executed by Overcommit) for Travis builds
-gem 'rubocop', '0.68.1'
+gem 'rubocop', '0.82.0'
 
 gem 'coveralls', require: false

data/lib/mock_redis/database.rb

@@ -35,7 +35,7 @@ class MockRedis
 
     def initialize_copy(_source)
       @data = @data.clone
-      @data.keys.each { |k| @data[k] = @data[k].clone }
+      @data.each_key { |k| @data[k] = @data[k].clone }
       @expire_times = @expire_times.map(&:clone)
     end
 
@@ -106,7 +106,7 @@ class MockRedis
         raise Redis::CommandError, 'ERR value is not an integer or out of range'
       end
 
-      if exists(key)
+      if exists?(key)
         timestamp = Rational(timestamp_ms.to_i, 1000)
         set_expiration(key, @base.time_at(timestamp))
         true
@@ -115,12 +115,17 @@ class MockRedis
       end
     end
 
-    def exists(key)
-      data.key?(key)
+    def exists(*keys)
+      keys.count { |key| data.key?(key) }
+    end
+
+    def exists?(*keys)
+      keys.each { |key| return true if data.key?(key) }
+      false
     end
 
     def flushdb
-      data.keys.each { |k| del(k) }
+      data.each_key { |k| del(k) }
       'OK'
     end
 
@@ -130,7 +135,7 @@ class MockRedis
     end
 
     def restore(key, ttl, value, replace: false)
-      if !replace && exists(key)
+      if !replace && exists?(key)
         raise Redis::CommandError, 'BUSYKEY Target key name already exists.'
       end
       data[key] = Marshal.load(value) # rubocop:disable Security/MarshalLoad
@@ -163,7 +168,7 @@ class MockRedis
     end
 
     def persist(key)
-      if exists(key) && has_expiration?(key)
+      if exists?(key) && has_expiration?(key)
         remove_expiration(key)
         true
       else
@@ -204,7 +209,7 @@ class MockRedis
         raise Redis::CommandError, 'ERR no such key'
       end
 
-      if exists(newkey)
+      if exists?(newkey)
         false
       else
         rename(key, newkey)
@@ -217,7 +222,7 @@ class MockRedis
     end
 
     def ttl(key)
-      if !exists(key)
+      if !exists?(key)
         -2
       elsif has_expiration?(key)
         now, = @base.now
@@ -231,7 +236,7 @@ class MockRedis
       now, miliseconds = @base.now
       now_ms = now * 1000 + miliseconds
 
-      if !exists(key)
+      if !exists?(key)
         -2
       elsif has_expiration?(key)
         (expiration(key).to_r * 1000).to_i - now_ms
@@ -248,7 +253,7 @@ class MockRedis
     alias time now
 
     def type(key)
-      if !exists(key)
+      if !exists?(key)
         'none'
       elsif hashy?(key)
         'hash'
@@ -323,7 +328,7 @@ class MockRedis
       Regexp.new(
         "^#{pattern}$".
         gsub(/([+|()])/, '\\\\\1').
-        gsub(/([^\\])\?/, '\\1.').
+        gsub(/(?<!\\)\?/, '\\1.').
         gsub(/([^\\])\*/, '\\1.*')
       )
     end
@@ -351,8 +356,8 @@ class MockRedis
     # This method isn't private, but it also isn't a Redis command, so
     # it doesn't belong up above with all the Redis commands.
     def expire_keys
-      now, miliseconds = self.now
-      now_ms = now * 1_000 + miliseconds
+      now_sec, miliseconds = now
+      now_ms = now_sec * 1_000 + miliseconds
 
       to_delete = expire_times.take_while do |(time, _key)|
         (time.to_r * 1_000).to_i <= now_ms

data/lib/mock_redis/future.rb

@@ -17,7 +17,7 @@ class MockRedis
 
     def store_result(result)
       @result_set = true
-      @result = result
+      @result = @block ? @block.call(result) : result
     end
   end
 end

data/lib/mock_redis/geospatial_methods.rb

@@ -38,7 +38,7 @@ class MockRedis
       lng2, lat2 = geohash_decode(hash2)
 
       distance = geohash_distance(lng1, lat1, lng2, lat2) / to_meter
-      format('%.4f', distance)
+      format('%<distance>.4f', distance: distance)
     end
 
     def geohash(key, members)
@@ -95,8 +95,8 @@ class MockRedis
       lat = Float(point[1])
 
       unless LNG_RANGE.include?(lng) && LAT_RANGE.include?(lat)
-        lng = format('%.6f', lng)
-        lat = format('%.6f', lat)
+        lng = format('%<long>.6f', long: lng)
+        lat = format('%<lat>.6f', lat: lat)
         raise Redis::CommandError,
           "ERR invalid longitude,latitude pair #{lng},#{lat}"
       end
@@ -201,7 +201,7 @@ class MockRedis
     end
 
     def format_decoded_coord(coord)
-      coord = format('%.17f', coord)
+      coord = format('%<coord>.17f', coord: coord)
       l = 1
       l += 1 while coord[-l] == '0'
       coord = coord[0..-l]

data/lib/mock_redis/hash_methods.rb

@@ -128,10 +128,15 @@ class MockRedis
       end
     end
 
-    def hset(key, field, value)
-      field_exists = hexists(key, field)
-      with_hash_at(key) { |h| h[field.to_s] = value.to_s }
-      !field_exists
+    def hset(key, *args)
+      added = 0
+      with_hash_at(key) do |hash|
+        args.each_slice(2) do |field, value|
+          added += 1 unless hash.key?(field.to_s)
+          hash[field.to_s] = value.to_s
+        end
+      end
+      added
     end
 
     def hsetnx(key, field, value)

data/lib/mock_redis/info_method.rb

@@ -83,7 +83,7 @@ class MockRedis
 
     # The Ruby Redis client returns commandstats differently when it's called as
     # "INFO commandstats".
-    # rubocop:disable Metrics/LineLength
+    # rubocop:disable Layout/LineLength
     COMMAND_STATS_SOLO_INFO = {
       'auth' => { 'calls' => '572501', 'usec' => '2353163', 'usec_per_call' => '4.11' },
       'client' => { 'calls' => '1', 'usec' => '80', 'usec_per_call' => '80.00' },
@@ -123,7 +123,7 @@ class MockRedis
       '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
+    # rubocop:enable Layout/LineLength
 
     DEFAULT_INFO = [
       SERVER_INFO,

data/lib/mock_redis/multi_db_wrapper.rb

@@ -24,7 +24,7 @@ class MockRedis
     def initialize_copy(source)
       super
       @databases = @databases.clone
-      @databases.keys.each do |k|
+      @databases.each_key do |k|
         @databases[k] = @databases[k].clone
       end
     end
@@ -39,7 +39,7 @@ class MockRedis
       src = current_db
       dest = db(db_index)
 
-      if !src.exists(key) || dest.exists(key)
+      if !src.exists?(key) || dest.exists?(key)
         false
       else
         case current_db.type(key)

data/lib/mock_redis/stream.rb

@@ -23,14 +23,29 @@ class MockRedis
 
     def add(id, values)
       @last_id = MockRedis::Stream::Id.new(id, min: @last_id)
+      if @last_id.to_s == '0-0'
+        raise Redis::CommandError,
+              'ERR The ID specified in XADD is equal or smaller than ' \
+              'the target stream top item'
+        # TOOD: Redis version 6.0.4, w redis 4.2.1 generates the following error message:
+        # 'ERR The ID specified in XADD must be greater than 0-0'
+      end
       members.add [@last_id, Hash[values.map { |k, v| [k.to_s, v.to_s] }]]
       @last_id.to_s
     end
 
     def trim(count)
       deleted = @members.size - count
-      @members = @members.to_a[-count..-1].to_set
-      deleted
+      if deleted > 0
+        @members = if count == 0
+                     Set.new
+                   else
+                     @members.to_a[-count..-1].to_set
+                   end
+        deleted
+      else
+        0
+      end
     end
 
     def range(start, finish, reversed, *opts_in)
@@ -45,6 +60,11 @@ class MockRedis
       items
     end
 
+    def read(id)
+      stream_id = MockRedis::Stream::Id.new(id)
+      members.select { |m| (stream_id < m[0]) }.map { |m| [m[0].to_s, m[1]] }
+    end
+
     def each
       members.each { |m| yield m }
     end

data/lib/mock_redis/stream/id.rb

@@ -31,7 +31,7 @@ class MockRedis
             @timestamp = id
           end
           @sequence = @sequence.nil? ? sequence : @sequence.to_i
-          if (@timestamp == 0 && @sequence == 0) || self <= min
+          if self <= min
             raise Redis::CommandError,
                   'ERR The ID specified in XADD is equal or smaller than ' \
                   'the target stream top item'

data/lib/mock_redis/stream_methods.rb

@@ -4,7 +4,6 @@ require 'mock_redis/stream'
 
 # TODO: Implement the following commands
 #
-#   * xread
 #   * xgroup
 #   * xreadgroup
 #   * xack
@@ -67,6 +66,20 @@ class MockRedis
       end
     end
 
+    # TODO: Implement count and block parameters
+    def xread(keys, ids)
+      result = {}
+      keys = keys.is_a?(Array) ? keys : [keys]
+      ids = ids.is_a?(Array) ? ids : [ids]
+      keys.each_with_index do |key, index|
+        with_stream_at(key) do |stream|
+          data = stream.read(ids[index])
+          result[key] = data unless data.empty?
+        end
+      end
+      result
+    end
+
     private
 
     def with_stream_at(key, &blk)

data/lib/mock_redis/string_methods.rb

@@ -154,9 +154,10 @@ class MockRedis
     end
 
     def mget(*keys)
+      keys.flatten!
+
       assert_has_args(keys, 'mget')
 
-      keys.flatten!
       keys.map do |key|
         get(key) if stringy?(key)
       end
@@ -188,7 +189,7 @@ class MockRedis
     def msetnx(*kvpairs)
       assert_has_args(kvpairs, 'msetnx')
 
-      if kvpairs.each_slice(2).any? { |(k, _)| exists(k) }
+      if kvpairs.each_slice(2).any? { |(k, _)| exists?(k) }
         false
       else
         mset(*kvpairs)
@@ -205,14 +206,14 @@ class MockRedis
       return_true = false
       options = options.dup
       if options.delete(:nx)
-        if exists(key)
+        if exists?(key)
           return false
         else
           return_true = true
         end
       end
       if options.delete(:xx)
-        if exists(key)
+        if exists?(key)
           return_true = true
         else
           return false
@@ -235,6 +236,9 @@ class MockRedis
         end
         pexpire(key, duration)
       end
+      unless options.empty?
+        raise ArgumentError, "unknown keyword: #{options.keys[0]}"
+      end
 
       return_true ? true : 'OK'
     end
@@ -323,7 +327,7 @@ class MockRedis
     end
 
     def setnx(key, value)
-      if exists(key)
+      if exists?(key)
         false
       else
         set(key, value)

data/lib/mock_redis/transaction_wrapper.rb

@@ -17,7 +17,7 @@ class MockRedis
 
     def method_missing(method, *args, &block)
       if in_multi?
-        future = MockRedis::Future.new([method, *args])
+        future = MockRedis::Future.new([method, *args], block)
         @transaction_futures << future
 
         if @multi_block_given
@@ -60,7 +60,7 @@ class MockRedis
         begin
           result = send(*future.command)
           future.store_result(result)
-          result
+          future.value
         rescue StandardError => e
           e
         end

data/lib/mock_redis/utility_methods.rb

@@ -18,7 +18,7 @@ class MockRedis
     end
 
     def clean_up_empties_at(key)
-      if data[key]&.empty? && data[key] != ''
+      if data[key]&.empty? && data[key] != '' && !data[key].is_a?(Stream)
         del(key)
       end
     end

data/lib/mock_redis/version.rb

@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 class MockRedis
-  VERSION = '0.23.0'
+  VERSION = '0.25.0'
 end

data/mock_redis.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.4'
 
-  s.add_development_dependency 'redis', '~> 4.1.0'
+  s.add_development_dependency 'redis', '~> 4.2.0'
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'rspec-its', '~> 1.0'
   s.add_development_dependency 'timecop', '~> 0.9.1'

data/spec/commands/blpop_spec.rb

@@ -27,12 +27,6 @@ describe '#blpop(key [, key, ...,], timeout)' do
       [@list1, 'one']
   end
 
-  it 'raises an error on subsecond timeouts' do
-    lambda do
-      @redises.blpop(@list1, @list2, :timeout => 0.5)
-    end.should raise_error(Redis::CommandError)
-  end
-
   it 'raises an error on negative timeout' do
     lambda do
       @redises.blpop(@list1, @list2, :timeout => -1)

data/spec/commands/brpop_spec.rb

@@ -26,11 +26,12 @@ describe '#brpop(key [, key, ...,], timeout)' do
       [@list1, 'two']
   end
 
-  it 'raises an error on subsecond timeouts' do
-    lambda do
-      @redises.brpop(@list1, @list2, :timeout => 0.5)
-    end.should raise_error(Redis::CommandError)
-  end
+  # TODO: Not sure how redis-rb is handling this but they're not raising an error
+  # it 'raises an error on subsecond timeouts' do
+  #   lambda do
+  #     @redises.brpop(@list1, @list2, :timeout => 0.5)
+  #   end.should raise_error(Redis::CommandError)
+  # end
 
   it 'raises an error on negative timeout' do
     lambda do

data/spec/commands/del_spec.rb

@@ -1,6 +1,14 @@
 require 'spec_helper'
 
 describe '#del(key [, key, ...])' do
+  before :all do
+    sleep 1 - (Time.now.to_f % 1)
+  end
+
+  before :each do
+    @redises._gsub(/\d{3}-\d/, '...-.')
+  end
+
   it 'returns the number of keys deleted' do
     @redises.set('mock-redis-test:1', 1)
     @redises.set('mock-redis-test:2', 1)
@@ -32,4 +40,11 @@ describe '#del(key [, key, ...])' do
   it 'raises an error if an empty array is given' do
     expect { @redises.del [] }.to raise_error Redis::CommandError
   end
+
+  it 'removes a stream key' do
+    @redises.xadd('mock-redis-stream', { key: 'value' }, maxlen: 0)
+    expect(@redises.exists?('mock-redis-stream')).to eq true
+    @redises.del('mock-redis-stream')
+    expect(@redises.exists?('mock-redis-stream')).to eq false
+  end
 end

data/spec/commands/exists_spec.rb

@@ -1,14 +1,43 @@
 require 'spec_helper'
 
-describe '#exists(key)' do
-  before { @key = 'mock-redis-test:45794' }
+describe '#exists(*keys)' do
+  before { @key1 = 'mock-redis-test:exists1' }
+  before { @key2 = 'mock-redis-test:exists2' }
+
+  it 'returns 0 for keys that do not exist' do
+    @redises.exists(@key1).should == 0
+    @redises.exists(@key1, @key2).should == 0
+  end
+
+  it 'returns 1 for keys that do exist' do
+    @redises.set(@key1, 1)
+    @redises.exists(@key1).should == 1
+  end
+
+  it 'returns the count of all keys that exist' do
+    @redises.set(@key1, 1)
+    @redises.set(@key2, 1)
+    @redises.exists(@key1, @key2).should == 2
+    @redises.exists(@key1, @key2, 'does-not-exist').should == 2
+  end
+end
+
+describe '#exists?(*keys)' do
+  before { @key1 = 'mock-redis-test:exists1' }
+  before { @key2 = 'mock-redis-test:exists2' }
 
   it 'returns false for keys that do not exist' do
-    @redises.exists(@key).should == false
+    @redises.exists?(@key1).should == false
+    @redises.exists?(@key1, @key2).should == false
   end
 
   it 'returns true for keys that do exist' do
-    @redises.set(@key, 1)
-    @redises.exists(@key).should == true
+    @redises.set(@key1, 1)
+    @redises.exists?(@key1).should == true
+  end
+
+  it 'returns true if any keys exist' do
+    @redises.set(@key2, 1)
+    @redises.exists?(@key1, @key2).should == true
   end
 end

data/spec/commands/future_spec.rb

@@ -3,7 +3,12 @@ require 'spec_helper'
 describe MockRedis::Future do
   let(:command) { [:get, 'foo'] }
   let(:result)  { 'bar' }
-  before        { @future = MockRedis::Future.new(command) }
+  let(:block)   { ->(value) { value.upcase } }
+
+  before do
+    @future = MockRedis::Future.new(command)
+    @future2 = MockRedis::Future.new(command, block)
+  end
 
   it 'remembers the command' do
     @future.command.should eq(command)
@@ -17,4 +22,9 @@ describe MockRedis::Future do
     @future.store_result(result)
     @future.value.should eq(result)
   end
+
+  it 'executes the block on the value if block is passed in' do
+    @future2.store_result(result)
+    @future2.value.should eq('BAR')
+  end
 end

data/spec/commands/geoadd_spec.rb

@@ -33,7 +33,7 @@ describe '#geoadd' do
     context 'when coordinates are not in allowed range' do
       let(:coords) { [181, 86] }
       let(:message) do
-        formatted_coords = coords.map { |c| format('%.6f', c) }
+        formatted_coords = coords.map { |c| format('%<coords>.6f', coords: c) }
         "ERR invalid longitude,latitude pair #{formatted_coords.join(',')}"
       end
 

data/spec/commands/hset_spec.rb

@@ -5,18 +5,18 @@ describe '#hset(key, field)' do
     @key = 'mock-redis-test:hset'
   end
 
-  it 'returns true if the key does not exist' do
-    @redises.hset(@key, 'k1', 'v1').should == true
+  it 'returns 1 if the key does not exist' do
+    @redises.hset(@key, 'k1', 'v1').should == 1
   end
 
-  it 'returns true if the key exists but the field does not' do
+  it 'returns 1 if the key exists but the field does not' do
     @redises.hset(@key, 'k1', 'v1')
-    @redises.hset(@key, 'k2', 'v2').should == true
+    @redises.hset(@key, 'k2', 'v2').should == 1
   end
 
-  it 'returns false if the field already exists' do
+  it 'returns 0 if the field already exists' do
     @redises.hset(@key, 'k1', 'v1')
-    @redises.hset(@key, 'k1', 'v1').should == false
+    @redises.hset(@key, 'k1', 'v1').should == 0
   end
 
   it 'creates a hash there is no such field' do

data/spec/commands/keys_spec.rb

@@ -29,6 +29,7 @@ describe '#keys()' do
 
       @redises.set('mock-redis-test:special-key?', 'true')
       @redises.set('mock-redis-test:special-key*', 'true')
+      @redises.set('mock-redis-test:special-key-!?*', 'true')
     end
 
     describe 'the ? character' do
@@ -53,6 +54,22 @@ describe '#keys()' do
           'mock-redis-test:special-key?',
         ]
       end
+
+      context 'multiple ? characters' do
+        it "properly handles multiple consequtive '?' characters" do
+          @redises.keys('mock-redis-test:special-key-???').sort.should == [
+            'mock-redis-test:special-key-!?*',
+          ]
+        end
+
+        context '\\? as a literal ' do
+          it 'handles multiple ? as both literal and special character' do
+            @redises.keys('mock-redis-test:special-key-?\??').sort.should == [
+              'mock-redis-test:special-key-!?*',
+            ]
+          end
+        end
+      end
     end
 
     describe 'the * character' do

data/spec/commands/mget_spec.rb

@@ -49,5 +49,11 @@ describe '#mget(key [, key, ...])' do
         @redises.mget
       end.should raise_error(Redis::CommandError)
     end
+
+    it 'raises an error if you pass it empty array' do
+      lambda do
+        @redises.mget([])
+      end.should raise_error(Redis::CommandError)
+    end
   end
 end

data/spec/commands/move_spec.rb

@@ -64,7 +64,7 @@ describe '#move(key, db)' do
     end
 
     it 'removes key from srcdb' do
-      @redises.exists(@key).should == false
+      @redises.exists?(@key).should == false
     end
 
     it 'copies key to destdb' do
@@ -81,7 +81,7 @@ describe '#move(key, db)' do
     end
 
     it 'removes key from srcdb' do
-      @redises.exists(@key).should == false
+      @redises.exists?(@key).should == false
     end
 
     it 'copies key to destdb' do
@@ -99,7 +99,7 @@ describe '#move(key, db)' do
     end
 
     it 'removes key from srcdb' do
-      @redises.exists(@key).should == false
+      @redises.exists?(@key).should == false
     end
 
     it 'copies key to destdb' do
@@ -117,7 +117,7 @@ describe '#move(key, db)' do
     end
 
     it 'removes key from srcdb' do
-      @redises.exists(@key).should == false
+      @redises.exists?(@key).should == false
     end
 
     it 'copies key to destdb' do
@@ -135,7 +135,7 @@ describe '#move(key, db)' do
     end
 
     it 'removes key from srcdb' do
-      @redises.exists(@key).should == false
+      @redises.exists?(@key).should == false
     end
 
     it 'copies key to destdb' do

data/spec/commands/set_spec.rb

@@ -33,10 +33,12 @@ describe '#set(key, value)' do
       @redises.set(key, 1, xx: true).should == true
     end
 
-    it 'ignores other options' do
+    it 'raises on unknown options' do
       key = 'mock-redis-test'
       @redises.del(key)
-      @redises.set(key, 1, logger: :something).should == 'OK'
+      expect do
+        @redises.set(key, 1, logger: :something)
+      end.to raise_error(ArgumentError, 'unknown keyword: logger')
     end
 
     context '[mock only]' do

data/spec/commands/setbit_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe '#setbit(key, offset)' do
   before do
+    Encoding.default_external = 'UTF-8'
     @key = 'mock-redis-test:setbit'
     @redises.set(@key, 'h') # ASCII 0x68
   end

data/spec/commands/srandmember_spec.rb

@@ -37,7 +37,7 @@ describe '#srandmember(key)' do
       @redises.send_without_checking(:srandmember, @key, 2).size.should == 2
     end
 
-    it 'returns random members up to count from the set when count is negative even if count.abs is greater than the set size' do # rubocop:disable Metrics/LineLength
+    it 'returns random members up to count from the set when count is negative even if count.abs is greater than the set size' do # rubocop:disable Layout/LineLength
       @redises.send_without_checking(:srandmember, @key, -5).size.should == 5
     end
 

data/spec/commands/xadd_spec.rb

@@ -54,6 +54,8 @@ describe '#xadd("mystream", { f1: "v1", f2: "v2" }, id: "0-0", maxlen: 1000, app
         Redis::CommandError,
         'ERR The ID specified in XADD is equal or smaller than the target ' \
         'stream top item'
+        # TOOD: Redis version 6.0.4, w redis 4.2.1 generates the following error message:
+        # 'ERR The ID specified in XADD must be greater than 0-0'
       )
   end
 
@@ -99,4 +101,22 @@ describe '#xadd("mystream", { f1: "v1", f2: "v2" }, id: "0-0", maxlen: 1000, app
       ]
     )
   end
+
+  it 'supports a maxlen greater than the current size' do
+    @redises.xadd(@key, { key1: 'value1' }, id: '1234567891234-0')
+    @redises.xadd(@key, { key2: 'value2' }, id: '1234567891245-0', maxlen: 1000)
+    expect(@redises.xrange(@key, '-', '+')).to eq(
+      [
+        ['1234567891234-0', { 'key1' => 'value1' }],
+        ['1234567891245-0', { 'key2' => 'value2' }],
+      ]
+    )
+  end
+
+  it 'creates an empty stream with maxlen of 0' do
+    @redises.xadd(@key, { key: 'value' }, maxlen: 0)
+    expect(@redises.xlen(@key)).to eq 0
+    expect(@redises.xrange(@key, '-', '+')).to eq([])
+    expect(@redises.exists?(@key)).to eq true
+  end
 end

data/spec/commands/xrange_spec.rb

@@ -54,6 +54,19 @@ describe '#xrange("mystream", first: "0-1", last: "0-3", count: 10)' do
       )
     end
 
+    it 'returns all entries with a lower limit of 0-0' do
+      expect(@redises.xrange(@key, '0-0', '+')).to eq(
+        [
+          ['1234567891234-0', { 'key1' => 'value1' }],
+          ['1234567891245-0', { 'key2' => 'value2' }],
+          ['1234567891245-1', { 'key3' => 'value3' }],
+          ['1234567891278-0', { 'key4' => 'value4' }],
+          ['1234567891278-1', { 'key5' => 'value5' }],
+          ['1234567891299-0', { 'key6' => 'value6' }]
+        ]
+      )
+    end
+
     it 'returns entries with an upper limit' do
       expect(@redises.xrange(@key, '-', '1234567891285-0')).to eq(
         [

data/spec/commands/xread_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+describe '#xread(keys, ids)' do
+  before :all do
+    sleep 1 - (Time.now.to_f % 1)
+    @key = 'mock-redis-test:xread'
+    @key1 = 'mock-redis-test:xread1'
+  end
+
+  it 'reads a single entry' do
+    @redises.xadd(@key, { key: 'value' }, id: '1234567891234-0')
+    expect(@redises.xread(@key, '0-0'))
+      .to eq({ @key => [['1234567891234-0', { 'key' => 'value' }]] })
+  end
+
+  it 'reads multiple entries from the beginning of the stream' do
+    @redises.xadd(@key, { key0: 'value0' }, id: '1234567891234-0')
+    @redises.xadd(@key, { key1: 'value1' }, id: '1234567891234-1')
+    expect(@redises.xread(@key, '0-0'))
+      .to eq({ @key => [['1234567891234-0', { 'key0' => 'value0' }],
+                        ['1234567891234-1', { 'key1' => 'value1' }]] })
+  end
+
+  it 'reads entries greater than the ID passed' do
+    @redises.xadd(@key, { key0: 'value0' }, id: '1234567891234-0')
+    @redises.xadd(@key, { key1: 'value1' }, id: '1234567891234-1')
+    expect(@redises.xread(@key, '1234567891234-0'))
+      .to eq({ @key => [['1234567891234-1', { 'key1' => 'value1' }]] })
+  end
+
+  it 'reads from multiple streams' do
+    @redises.xadd(@key, { key: 'value' }, id: '1234567891234-0')
+    @redises.xadd(@key1, { key1: 'value1' }, id: '1234567891234-0')
+    expect(@redises.xread([@key, @key1], %w[0-0 0-0]))
+      .to eq({ @key => [['1234567891234-0', { 'key' => 'value' }]],
+               @key1 => [['1234567891234-0', { 'key1' => 'value1' }]] })
+  end
+
+  it 'reads from multiple streams at the given IDs' do
+    @redises.xadd(@key, { key: 'value0' }, id: '1234567891234-0')
+    @redises.xadd(@key, { key: 'value1' }, id: '1234567891234-1')
+    @redises.xadd(@key, { key: 'value2' }, id: '1234567891234-2')
+    @redises.xadd(@key1, { key1: 'value0' }, id: '1234567891234-0')
+    @redises.xadd(@key1, { key1: 'value1' }, id: '1234567891234-1')
+    @redises.xadd(@key1, { key1: 'value2' }, id: '1234567891234-2')
+    # The first stream won't return anything since we specify the last ID
+    expect(@redises.xread([@key, @key1], %w[1234567891234-2 1234567891234-1]))
+      .to eq({ @key1 => [['1234567891234-2', { 'key1' => 'value2' }]] })
+  end
+end

data/spec/commands/xtrim_spec.rb

@@ -16,6 +16,12 @@ describe '#xtrim("mystream", 1000, approximate: true)' do
     expect(@redises.xtrim(@key, 4)).to eq 2
   end
 
+  it 'returns 0 if count is greater than size' do
+    initial = @redises.xrange(@key, '-', '+')
+    expect(@redises.xtrim(@key, 1000)).to eq 0
+    expect(@redises.xrange(@key, '-', '+')).to eql(initial)
+  end
+
   it 'deletes the oldes elements' do
     @redises.xtrim(@key, 4)
     expect(@redises.xrange(@key, '-', '+')).to eq(

data/spec/commands/zrange_spec.rb

@@ -15,7 +15,7 @@ describe '#zrange(key, start, stop [, :with_scores => true])' do
     end
 
     it 'should return an empty array' do
-      @redises.exists(@key).should == false
+      @redises.exists?(@key).should == false
       @redises.zrange(@key, 0, 4).should == []
     end
   end

data/spec/commands/zrangebyscore_spec.rb

@@ -15,7 +15,7 @@ describe '#zrangebyscore(key, start, stop [:with_scores => true] [:limit => [off
     end
 
     it 'should return an empty array' do
-      @redises.exists(@key).should == false
+      @redises.exists?(@key).should == false
       @redises.zrangebyscore(@key, 0, 4).should == []
     end
   end

data/spec/commands/zrevrange_spec.rb

@@ -15,7 +15,7 @@ describe '#zrevrange(key, start, stop [, :with_scores => true])' do
     end
 
     it 'should return an empty array' do
-      @redises.exists(@key).should == false
+      @redises.exists?(@key).should == false
       @redises.zrevrange(@key, 0, 4).should == []
     end
   end

data/spec/commands/zrevrangebyscore_spec.rb

@@ -15,7 +15,7 @@ describe '#zrevrangebyscore(key, start, stop [:with_scores => true] [:limit => [
     end
 
     it 'should return an empty array' do
-      @redises.exists(@key).should == false
+      @redises.exists?(@key).should == false
       @redises.zrevrangebyscore(@key, 0, 4).should == []
     end
   end

data/spec/spec_helper.rb

@@ -15,7 +15,7 @@ require 'mock_redis'
 require 'timecop'
 
 $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..')))
-Dir['spec/support/**/*.rb'].each { |x| require x }
+Dir['spec/support/**/*.rb'].sort.each { |x| require x }
 
 module TypeCheckingHelper
   def method_from_description(example)
@@ -40,6 +40,8 @@ end
 RSpec.configure do |config|
   config.expect_with :rspec do |c|
     c.syntax = [:expect, :should]
+    # Allow for a large output so we can debug error messages
+    c.max_formatted_output_length = 1_000_000
   end
 
   config.mock_with :rspec do |c|

data/spec/support/redis_multiplexer.rb

@@ -9,6 +9,7 @@ class RedisMultiplexer < BlankSlate
 
   def initialize(*a)
     @mock_redis = MockRedis.new(*a)
+    Redis.exists_returns_integer = true
     @real_redis = Redis.new(*a)
     _gsub_clear
   end

data/spec/transactions_spec.rb

@@ -67,6 +67,22 @@ describe 'transactions (multi/exec/discard)' do
       @redises.get('counter').should eq '6'
       @redises.get('test').should eq '1'
     end
+
+    it 'allows blocks within multi blocks' do
+      @redises.set('foo', 'bar')
+      @redises.set('fuu', 'baz')
+
+      result = nil
+
+      @redises.multi do |r|
+        result = r.mget('foo', 'fuu') { |reply| reply.map(&:upcase) }
+        r.del('foo', 'fuu')
+      end
+
+      result.value.should eq %w[BAR BAZ]
+      @redises.get('foo').should eq nil
+      @redises.get('fuu').should eq nil
+    end
   end
 
   context '#discard' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mock_redis
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.25.0
 platform: ruby
 authors:
 - Shane da Silva
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-22 00:00:00.000000000 Z
+date: 2020-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -241,6 +241,7 @@ files:
 - spec/commands/xadd_spec.rb
 - spec/commands/xlen_spec.rb
 - spec/commands/xrange_spec.rb
+- spec/commands/xread_spec.rb
 - spec/commands/xrevrange_spec.rb
 - spec/commands/xtrim_spec.rb
 - spec/commands/zadd_spec.rb
@@ -425,6 +426,7 @@ test_files:
 - spec/commands/xadd_spec.rb
 - spec/commands/xlen_spec.rb
 - spec/commands/xrange_spec.rb
+- spec/commands/xread_spec.rb
 - spec/commands/xrevrange_spec.rb
 - spec/commands/xtrim_spec.rb
 - spec/commands/zadd_spec.rb