mock_redis 0.22.0 → 0.27.0

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/commands/zinterstore_spec.rb

@@ -42,6 +42,40 @@ describe '#zinterstore(destination, keys, [:weights => [w,w,], [:aggregate => :s
     end.should raise_error(Redis::CommandError)
   end
 
+  context 'when used with a set' do
+    before do
+      @primes_text = 'mock-redis-test:zinterstore:primes-text'
+
+      @redises.sadd(@primes_text, 'two')
+      @redises.sadd(@primes_text, 'three')
+      @redises.sadd(@primes_text, 'five')
+      @redises.sadd(@primes_text, 'seven')
+    end
+
+    it 'returns the number of elements in the new set' do
+      @redises.zinterstore(@dest, [@odds, @primes_text]).should == 3
+    end
+
+    it 'sums the scores, substituting 1.0 for set values' do
+      @redises.zinterstore(@dest, [@odds, @primes_text])
+      @redises.zrange(@dest, 0, -1, :with_scores => true).should ==
+        [['three', 4.0], ['five', 6.0], ['seven', 8.0]]
+    end
+  end
+
+  context 'when used with a non-coercible structure' do
+    before do
+      @non_set = 'mock-redis-test:zinterstore:non-set'
+
+      @redises.set(@non_set, 'one')
+    end
+    it 'raises an error for wrong value type' do
+      lambda do
+        @redises.zinterstore(@dest, [@odds, @non_set])
+      end.should raise_error(Redis::CommandError)
+    end
+  end
+
   context 'the :weights argument' do
     it 'multiplies the scores by the weights while aggregating' do
       @redises.zinterstore(@dest, [@odds, @primes], :weights => [2, 3])

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/commands/zunionstore_spec.rb

@@ -41,6 +41,39 @@ describe '#zunionstore(destination, keys, [:weights => [w,w,], [:aggregate => :s
     end.should raise_error(Redis::CommandError)
   end
 
+  context 'when used with a set' do
+    before do
+      @set4 = 'mock-redis-test:zunionstore4'
+
+      @redises.sadd(@set4, 'two')
+      @redises.sadd(@set4, 'three')
+      @redises.sadd(@set4, 'four')
+    end
+
+    it 'returns the number of elements in the new set' do
+      @redises.zunionstore(@dest, [@set3, @set4]).should == 4
+    end
+
+    it 'sums the scores, substituting 1.0 for set values' do
+      @redises.zunionstore(@dest, [@set3, @set4])
+      @redises.zrange(@dest, 0, -1, :with_scores => true).should ==
+        [['four', 1.0], ['one', 1.0], ['two', 3.0], ['three', 4.0]]
+    end
+  end
+
+  context 'when used with a non-coercible structure' do
+    before do
+      @non_set = 'mock-redis-test:zunionstore4'
+
+      @redises.set(@non_set, 'one')
+    end
+    it 'raises an error for wrong value type' do
+      lambda do
+        @redises.zunionstore(@dest, [@set1, @non_set])
+      end.should raise_error(Redis::CommandError)
+    end
+  end
+
   context 'the :weights argument' do
     it 'multiplies the scores by the weights while aggregating' do
       @redises.zunionstore(@dest, [@set1, @set2, @set3], :weights => [2, 3, 5])

data/spec/spec_helper.rb

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

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
@@ -22,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.

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.22.0
+  version: 0.27.0
 platform: ruby
 authors:
 - Shane da Silva
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-10 00:00:00.000000000 Z
+date: 2021-01-05 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
@@ -90,6 +90,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,11 +127,13 @@ 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
 - spec/commands/del_spec.rb
 - spec/commands/disconnect_spec.rb
+- spec/commands/dump_spec.rb
 - spec/commands/echo_spec.rb
 - spec/commands/eval_spec.rb
 - spec/commands/evalsha_spec.rb
@@ -198,6 +201,7 @@ files:
 - spec/commands/randomkey_spec.rb
 - spec/commands/rename_spec.rb
 - spec/commands/renamenx_spec.rb
+- spec/commands/restore_spec.rb
 - spec/commands/rpop_spec.rb
 - spec/commands/rpoplpush_spec.rb
 - spec/commands/rpush_spec.rb
@@ -239,6 +243,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
@@ -291,7 +296,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Redis mock that just lives in memory; useful for testing.
@@ -308,11 +313,13 @@ 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
 - spec/commands/del_spec.rb
 - spec/commands/disconnect_spec.rb
+- spec/commands/dump_spec.rb
 - spec/commands/echo_spec.rb
 - spec/commands/eval_spec.rb
 - spec/commands/evalsha_spec.rb
@@ -380,6 +387,7 @@ test_files:
 - spec/commands/randomkey_spec.rb
 - spec/commands/rename_spec.rb
 - spec/commands/renamenx_spec.rb
+- spec/commands/restore_spec.rb
 - spec/commands/rpop_spec.rb
 - spec/commands/rpoplpush_spec.rb
 - spec/commands/rpush_spec.rb
@@ -421,6 +429,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