mock_redis 0.22.0 → 0.27.0

data/lib/mock_redis/pipelined_wrapper.rb

@@ -18,7 +18,7 @@ class MockRedis
       @pipelined_futures = @pipelined_futures.clone
     end
 
-    def method_missing(method, *args, &block)
+    ruby2_keywords def method_missing(method, *args, &block)
       if in_pipeline?
         future = MockRedis::Future.new([method, *args], block)
         @pipelined_futures << future

data/lib/mock_redis/stream.rb

@@ -23,14 +23,26 @@ 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 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 +57,14 @@ class MockRedis
       items
     end
 
+    def read(id, *opts_in)
+      opts = options opts_in, %w[count block]
+      stream_id = MockRedis::Stream::Id.new(id)
+      items = members.select { |m| (stream_id < m[0]) }.map { |m| [m[0].to_s, m[1]] }
+      return items.first(opts['count'].to_i) if opts.key?('count')
+      items
+    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,22 @@ class MockRedis
       end
     end
 
+    def xread(keys, ids, count: nil, block: nil)
+      args = []
+      args += ['COUNT', count] if count
+      args += ['BLOCK', block.to_i] if block
+      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], *args)
+          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)
@@ -200,19 +201,20 @@ class MockRedis
       msetnx(*hash.to_a.flatten)
     end
 
-    def set(key, value, options = {})
+    # Parameer list required to ensure the ArgumentError is returned correctly
+    # rubocop:disable Metrics/ParameterLists
+    def set(key, value, ex: nil, px: nil, nx: nil, xx: nil, keepttl: nil)
       key = key.to_s
       return_true = false
-      options = options.dup
-      if options.delete(:nx)
-        if exists(key)
+      if nx
+        if exists?(key)
           return false
         else
           return_true = true
         end
       end
-      if options.delete(:xx)
-        if exists(key)
+      if xx
+        if exists?(key)
           return_true = true
         else
           return false
@@ -220,24 +222,24 @@ class MockRedis
       end
       data[key] = value.to_s
 
-      duration = options.delete(:ex)
-      if duration
-        if duration == 0
+      remove_expiration(key) unless keepttl
+      if ex
+        if ex == 0
           raise Redis::CommandError, 'ERR invalid expire time in set'
         end
-        expire(key, duration)
+        expire(key, ex)
       end
 
-      duration = options.delete(:px)
-      if duration
-        if duration == 0
+      if px
+        if px == 0
           raise Redis::CommandError, 'ERR invalid expire time in set'
         end
-        expire(key, duration / 1000.0)
+        pexpire(key, px)
       end
 
       return_true ? true : 'OK'
     end
+    # rubocop:enable Metrics/ParameterLists
 
     def setbit(key, offset, value)
       assert_stringy(key, 'ERR bit is not an integer or out of range')
@@ -245,6 +247,7 @@ class MockRedis
 
       str = data[key] || ''
 
+      offset = offset.to_i
       offset_of_byte = offset / 8
       offset_within_byte = offset % 8
 
@@ -313,13 +316,17 @@ class MockRedis
     end
 
     def setex(key, seconds, value)
-      set(key, value)
-      expire(key, seconds)
-      'OK'
+      if seconds <= 0
+        raise Redis::CommandError, 'ERR invalid expire time in setex'
+      else
+        set(key, value)
+        expire(key, seconds)
+        'OK'
+      end
     end
 
     def setnx(key, value)
-      if exists(key)
+      if exists?(key)
         false
       else
         set(key, value)

data/lib/mock_redis/transaction_wrapper.rb

@@ -15,9 +15,9 @@ class MockRedis
       @multi_block_given = false
     end
 
-    def method_missing(method, *args, &block)
+    ruby2_keywords 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.22.0'
+  VERSION = '0.27.0'
 end

data/lib/mock_redis/zset_methods.rb

@@ -26,7 +26,7 @@ class MockRedis
     end
 
     def zadd_one_member(key, score, member, zadd_options = {})
-      assert_scorey(score) unless score =~ /(\+|\-)inf/
+      assert_scorey(score) unless score.to_s =~ /(\+|\-)inf/
 
       with_zset_at(key) do |zset|
         if zadd_options[:incr]
@@ -282,7 +282,7 @@ class MockRedis
                      raise Redis::CommandError, 'ERR syntax error'
                    end
 
-      with_zsets_at(*keys) do |*zsets|
+      with_zsets_at(*keys, coercible: true) do |*zsets|
         zsets.zip(weights).map do |(zset, weight)|
           zset.reduce(Zset.new) do |acc, (score, member)|
             acc.add(score * weight, member)
@@ -293,16 +293,30 @@ class MockRedis
       end
     end
 
-    def with_zset_at(key, &blk)
-      with_thing_at(key, :assert_zsety, proc { Zset.new }, &blk)
+    def coerce_to_zset(set)
+      zset = Zset.new
+      set.each do |member|
+        zset.add(1.0, member)
+      end
+      zset
     end
 
-    def with_zsets_at(*keys, &blk)
+    def with_zset_at(key, coercible: false, &blk)
+      if coercible
+        with_thing_at(key, :assert_coercible_zsety, proc { Zset.new }) do |value|
+          blk.call value.is_a?(Set) ? coerce_to_zset(value) : value
+        end
+      else
+        with_thing_at(key, :assert_zsety, proc { Zset.new }, &blk)
+      end
+    end
+
+    def with_zsets_at(*keys, coercible: false, &blk)
       if keys.length == 1
-        with_zset_at(keys.first, &blk)
+        with_zset_at(keys.first, coercible: coercible, &blk)
       else
-        with_zset_at(keys.first) do |set|
-          with_zsets_at(*(keys[1..-1])) do |*sets|
+        with_zset_at(keys.first, coercible: coercible) do |set|
+          with_zsets_at(*(keys[1..-1]), coercible: coercible) do |*sets|
             yield(*([set] + sets))
           end
         end
@@ -313,6 +327,10 @@ class MockRedis
       data[key].nil? || data[key].is_a?(Zset)
     end
 
+    def coercible_zsety?(key)
+      zsety?(key) || data[key].is_a?(Set)
+    end
+
     def assert_zsety(key)
       unless zsety?(key)
         raise Redis::CommandError,
@@ -320,13 +338,20 @@ class MockRedis
       end
     end
 
+    def assert_coercible_zsety(key)
+      unless coercible_zsety?(key)
+        raise Redis::CommandError,
+          'WRONGTYPE Operation against a key holding the wrong kind of value'
+      end
+    end
+
     def looks_like_float?(x)
       # ugh, exceptions for flow control.
       !!Float(x) rescue false
     end
 
     def assert_scorey(value, message = 'ERR value is not a valid float')
-      return if value =~ /\(?(\-|\+)inf/
+      return if value.to_s =~ /\(?(\-|\+)inf/
 
       value = $1 if value.to_s =~ /\((.*)/
       unless looks_like_float?(value)

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/connection_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe '#connection' do
+  let(:redis) { @redises.mock }
+
+  it 'returns the correct values' do
+    redis.connection.should == {
+      :host => '127.0.0.1',
+      :port => 6379,
+      :db => 0,
+      :id => 'redis://127.0.0.1:6379/0',
+      :location => '127.0.0.1:6379'
+    }
+  end
+end

data/spec/commands/del_spec.rb

@@ -1,6 +1,16 @@
 require 'spec_helper'
 
 describe '#del(key [, key, ...])' do
+  before :all do
+    sleep 1 - (Time.now.to_f % 1)
+  end
+
+  before :each do
+    # TODO: Redis appears to be returning a timestamp a few seconds in the future
+    # so we're ignoring the last 5 digits (time in milliseconds)
+    @redises._gsub(/\d{5}-\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 +42,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/dump_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe '#dump(key)' do
+  before do
+    @key = 'mock-redis-test:45794'
+    # These are mock-only, since our dump/restore implementations
+    # aren't compatible with real redis.
+    @mock = @redises.mock
+  end
+
+  it 'returns nil for keys that do not exist' do
+    @mock.dump(@key).should be_nil
+  end
+
+  it 'returns a serialized value for keys that do exist' do
+    @mock.set(@key, '2')
+    @mock.dump(@key).should == Marshal.dump('2')
+  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