mock_redis 0.29.0 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2607bfdcb34be30d5f98395241f578ca9980f73b1d2f1ac37fa3a1baa736ba1
-  data.tar.gz: 7b4c15ece6a897bfa29c86512f9364b73b03eed78dc4764e4c542a056ec5c472
+  metadata.gz: 15bcc9fb58837462df30acd61176547493ce217061459f2c73e134f8ce15c5ab
+  data.tar.gz: 46df9da818b1b4cdf817a2d8700d6321c182934379974aaa21393bd588b6ab04
 SHA512:
-  metadata.gz: 28d6b6302b703e48245d3bb0e2511d446c5a58bd3620eabbfa806f1c58835b48ac4f2082961a8e1110fca1b1246cc1b9c06cb590d8e8eb53facb2716e98fec9f
-  data.tar.gz: 2d749de988854e1bb5ff64e38f596d1f0efa508e2e78ab90980f86d217e791be617851bc0aaa8593a0497c233258256544e95fe86bc50ff784140a6a63b83e9b
+  metadata.gz: 7322c682d6b702f98afcfd42aac3fe7c6676d63e064d977ddbbfdbaf0f40bca96cd88636e7fd43384dc00455e4421f56555342aabe5707af28ea084587060db9
+  data.tar.gz: 36fa3abf3f2eef55e305a79ea6010edf90ba561e89b10466942f4f8f587c82cb400d97dae0cd330ff8bb73a494cff5171a8b3ab09485cdf76ae0804e9d1af0bb

data/.github/workflows/lint.yml

@@ -0,0 +1,31 @@
+name: Lint
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  overcommit:
+    timeout-minutes: 10
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1.97.0
+        with:
+          ruby-version: 2.7
+
+      - name: Install dependencies
+        run: bundle install
+
+      - name: Prepare environment
+        run: |
+          git config --local user.email "gh-actions@example.com"
+          git config --local user.name "GitHub Actions"
+          bundle exec overcommit --sign
+
+      - name: Run pre-commit checks
+        run: bundle exec overcommit --run

data/.github/workflows/tests.yml

@@ -0,0 +1,45 @@
+name: Tests
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  rspec:
+    timeout-minutes: 10
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby-version:
+          - '2.6'
+          - '2.7'
+          - '3.0'
+        redis-version:
+          - '6.2'
+
+    services:
+      redis:
+          image: redis:${{ matrix.redis-version }}-alpine
+          options: >-
+            --health-cmd "redis-cli ping"
+            --health-interval 10s
+            --health-timeout 5s
+            --health-retries 5
+          ports:
+            - 6379:6379
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Ruby ${{ matrix.ruby-version }}
+        uses: ruby/setup-ruby@v1.97.0
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+
+      - name: Install dependencies
+        run: bundle install
+
+      - name: Run tests
+        run: bundle exec rspec

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # MockRedis Changelog
 
+### 0.30.0
+
+* Drop support for Ruby 2.4 and Ruby 2.5 since they are EOL
+* Fix `expire` to to raise error on invalid integer
+
 ### 0.29.0
 
 * Add support for `logger` option ([#211](https://github.com/sds/mock_redis/pull/211))

data/README.md

@@ -10,9 +10,9 @@ for use in tests.
 
 ## Requirements
 
-* Ruby 2.4+
+Ruby 2.6+
 
-The current implementation is tested against **Redis 6**. Older versions may work, but can also return different results or not support some commands.
+The current implementation is tested against Redis 6.2. Older versions may work, but can also return different results or not support some commands.
 
 ## Getting Started
 

data/lib/mock_redis/database.rb

@@ -86,27 +86,27 @@ class MockRedis
     end
 
     def expire(key, seconds)
+      assert_valid_integer(seconds)
+
       pexpire(key, seconds.to_i * 1000)
     end
 
     def pexpire(key, ms)
+      assert_valid_integer(ms)
+
       now, miliseconds = @base.now
       now_ms = (now * 1000) + miliseconds
       pexpireat(key, now_ms + ms.to_i)
     end
 
     def expireat(key, timestamp)
-      unless looks_like_integer?(timestamp.to_s)
-        raise Redis::CommandError, 'ERR value is not an integer or out of range'
-      end
+      assert_valid_integer(timestamp)
 
       pexpireat(key, timestamp.to_i * 1000)
     end
 
     def pexpireat(key, timestamp_ms)
-      unless looks_like_integer?(timestamp_ms.to_s)
-        raise Redis::CommandError, 'ERR value is not an integer or out of range'
-      end
+      assert_valid_integer(timestamp_ms)
 
       if exists?(key)
         timestamp = Rational(timestamp_ms.to_i, 1000)
@@ -280,6 +280,13 @@ class MockRedis
 
     private
 
+    def assert_valid_integer(integer)
+      unless looks_like_integer?(integer.to_s)
+        raise Redis::CommandError, 'ERR value is not an integer or out of range'
+      end
+      integer
+    end
+
     def assert_valid_timeout(timeout)
       if !looks_like_integer?(timeout.to_s)
         raise Redis::CommandError, 'ERR timeout is not an integer or out of range'

data/lib/mock_redis/stream.rb

@@ -49,15 +49,15 @@ class MockRedis
       opts = options opts_in, ['count']
       start_id = MockRedis::Stream::Id.new(start)
       finish_id = MockRedis::Stream::Id.new(finish, sequence: Float::INFINITY)
-      if start_id.exclusive
-        items = members
-                .select { |m| (start_id < m[0]) && (finish_id >= m[0]) }
-                .map { |m| [m[0].to_s, m[1]] }
-      else
-        items = members
-                .select { |m| (start_id <= m[0]) && (finish_id >= m[0]) }
-                .map { |m| [m[0].to_s, m[1]] }
-      end
+      items = if start_id.exclusive
+                members
+                  .select { |m| (start_id < m[0]) && (finish_id >= m[0]) }
+                  .map { |m| [m[0].to_s, m[1]] }
+              else
+                members
+                  .select { |m| (start_id <= m[0]) && (finish_id >= m[0]) }
+                  .map { |m| [m[0].to_s, m[1]] }
+              end
       items.reverse! if reversed
       return items.first(opts['count'].to_i) if opts.key?('count')
       items

data/lib/mock_redis/version.rb

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

data/lib/mock_redis.rb

@@ -167,7 +167,9 @@ class MockRedis
       t1 = Time.now
       yield
     ensure
-      logger.debug("[MockRedis] call_time=%0.2f ms" % ((Time.now - t1) * 1000)) if t1
+      if t1
+        logger.debug(format('[MockRedis] call_time=%<time>0.2f ms', time: ((Time.now - t1) * 1000)))
+      end
     end
   end
 end

data/spec/commands/hset_spec.rb

@@ -35,7 +35,7 @@ describe '#hset(key, field)' do
   end
 
   it 'stores fields sent in a hash' do
-    @redises.hset(@key, {'k1' => 'v1', 'k2' => 'v2'}).should == 2
+    @redises.hset(@key, { 'k1' => 'v1', 'k2' => 'v2' }).should == 2
   end
 
   it_should_behave_like 'a hash-only command'

data/spec/commands/xadd_spec.rb

@@ -15,7 +15,7 @@ describe '#xadd("mystream", { f1: "v1", f2: "v2" }, id: "0-0", maxlen: 1000, app
   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/)
+    expect(id).to match(/#{t}\d{3}-0/)
   end
 
   it 'adds data with symbols' do

data/spec/mock_redis_spec.rb

@@ -87,7 +87,7 @@ describe MockRedis do
       logger = double('Logger', debug?: true, debug: nil)
       mock_redis = MockRedis.new(logger: logger)
       expect(logger).to receive(:debug).with(/command=HMGET args="hash" "key1" "key2"/)
-      mock_redis.hmget("hash", "key1", "key2")
+      mock_redis.hmget('hash', 'key1', 'key2')
     end
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: mock_redis
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.30.0
 platform: ruby
 authors:
 - Shane da Silva
 - Samuel Merritt
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-12 00:00:00.000000000 Z
+date: 2022-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby2_keywords
@@ -89,6 +89,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/lint.yml"
+- ".github/workflows/tests.yml"
 - ".gitignore"
 - ".mailmap"
 - ".overcommit.yml"
@@ -96,7 +98,6 @@ files:
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".simplecov"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.md
@@ -295,7 +296,7 @@ homepage: https://github.com/sds/mock_redis
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -310,8 +311,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Redis mock that just lives in memory; useful for testing.
 test_files:

data/.travis.yml

@@ -1,33 +0,0 @@
-language: ruby
-
-cache: bundler
-
-addons:
-  apt:
-    packages:
-      - redis-server
-
-services:
-  - redis-server
-
-before_install:
-  - sudo sed -e 's/^bind.*/bind 127.0.0.1/' /etc/redis/redis.conf > redis.conf
-  - sudo mv redis.conf /etc/redis
-  - sudo service redis-server start
-  - echo PING | nc localhost 6379
-
-rvm:
-  - 2.4
-  - 2.5
-  - 2.6
-  - 2.7
-
-before_script:
-  - git config --local user.email "travis@travis.ci"
-  - git config --local user.name "Travis CI"
-
-script:
-  - redis-cli --version
-  - bundle exec rspec
-  - bundle exec overcommit --sign
-  - bundle exec overcommit --run