mock_redis 0.30.0 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15bcc9fb58837462df30acd61176547493ce217061459f2c73e134f8ce15c5ab
-  data.tar.gz: 46df9da818b1b4cdf817a2d8700d6321c182934379974aaa21393bd588b6ab04
+  metadata.gz: 764d3b747c037b933788f2d4ef01e581ecb509aa8c3e445d12c27d199d2273fe
+  data.tar.gz: 9093a8b7601c57e746dd38d7708c52474df56247ea0910ca4d8d7bcecca9506e
 SHA512:
-  metadata.gz: 7322c682d6b702f98afcfd42aac3fe7c6676d63e064d977ddbbfdbaf0f40bca96cd88636e7fd43384dc00455e4421f56555342aabe5707af28ea084587060db9
-  data.tar.gz: 36fa3abf3f2eef55e305a79ea6010edf90ba561e89b10466942f4f8f587c82cb400d97dae0cd330ff8bb73a494cff5171a8b3ab09485cdf76ae0804e9d1af0bb
+  metadata.gz: c7ef20dba317c18d0ab4de7d5d0a87107512cb2398c7d9c549a603a1980fbced844c7b98c547db32fb905a32ed68cdfa25ba9331b03a91512c8c1d1f6d45551a
+  data.tar.gz: 29570271c68cf37d7fd09c065cdad79e1ac64e9b1aa3bdb28dbf0d2080983cc758ad4632e13ad132d492dc823afef8dd7a7a9cec14dfbefb6a7e49a840c74c8c

data/.github/workflows/tests.yml

@@ -43,3 +43,21 @@ jobs:
 
       - name: Run tests
         run: bundle exec rspec
+
+      - name: Code coverage reporting
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.github_token }}
+          flag-name: ruby${{ matrix.ruby-version }}-${{ matrix.redis-version }}
+          parallel: true
+
+  finish:
+    needs: rspec
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Finalize code coverage report
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.github_token }}
+          parallel-finished: true

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # MockRedis Changelog
 
+### 0.33.0
+
+* Add support for `GET` argument to `SET` command
+
+### 0.32.0
+
+* Add support for `psetex`
+
+### 0.31.0
+
+* Allow `ping` to take argument
+* Raise `CommandError` on `hmget` with empty list of fields
+
 ### 0.30.0
 
 * Drop support for Ruby 2.4 and Ruby 2.5 since they are EOL

data/Gemfile

@@ -9,4 +9,5 @@ gem 'overcommit', '0.53.0'
 # Pin tool versions (which are executed by Overcommit) for Travis builds
 gem 'rubocop', '0.82.0'
 
-gem 'coveralls', require: false
+gem 'simplecov', '~> 0.21.0'
+gem 'simplecov-lcov', '~> 0.8.0'

data/README.md

@@ -1,7 +1,7 @@
 # MockRedis
 
 [![Gem Version](https://badge.fury.io/rb/mock_redis.svg)](http://badge.fury.io/rb/mock_redis)
-[![Build Status](https://travis-ci.org/sds/mock_redis.svg)](https://travis-ci.org/sds/mock_redis)
+![Build Status](https://github.com/sds/mock_redis/actions/workflows/tests.yml/badge.svg)
 [![Coverage Status](https://coveralls.io/repos/sds/mock_redis/badge.svg)](https://coveralls.io/r/sds/mock_redis)
 
 MockRedis provides the same interface as `redis-rb`, but it stores its

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] }.
@@ -178,8 +178,8 @@ class MockRedis
       end
     end
 
-    def ping
-      'PONG'
+    def ping(response = 'PONG')
+      response
     end
 
     def quit

data/lib/mock_redis/hash_methods.rb

@@ -75,8 +75,10 @@ class MockRedis
     end
 
     def hmget(key, *fields)
+      fields.flatten!
+
       assert_has_args(fields, 'hmget')
-      fields.flatten.map { |f| hget(key, f) }
+      fields.map { |f| hget(key, f) }
     end
 
     def mapped_hmget(key, *fields)

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
 
@@ -328,6 +334,16 @@ class MockRedis
       end
     end
 
+    def psetex(key, milliseconds, value)
+      if milliseconds <= 0
+        raise Redis::CommandError, 'ERR invalid expire time in psetex'
+      else
+        set(key, value)
+        pexpire(key, milliseconds)
+        'OK'
+      end
+    end
+
     def setnx(key, value)
       if exists?(key)
         false

data/lib/mock_redis/version.rb

@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 class MockRedis
-  VERSION = '0.30.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/expire_spec.rb

@@ -21,7 +21,7 @@ describe '#expire(key, seconds)' do
 
   it 'raises an error if seconds is bogus' do
     lambda do
-      @redises.expireat(@key, 'a couple minutes or so')
+      @redises.expire(@key, 'a couple minutes or so')
     end.should raise_error(Redis::CommandError)
   end
 

data/spec/commands/hmget_spec.rb

@@ -36,5 +36,11 @@ describe '#hmget(key, field [, field, ...])' do
     end.should raise_error(Redis::CommandError)
   end
 
+  it 'raises an error if given an empty list of fields' do
+    lambda do
+      @redises.hmget(@key, [])
+    end.should raise_error(Redis::CommandError)
+  end
+
   it_should_behave_like 'a hash-only command'
 end

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

@@ -21,7 +21,7 @@ describe '#pexpire(key, ms)' do
 
   it 'raises an error if ms is bogus' do
     lambda do
-      @redises.pexpireat(@key, 'a couple minutes or so')
+      @redises.pexpire(@key, 'a couple minutes or so')
     end.should raise_error(Redis::CommandError)
   end
 

data/spec/commands/ping_spec.rb

@@ -1,7 +1,11 @@
 require 'spec_helper'
 
 describe '#ping' do
-  it "returns 'PONG'" do
+  it 'returns "PONG" with no arguments' do
     @redises.ping.should == 'PONG'
   end
+
+  it 'returns the argument' do
+    @redises.ping('HELLO').should == 'HELLO'
+  end
 end

data/spec/commands/psetex_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe '#psetex(key, miliseconds, value)' do
+  before { @key = 'mock-redis-test:setex' }
+
+  it "responds with 'OK'" do
+    @redises.psetex(@key, 10, 'value').should == 'OK'
+  end
+
+  it 'sets the value' do
+    @redises.psetex(@key, 10_000, 'value')
+    @redises.get(@key).should == 'value'
+  end
+
+  it 'sets the expiration time' do
+    @redises.psetex(@key, 10_000, 'value')
+
+    # no guarantee these are the same
+    @redises.real.ttl(@key).should > 0
+    @redises.mock.ttl(@key).should > 0
+  end
+
+  it 'converts time correctly' do
+    @redises.psetex(@key, 10_000_000, 'value')
+
+    @redises.mock.ttl(@key).should > 9_000
+  end
+
+  context 'when expiration time is zero' do
+    it 'raises Redis::CommandError' do
+      expect do
+        @redises.psetex(@key, 0, 'value')
+      end.to raise_error(Redis::CommandError, 'ERR invalid expire time in psetex')
+    end
+  end
+
+  context 'when expiration time is negative' do
+    it 'raises Redis::CommandError' do
+      expect do
+        @redises.psetex(@key, -2, 'value')
+      end.to raise_error(Redis::CommandError, 'ERR invalid expire time in psetex')
+    end
+  end
+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

@@ -1,11 +1,17 @@
-if ENV['TRAVIS']
-  # When running in Travis, report coverage stats to Coveralls.
-  require 'coveralls'
-  Coveralls.wear!
-else
-  # Otherwise render coverage information in coverage/index.html and display
-  # coverage percentage in the console.
-  require 'simplecov'
+require 'simplecov'
+SimpleCov.start do
+  add_filter 'spec/'
+
+  if ENV['CI']
+    require 'simplecov-lcov'
+
+    SimpleCov::Formatter::LcovFormatter.config do |c|
+      c.report_with_single_file = true
+      c.single_report_path = 'coverage/lcov.info'
+    end
+
+    formatter SimpleCov::Formatter::LcovFormatter
+  end
 end
 
 require 'rspec/its'
@@ -56,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.30.0
+  version: 0.33.0
 platform: ruby
 authors:
 - Shane da Silva
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-17 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
@@ -211,6 +211,7 @@ files:
 - spec/commands/pexpireat_spec.rb
 - spec/commands/ping_spec.rb
 - spec/commands/pipelined_spec.rb
+- spec/commands/psetex_spec.rb
 - spec/commands/pttl_spec.rb
 - spec/commands/quit_spec.rb
 - spec/commands/randomkey_spec.rb
@@ -397,6 +398,7 @@ test_files:
 - spec/commands/pexpireat_spec.rb
 - spec/commands/ping_spec.rb
 - spec/commands/pipelined_spec.rb
+- spec/commands/psetex_spec.rb
 - spec/commands/pttl_spec.rb
 - spec/commands/quit_spec.rb
 - spec/commands/randomkey_spec.rb