mock_redis 0.32.0 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9f945150c69e6ff81838d4e029f1620ade56e9da6c3cb2ed0550cd61060335a
-  data.tar.gz: fbd58f70dbf78b770a6d3e04351771a1d94a7cac87afbff95213c92bceb16eaa
+  metadata.gz: 764d3b747c037b933788f2d4ef01e581ecb509aa8c3e445d12c27d199d2273fe
+  data.tar.gz: 9093a8b7601c57e746dd38d7708c52474df56247ea0910ca4d8d7bcecca9506e
 SHA512:
-  metadata.gz: 9320958fc6e3360f26317dfcb47747bf8d39d626d54c0297cece31b9521fc4ad991acdccf885428d05f8b82765cfec12a37af4de33473f4106c7e3eb4e9c2b69
-  data.tar.gz: 05c04acff0f82500f114a868ed40aef95fc115e367ed94008075ddd90de5550dd939ca12215ffb3c88021a6aeff18cd3f9ff51dfabcc3f14244b40465d6184f0
+  metadata.gz: c7ef20dba317c18d0ab4de7d5d0a87107512cb2398c7d9c549a603a1980fbced844c7b98c547db32fb905a32ed68cdfa25ba9331b03a91512c8c1d1f6d45551a
+  data.tar.gz: 29570271c68cf37d7fd09c065cdad79e1ac64e9b1aa3bdb28dbf0d2080983cc758ad4632e13ad132d492dc823afef8dd7a7a9cec14dfbefb6a7e49a840c74c8c

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # MockRedis Changelog
 
+### 0.33.0
+
+* Add support for `GET` argument to `SET` command
+
 ### 0.32.0
 
 * Add support for `psetex`

data/lib/mock_redis/database.rb

@@ -71,7 +71,7 @@ class MockRedis
 
     def del(*keys)
       keys = keys.flatten.map(&:to_s)
-      assert_has_args(keys, 'del')
+      # assert_has_args(keys, 'del') # no longer errors in redis > v4.5
 
       keys.
         find_all { |key| data[key] }.

data/lib/mock_redis/string_methods.rb

@@ -206,8 +206,10 @@ class MockRedis
 
     # 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)
+    def set(key, value, ex: nil, px: nil, nx: nil, xx: nil, keepttl: nil, get: nil)
       key = key.to_s
+      retval = self.get(key) if get
+
       return_true = false
       if nx
         if exists?(key)
@@ -240,7 +242,11 @@ class MockRedis
         pexpire(key, px)
       end
 
-      return_true ? true : 'OK'
+      if get
+        retval
+      else
+        return_true ? true : 'OK'
+      end
     end
     # rubocop:enable Metrics/ParameterLists
 

data/lib/mock_redis/version.rb

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

data/mock_redis.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'ruby2_keywords'
 
-  s.add_development_dependency 'redis', '~> 4.2.0'
+  s.add_development_dependency 'redis', '~> 4.5.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/del_spec.rb

@@ -40,7 +40,7 @@ describe '#del(key [, key, ...])' do
   end
 
   it 'raises an error if an empty array is given' do
-    expect { @redises.del [] }.to raise_error Redis::CommandError
+    expect { @redises.del [] }.not_to raise_error Redis::CommandError
   end
 
   it 'removes a stream key' do

data/spec/commands/lpop_spec.rb

@@ -30,5 +30,6 @@ describe '#lpop(key)' do
     @redises.get(@key).should be_nil
   end
 
+  let(:default_error) { RedisMultiplexer::MismatchedResponse }
   it_should_behave_like 'a list-only command'
 end

data/spec/commands/rpop_spec.rb

@@ -30,5 +30,6 @@ describe '#rpop(key)' do
     @redises.get(@key).should be_nil
   end
 
+  let(:default_error) { RedisMultiplexer::MismatchedResponse }
   it_should_behave_like 'a list-only command'
 end

data/spec/commands/set_spec.rb

@@ -33,6 +33,21 @@ describe '#set(key, value)' do
       @redises.set(key, 1, xx: true).should == true
     end
 
+    it 'accepts GET on a string' do
+      @redises.set(key, '1').should == 'OK'
+      @redises.set(key, '2', get: true).should == '1'
+      @redises.set(key, '3', get: true).should == '2'
+    end
+
+    context 'when set key is not a String' do
+      it 'should error with Redis::CommandError' do
+        @redises.lpush(key, '1').should == 1
+        expect do
+          @redises.set(key, '2', get: true)
+        end.to raise_error(Redis::CommandError)
+      end
+    end
+
     it 'sets the ttl to -1' do
       @redises.set(key, 1)
       expect(@redises.ttl(key)).to eq(-1)

data/spec/spec_helper.rb

@@ -62,7 +62,10 @@ RSpec.configure do |config|
     # databases mentioned in our tests
     [1, 0].each do |db|
       @redises.send_without_checking(:select, db)
-      @redises.send_without_checking(:keys, 'mock-redis-test:*').each do |key|
+      keys = @redises.send_without_checking(:keys, 'mock-redis-test:*')
+      next unless keys.is_a?(Enumerable)
+
+      keys.each do |key|
         @redises.send_without_checking(:del, key)
       end
     end

data/spec/support/shared_examples/does_not_cleanup_empty_strings.rb

@@ -8,7 +8,7 @@ shared_examples_for 'does not remove empty strings on error' do
     @redises.set(key, '')
     lambda do
       @redises.send(method, *args)
-    end.should raise_error(RuntimeError)
+    end.should raise_error(defined?(default_error) ? default_error : RuntimeError)
     @redises.get(key).should == ''
   end
 end

data/spec/support/shared_examples/only_operates_on_lists.rb

@@ -8,7 +8,7 @@ shared_examples_for 'a list-only command' do
     @redises.set(key, 1)
     lambda do
       @redises.send(method, *args)
-    end.should raise_error(RuntimeError)
+    end.should raise_error(defined?(default_error) ? default_error : RuntimeError)
   end
 
   it_should_behave_like 'does not remove empty strings on error'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mock_redis
 version: !ruby/object:Gem::Version
-  version: 0.32.0
+  version: 0.33.0
 platform: ruby
 authors:
 - Shane da Silva
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-12 00:00:00.000000000 Z
+date: 2022-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby2_keywords
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.5.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement