mock_redis 0.24.0 → 0.27.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d399a835c1f41a8eb0e5fc42a366e64fc399b5d76ebc23f0d40f73c9db4888e
-  data.tar.gz: 1442920d2b12e46d2d45ff9d8854e4ccf3665b5a5f9a4aef6d29669c9110d023
+  metadata.gz: 5a02f4ad5b82a9a913511533ca04c80bb75025dd0a4a1537917b57d65d34982c
+  data.tar.gz: 0fac5aab079e4cbad0cab684f3c670ae7f0b17650670347eae1402306d2f05e3
 SHA512:
-  metadata.gz: 62b218977c75b5c7ffc80e3762bf0f7791c8f17dfe4f875a8874118583124736ab782e1c985dc92363d62e4366170306d9d0211b19cead2982f16cbff2c13557
-  data.tar.gz: 97b5eeb1c20e597d2ce35e9d109f62aaf3a2271f42c86515be1d7e0d627ad628173aee7d74062b119cf954538116f0b199d06eee5d1fe71b552dea543859a69e
+  metadata.gz: f5276d3d1f052bdf6c7e1ab8a78b450091ca673deb8e15bd02d4ee2e1f22aa43e98bff1cc33e03fd370e4db790ce3b59caadc5675358ffa85687e2972be873f5
+  data.tar.gz: ad4882bf89ce3654b99f2b90880b43a693dbd4ee7569458539d2e115dacc896ae4e86f766fbb9fed5cbab5868172b711c76d2fa7c37f9f05fc7a5a96495f6d47

data/.travis.yml

@@ -20,6 +20,7 @@ rvm:
   - 2.4
   - 2.5
   - 2.6
+  - 2.7
 
 before_script:
   - git config --local user.email "travis@travis.ci"

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 # MockRedis Changelog
 
+### 0.27.2
+
+* Switch `ruby2_keywords` gem from development dependency to runtime dependency
+
+### 0.27.1
+
+* Fix missing `ruby2_keywords` gem
+* Allow passing string `offset` to `getbit` ([#203](https://github.com/sds/mock_redis/pull/203))
+
+### 0.27.0
+
+* Fix handling of keyword arguments on Ruby 3 ([#199](https://github.com/sds/mock_redis/pull/199))
+* Allow passing string `offset` to `setbit` ([#200](https://github.com/sds/mock_redis/pull/200))
+* Add `connection` method ([#201](https://github.com/sds/mock_redis/pull/201))
+
+### 0.26.0
+
+* Add block and count support to `xread` ([#194](https://github.com/sds/mock_redis/pull/194))
+
+### 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))

data/lib/mock_redis.rb

@@ -84,7 +84,7 @@ class MockRedis
     super || @db.respond_to?(method, include_private)
   end
 
-  def method_missing(method, *args, &block)
+  ruby2_keywords def method_missing(method, *args, &block)
     @db.send(method, *args, &block)
   end
 

data/lib/mock_redis/connection_method.rb

@@ -0,0 +1,13 @@
+class MockRedis
+  module ConnectionMethod
+    def connection
+      {
+        :host => @base.host,
+        :port => @base.port,
+        :db => @base.db,
+        :id => @base.id,
+        :location => "#{@base.host}:#{@base.port}"
+      }
+    end
+  end
+end

data/lib/mock_redis/database.rb

@@ -11,6 +11,7 @@ require 'mock_redis/info_method'
 require 'mock_redis/utility_methods'
 require 'mock_redis/geospatial_methods'
 require 'mock_redis/stream_methods'
+require 'mock_redis/connection_method'
 
 class MockRedis
   class Database
@@ -24,6 +25,7 @@ class MockRedis
     include UtilityMethods
     include GeospatialMethods
     include StreamMethods
+    include ConnectionMethod
 
     attr_reader :data, :expire_times
 

data/lib/mock_redis/expire_wrapper.rb

@@ -12,7 +12,7 @@ class MockRedis
       @db = db
     end
 
-    def method_missing(method, *args, &block)
+    ruby2_keywords def method_missing(method, *args, &block)
       @db.expire_keys
       @db.send(method, *args, &block)
     end

data/lib/mock_redis/geospatial_methods.rb

@@ -12,7 +12,7 @@ class MockRedis
     D_R = Math::PI / 180.0
     EARTH_RADIUS_IN_METERS = 6_372_797.560856
 
-    def geoadd(key, *args)
+    ruby2_keywords def geoadd(key, *args)
       points = parse_points(args)
 
       scored_points = points.map do |point|

data/lib/mock_redis/multi_db_wrapper.rb

@@ -17,7 +17,7 @@ class MockRedis
       super || current_db.respond_to?(method, include_private)
     end
 
-    def method_missing(method, *args, &block)
+    ruby2_keywords def method_missing(method, *args, &block)
       current_db.send(method, *args, &block)
     end
 

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,13 +31,6 @@ class MockRedis
             @timestamp = id
           end
           @sequence = @sequence.nil? ? sequence : @sequence.to_i
-          if @timestamp == 0 && @sequence == 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
           if self <= min
             raise Redis::CommandError,
                   'ERR The ID specified in XADD is equal or smaller than ' \

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

@@ -93,6 +93,7 @@ class MockRedis
     def getbit(key, offset)
       assert_stringy(key)
 
+      offset = offset.to_i
       offset_of_byte = offset / 8
       offset_within_byte = offset % 8
 
@@ -154,9 +155,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
@@ -200,18 +202,19 @@ 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 nx
         if exists?(key)
           return false
         else
           return_true = true
         end
       end
-      if options.delete(:xx)
+      if xx
         if exists?(key)
           return_true = true
         else
@@ -220,27 +223,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
-        pexpire(key, duration)
-      end
-      unless options.empty?
-        raise ArgumentError, "unknown keyword: #{options.keys[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')
@@ -248,6 +248,7 @@ class MockRedis
 
       str = data[key] || ''
 
+      offset = offset.to_i
       offset_of_byte = offset / 8
       offset_within_byte = offset % 8
 

data/lib/mock_redis/transaction_wrapper.rb

@@ -15,7 +15,7 @@ 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], block)
         @transaction_futures << future

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.24.0'
+  VERSION = '0.27.2'
 end

data/mock_redis.gemspec

@@ -23,6 +23,8 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.4'
 
+  s.add_runtime_dependency 'ruby2_keywords'
+
   s.add_development_dependency 'redis', '~> 4.2.0'
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'rspec-its', '~> 1.0'

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

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe '#set(key, value)' do
+  let(:key) { 'mock-redis-test' }
+
   it "responds with 'OK'" do
     @redises.set('mock-redis-test', 1).should == 'OK'
   end
@@ -19,26 +21,72 @@ describe '#set(key, value)' do
     end
 
     it 'accepts NX' do
-      key = 'mock-redis-test'
       @redises.del(key)
       @redises.set(key, 1, nx: true).should == true
       @redises.set(key, 1, nx: true).should == false
     end
 
     it 'accepts XX' do
-      key = 'mock-redis-test'
       @redises.del(key)
       @redises.set(key, 1, xx: true).should == false
       @redises.set(key, 1).should == 'OK'
       @redises.set(key, 1, xx: true).should == true
     end
 
+    it 'sets the ttl to -1' do
+      @redises.set(key, 1)
+      expect(@redises.ttl(key)).to eq(-1)
+    end
+
+    context 'with an expiry time' do
+      before :each do
+        Timecop.freeze
+        @redises.set(key, 1, ex: 90)
+      end
+
+      after :each do
+        @redises.del(key)
+        Timecop.return
+      end
+
+      it 'has the TTL set' do
+        expect(@redises.ttl(key)).to eq 90
+      end
+
+      it 'resets the TTL without keepttl' do
+        expect do
+          @redises.set(key, 2)
+        end.to change { @redises.ttl(key) }.from(90).to(-1)
+      end
+
+      it 'does not change the TTL with keepttl: true' do
+        expect do
+          @redises.set(key, 2, keepttl: true)
+        end.not_to change { @redises.ttl(key) }.from(90)
+      end
+    end
+
+    it 'accepts KEEPTTL' do
+      expect(@redises.set(key, 1, keepttl: true)).to eq 'OK'
+    end
+
+    it 'does not set TTL without ex' do
+      @redises.set(key, 1)
+      expect(@redises.ttl(key)).to eq(-1)
+    end
+
+    it 'sets the TTL' do
+      Timecop.freeze do
+        @redises.set(key, 1, ex: 90)
+        expect(@redises.ttl(key)).to eq 90
+      end
+    end
+
     it 'raises on unknown options' do
-      key = 'mock-redis-test'
       @redises.del(key)
       expect do
         @redises.set(key, 1, logger: :something)
-      end.to raise_error(ArgumentError, 'unknown keyword: logger')
+      end.to raise_error(ArgumentError, /unknown keyword/)
     end
 
     context '[mock only]' do
@@ -52,7 +100,6 @@ describe '#set(key, value)' do
       end
 
       it 'accepts EX seconds' do
-        key = 'mock-redis-test'
         @mock.set(key, 1, ex: 1).should == 'OK'
         @mock.get(key).should_not be_nil
         Time.stub(:now).and_return(@now + 2)
@@ -60,7 +107,6 @@ describe '#set(key, value)' do
       end
 
       it 'accepts PX milliseconds' do
-        key = 'mock-redis-test'
         @mock.set(key, 1, px: 500).should == 'OK'
         @mock.get(key).should_not be_nil
         Time.stub(:now).and_return(@now + 300 / 1000.to_f)

data/spec/commands/xadd_spec.rb

@@ -7,11 +7,14 @@ describe '#xadd("mystream", { f1: "v1", f2: "v2" }, id: "0-0", maxlen: 1000, app
   end
 
   before :each do
-    @redises._gsub(/\d{3}-\d/, '...-.')
+    # 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 an id based on the timestamp' do
     t = Time.now.to_i
+    id = @redises.xadd(@key, key: 'value')
     expect(@redises.xadd(@key, key: 'value')).to match(/#{t}\d{3}-0/)
   end
 
@@ -52,10 +55,7 @@ describe '#xadd("mystream", { f1: "v1", f2: "v2" }, id: "0-0", maxlen: 1000, app
     expect { @redises.xadd('mock-redis-test:unknown-stream', { key: 'value' }, id: '0') }
       .to raise_error(
         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'
+        'ERR The ID specified in XADD must be greater than 0-0'
       )
   end
 
@@ -101,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/xlen_spec.rb

@@ -7,7 +7,9 @@ describe '#xlen(key)' do
   end
 
   before :each do
-    @redises._gsub(/\d{3}-\d/, '...-.')
+    # 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 items in the stream' do

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,66 @@
+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
+
+  it 'supports the block parameter' do
+    @redises.xadd(@key, { key: 'value' }, id: '1234567891234-0')
+    expect(@redises.xread(@key, '0-0', block: 1000))
+      .to eq({ @key => [['1234567891234-0', { 'key' => 'value' }]] })
+  end
+
+  it 'limits results with count' do
+    @redises.xadd(@key, { key: 'value' }, id: '1234567891234-0')
+    @redises.xadd(@key, { key: 'value' }, id: '1234567891234-1')
+    @redises.xadd(@key, { key: 'value' }, id: '1234567891234-2')
+    expect(@redises.xread(@key, '0-0', count: 1))
+      .to eq({ @key => [['1234567891234-0', { 'key' => 'value' }]] })
+    expect(@redises.xread(@key, '1234567891234-0', count: 1))
+      .to eq({ @key => [['1234567891234-1', { 'key' => 'value' }]] })
+  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/spec_helper.rb

@@ -11,6 +11,7 @@ end
 require 'rspec/its'
 require 'redis'
 $LOAD_PATH.unshift(File.expand_path(File.join(__FILE__, '..', '..', 'lib')))
+require 'ruby2_keywords'
 require 'mock_redis'
 require 'timecop'
 
@@ -40,8 +41,6 @@ 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

@@ -23,7 +23,7 @@ class RedisMultiplexer < BlankSlate
     @gsub_from = @gsub_to = ''
   end
 
-  def method_missing(method, *args, &blk)
+  ruby2_keywords def method_missing(method, *args, &blk)
     # If we're in a Redis command that accepts a block, and we execute more
     # redis commands, ONLY execute them on the Redis implementation that the
     # block came from.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mock_redis
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.27.2
 platform: ruby
 authors:
 - Shane da Silva
@@ -9,8 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-18 00:00:00.000000000 Z
+date: 2021-01-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: ruby2_keywords
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -90,6 +104,7 @@ files:
 - Rakefile
 - lib/mock_redis.rb
 - lib/mock_redis/assertions.rb
+- lib/mock_redis/connection_method.rb
 - lib/mock_redis/database.rb
 - lib/mock_redis/exceptions.rb
 - lib/mock_redis/expire_wrapper.rb
@@ -126,6 +141,7 @@ files:
 - spec/commands/brpop_spec.rb
 - spec/commands/brpoplpush_spec.rb
 - spec/commands/connected_spec.rb
+- spec/commands/connection_spec.rb
 - spec/commands/dbsize_spec.rb
 - spec/commands/decr_spec.rb
 - spec/commands/decrby_spec.rb
@@ -241,6 +257,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
@@ -293,7 +310,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.1
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Redis mock that just lives in memory; useful for testing.
@@ -310,6 +327,7 @@ test_files:
 - spec/commands/brpop_spec.rb
 - spec/commands/brpoplpush_spec.rb
 - spec/commands/connected_spec.rb
+- spec/commands/connection_spec.rb
 - spec/commands/dbsize_spec.rb
 - spec/commands/decr_spec.rb
 - spec/commands/decrby_spec.rb
@@ -425,6 +443,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