mock_redis 0.19.0 → 0.24.0

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

@@ -49,23 +49,21 @@ describe MockRedis do
     end
 
     describe '.now' do
-      let(:now)       { 'Now' }
-      let(:time_stub) { double 'Time', :now => now }
+      let(:time_stub) { double 'Time', :now => Time.new(2019, 1, 2, 3, 4, 6, '+00:00') }
       let(:options)   { { :time_class => time_stub } }
 
       subject { MockRedis.new(options) }
 
-      its(:now) { should == now }
+      its(:now) { should == [1_546_398_246, 0] }
     end
 
     describe '.time' do
-      let(:now)       { 'Now' }
-      let(:time_stub) { double 'Time', :now => now }
+      let(:time_stub) { double 'Time', :now => Time.new(2019, 1, 2, 3, 4, 6, '+00:00') }
       let(:options)   { { :time_class => time_stub } }
 
       subject { MockRedis.new(options) }
 
-      its(:time) { should == now }
+      its(:time) { should == [1_546_398_246, 0] }
     end
 
     describe '.expireat' do

data/spec/spec_helper.rb

@@ -12,9 +12,10 @@ require 'rspec/its'
 require 'redis'
 $LOAD_PATH.unshift(File.expand_path(File.join(__FILE__, '..', '..', 'lib')))
 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)
@@ -26,7 +27,7 @@ module TypeCheckingHelper
   end
 
   def args_for_method(method)
-    return [] if method.to_s == 'spop'
+    return [] if %w[spop zpopmin zpopmax].include?(method.to_s)
     method_arity = @redises.real.method(method).arity
     if method_arity < 0 # -1 comes from def foo(*args)
       [1, 2] # probably good enough
@@ -39,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|
@@ -59,5 +62,6 @@ RSpec.configure do |config|
         @redises.send_without_checking(:del, key)
       end
     end
+    @redises._gsub_clear
   end
 end

data/spec/support/redis_multiplexer.rb

@@ -9,7 +9,18 @@ class RedisMultiplexer < BlankSlate
 
   def initialize(*a)
     @mock_redis = MockRedis.new(*a)
+    Redis.exists_returns_integer = true
     @real_redis = Redis.new(*a)
+    _gsub_clear
+  end
+
+  def _gsub(from, to)
+    @gsub_from = from
+    @gsub_to = to
+  end
+
+  def _gsub_clear
+    @gsub_from = @gsub_to = ''
   end
 
   def method_missing(method, *args, &blk)
@@ -71,8 +82,10 @@ class RedisMultiplexer < BlankSlate
   def equalish?(a, b)
     if a == b
       true
+    elsif a.is_a?(String) && b.is_a?(String)
+      masked(a) == masked(b)
     elsif a.is_a?(Array) && b.is_a?(Array)
-      a.collect(&:to_s).sort == b.collect(&:to_s).sort
+      a.collect { |c| masked(c.to_s) }.sort == b.collect { |c| masked(c.to_s) }.sort
     elsif a.is_a?(Exception) && b.is_a?(Exception)
       a.class == b.class && a.message == b.message
     elsif a.is_a?(Float) && b.is_a?(Float)
@@ -83,6 +96,10 @@ class RedisMultiplexer < BlankSlate
     end
   end
 
+  def masked(str)
+    str.gsub(@gsub_from, @gsub_to)
+  end
+
   def mock
     @mock_redis
   end

data/spec/support/shared_examples/does_not_cleanup_empty_strings.rb

@@ -0,0 +1,14 @@
+shared_examples_for 'does not remove empty strings on error' do
+  it 'does not remove empty strings on error' do |example|
+    key = 'mock-redis-test:not-a-string'
+
+    method = method_from_description(example)
+    args = args_for_method(method).unshift(key)
+
+    @redises.set(key, '')
+    lambda do
+      @redises.send(method, *args)
+    end.should raise_error(RuntimeError)
+    @redises.get(key).should == ''
+  end
+end

data/spec/support/shared_examples/only_operates_on_hashes.rb

@@ -10,4 +10,6 @@ shared_examples_for 'a hash-only command' do
       @redises.send(method, *args)
     end.should raise_error(RuntimeError)
   end
+
+  it_should_behave_like 'does not remove empty strings on error'
 end

data/spec/support/shared_examples/only_operates_on_lists.rb

@@ -10,4 +10,6 @@ shared_examples_for 'a list-only command' do
       @redises.send(method, *args)
     end.should raise_error(RuntimeError)
   end
+
+  it_should_behave_like 'does not remove empty strings on error'
 end

data/spec/support/shared_examples/only_operates_on_sets.rb

@@ -10,4 +10,6 @@ shared_examples_for 'a set-only command' do
       @redises.send(method, *args)
     end.should raise_error(RuntimeError)
   end
+
+  it_should_behave_like 'does not remove empty strings on error'
 end

data/spec/support/shared_examples/only_operates_on_zsets.rb

@@ -10,6 +10,8 @@ shared_examples_for 'a zset-only command' do
       @redises.send(method, *args)
     end.should raise_error(RuntimeError)
   end
+
+  it_should_behave_like 'does not remove empty strings on error'
 end
 
 shared_examples_for 'arg 1 is a score' do

data/spec/transactions_spec.rb

@@ -10,11 +10,11 @@ describe 'transactions (multi/exec/discard)' do
       @redises.multi.should == 'OK'
     end
 
-    it 'forbids nesting' do
+    it 'does not permit nesting' do
       @redises.multi
       lambda do
         @redises.multi
-      end.should raise_error(Redis::CommandError)
+      end.should raise_error(Redis::CommandError, 'ERR MULTI calls can not be nested')
     end
 
     it 'cleans state of transaction wrapper if exception occurs during transaction' do
@@ -41,18 +41,18 @@ describe 'transactions (multi/exec/discard)' do
         r.set('test', 1)
         r.incr('counter')
       end
-      @redises.get('counter').should == '6'
-      @redises.get('test').should == '1'
+      @redises.get('counter').should eq '6'
+      @redises.get('test').should eq '1'
     end
 
-    it 'forbids nesting via blocks' do
+    it 'permits nesting via blocks' do
       # Have to use only the mock here. redis-rb has a bug in it where
       # nested #multi calls raise NoMethodError because it gets a nil
       # where it's not expecting one.
       @redises.mock.multi do |r|
         lambda do
           r.multi {}
-        end.should raise_error(Redis::CommandError)
+        end.should_not raise_error
       end
     end
 
@@ -64,27 +64,31 @@ describe 'transactions (multi/exec/discard)' do
           pr.incr('counter')
         end
       end
-      @redises.get('counter').should == '6'
-      @redises.get('test').should == '1'
+      @redises.get('counter').should eq '6'
+      @redises.get('test').should eq '1'
     end
 
-    it 'allows multi blocks within pipelined blocks' do
-      @redises.set('counter', 5)
-      @redises.pipelined do |pr|
-        pr.multi do |r|
-          r.set('test', 1)
-          r.incr('counter')
-        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
-      @redises.get('counter').should == '6'
-      @redises.get('test').should == '1'
+
+      result.value.should eq %w[BAR BAZ]
+      @redises.get('foo').should eq nil
+      @redises.get('fuu').should eq nil
     end
   end
 
   context '#discard' do
     it "responds with 'OK' after #multi" do
       @redises.multi
-      @redises.discard.should == 'OK'
+      @redises.discard.should eq 'OK'
     end
 
     it "can't be run outside of #multi/#exec" do
@@ -110,8 +114,8 @@ describe 'transactions (multi/exec/discard)' do
     end
 
     it "makes commands respond with 'QUEUED'" do
-      @redises.set(@string, 'string').should == 'QUEUED'
-      @redises.lpush(@list, 'list').should == 'QUEUED'
+      @redises.set(@string, 'string').should eq 'QUEUED'
+      @redises.lpush(@list, 'list').should eq 'QUEUED'
     end
 
     it "gives you the commands' responses when you call #exec" do
@@ -119,7 +123,7 @@ describe 'transactions (multi/exec/discard)' do
       @redises.lpush(@list, 'list')
       @redises.lpush(@list, 'list')
 
-      @redises.exec.should == ['OK', 1, 2]
+      @redises.exec.should eq ['OK', 1, 2]
     end
 
     it "does not raise exceptions, but rather puts them in #exec's response" do
@@ -128,9 +132,9 @@ describe 'transactions (multi/exec/discard)' do
       @redises.lpush(@list, 'list')
 
       responses = @redises.exec
-      responses[0].should == 'OK'
+      responses[0].should eq 'OK'
       responses[1].should be_a(Redis::CommandError)
-      responses[2].should == 1
+      responses[2].should eq 1
     end
   end
 
@@ -151,9 +155,9 @@ describe 'transactions (multi/exec/discard)' do
         second_lpush_response = mult.lpush(@list, 'list')
       end
 
-      set_response.value.should == 'OK'
-      lpush_response.value.should == 1
-      second_lpush_response.value.should == 2
+      set_response.value.should eq 'OK'
+      lpush_response.value.should eq 1
+      second_lpush_response.value.should eq 2
     end
   end
 end

metadata

@@ -1,82 +1,76 @@
 --- !ruby/object:Gem::Specification
 name: mock_redis
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.24.0
 platform: ruby
 authors:
-- Brigade Engineering
+- Shane da Silva
 - Samuel Merritt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-03 00:00:00.000000000 Z
+date: 2020-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '10'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: 4.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '10'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rspec-its
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.9.1
 description: Instantiate one with `redis = MockRedis.new` and treat it like you would
   a normal Redis object. It supports all the usual Redis operations.
 email:
-- eng@brigade.com
+- shane@dasilva.io
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -91,7 +85,7 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- LICENSE
+- LICENSE.md
 - README.md
 - Rakefile
 - lib/mock_redis.rb
@@ -109,6 +103,9 @@ files:
 - lib/mock_redis/pipelined_wrapper.rb
 - lib/mock_redis/set_methods.rb
 - lib/mock_redis/sort_method.rb
+- lib/mock_redis/stream.rb
+- lib/mock_redis/stream/id.rb
+- lib/mock_redis/stream_methods.rb
 - lib/mock_redis/string_methods.rb
 - lib/mock_redis/transaction_wrapper.rb
 - lib/mock_redis/undef_redis_methods.rb
@@ -134,6 +131,7 @@ files:
 - 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
@@ -151,7 +149,6 @@ files:
 - spec/commands/getbit_spec.rb
 - spec/commands/getrange_spec.rb
 - spec/commands/getset_spec.rb
-- spec/commands/hash_operator_spec.rb
 - spec/commands/hdel_spec.rb
 - spec/commands/hexists_spec.rb
 - spec/commands/hget_spec.rb
@@ -202,6 +199,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
@@ -240,11 +238,18 @@ files:
 - spec/commands/type_spec.rb
 - spec/commands/unwatch_spec.rb
 - spec/commands/watch_spec.rb
+- spec/commands/xadd_spec.rb
+- spec/commands/xlen_spec.rb
+- spec/commands/xrange_spec.rb
+- spec/commands/xrevrange_spec.rb
+- spec/commands/xtrim_spec.rb
 - spec/commands/zadd_spec.rb
 - spec/commands/zcard_spec.rb
 - spec/commands/zcount_spec.rb
 - spec/commands/zincrby_spec.rb
 - spec/commands/zinterstore_spec.rb
+- spec/commands/zpopmax_spec.rb
+- spec/commands/zpopmin_spec.rb
 - spec/commands/zrange_spec.rb
 - spec/commands/zrangebyscore_spec.rb
 - spec/commands/zrank_spec.rb
@@ -261,6 +266,7 @@ files:
 - spec/mock_redis_spec.rb
 - spec/spec_helper.rb
 - spec/support/redis_multiplexer.rb
+- spec/support/shared_examples/does_not_cleanup_empty_strings.rb
 - spec/support/shared_examples/only_operates_on_hashes.rb
 - spec/support/shared_examples/only_operates_on_lists.rb
 - spec/support/shared_examples/only_operates_on_sets.rb
@@ -268,7 +274,7 @@ files:
 - spec/support/shared_examples/only_operates_on_zsets.rb
 - spec/support/shared_examples/sorts_enumerables.rb
 - spec/transactions_spec.rb
-homepage: https://github.com/brigade/mock_redis
+homepage: https://github.com/sds/mock_redis
 licenses:
 - MIT
 metadata: {}
@@ -280,15 +286,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.1.1
 signing_key: 
 specification_version: 4
 summary: Redis mock that just lives in memory; useful for testing.
@@ -310,6 +315,7 @@ test_files:
 - 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
@@ -327,7 +333,6 @@ test_files:
 - spec/commands/getbit_spec.rb
 - spec/commands/getrange_spec.rb
 - spec/commands/getset_spec.rb
-- spec/commands/hash_operator_spec.rb
 - spec/commands/hdel_spec.rb
 - spec/commands/hexists_spec.rb
 - spec/commands/hget_spec.rb
@@ -378,6 +383,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
@@ -416,11 +422,18 @@ test_files:
 - spec/commands/type_spec.rb
 - spec/commands/unwatch_spec.rb
 - spec/commands/watch_spec.rb
+- spec/commands/xadd_spec.rb
+- spec/commands/xlen_spec.rb
+- spec/commands/xrange_spec.rb
+- spec/commands/xrevrange_spec.rb
+- spec/commands/xtrim_spec.rb
 - spec/commands/zadd_spec.rb
 - spec/commands/zcard_spec.rb
 - spec/commands/zcount_spec.rb
 - spec/commands/zincrby_spec.rb
 - spec/commands/zinterstore_spec.rb
+- spec/commands/zpopmax_spec.rb
+- spec/commands/zpopmin_spec.rb
 - spec/commands/zrange_spec.rb
 - spec/commands/zrangebyscore_spec.rb
 - spec/commands/zrank_spec.rb
@@ -437,6 +450,7 @@ test_files:
 - spec/mock_redis_spec.rb
 - spec/spec_helper.rb
 - spec/support/redis_multiplexer.rb
+- spec/support/shared_examples/does_not_cleanup_empty_strings.rb
 - spec/support/shared_examples/only_operates_on_hashes.rb
 - spec/support/shared_examples/only_operates_on_lists.rb
 - spec/support/shared_examples/only_operates_on_sets.rb