mock_redis 0.23.0 → 0.27.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd9fd0d5b4ccad106eee03697d49082baa7e34065ff76f67b7e18da9991847a9
-  data.tar.gz: 11f940cdee40f2646c3e6087faac7ac1c70e0aae5eaff7ddfc8839f0fb50e1b6
+  metadata.gz: cbd4308bd9413896742121468e39d64096e55b7760453a4220696aaa0554e38e
+  data.tar.gz: 0f8e0c66ac4533044ad91ee89a383bba1297cc186fdf514c66923a6188024b0c
 SHA512:
-  metadata.gz: 347930a11a59575cd3a4bbc48cb689d46d25b27c6cfbdc28c28b6bfdfa1d833c317dd5ce7566ba016aae7b13b909629d078486bd95dee68f4e7e6b5cfc7e1e44
-  data.tar.gz: 689b8dc84b58c38201bf3220641f467cd56b3ef2d6c4efc12829ec08c3a84f6dbc1e2c8207fdb18808c10bdb71f878cc571d21df2548a9d240881fff8b9ddd68
+  metadata.gz: 6fde8339234a0e1c8022cd63208e8e279cc834ff4280c6690d85a516259f7c29ac36fd3882a433a94af4e4e0bb584a7c332c823cc54db59556b17e7bf42d2f97
+  data.tar.gz: 4f7d508739c4eef78afa8e155d2ec4166f5b5b644f37f846a59f9b555c34bb948d545fca55c3d2c7dae2781fe90c24c7fabb804b3406f97030e8ee4e68eff9f4

data/.rubocop.yml

@@ -3,10 +3,10 @@ inherit_from: .rubocop_todo.yml
 AllCops:
   TargetRubyVersion: 2.4
 
-Layout/AlignArguments:
+Layout/ArgumentAlignment:
   Enabled: false
 
-Layout/AlignParameters:
+Layout/ParameterAlignment:
   Enabled: false
 
 Layout/DotPosition:
@@ -15,9 +15,21 @@ Layout/DotPosition:
 Layout/EmptyLineAfterGuardClause:
   Enabled: false
 
+Layout/LineLength:
+  Max: 100
+
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+
 Lint/AssignmentInCondition:
   Enabled: false
 
+Lint/RaiseException:
+  Enabled: true
+
+Lint/StructNewOverride:
+  Enabled: true
+
 # We use this a lot in specs where it's perfectly valid
 Lint/Void:
   Exclude:
@@ -35,9 +47,6 @@ Metrics/CyclomaticComplexity:
 Metrics/ClassLength:
   Enabled: false
 
-Metrics/LineLength:
-  Max: 100
-
 Metrics/MethodLength:
   Enabled: false
 
@@ -57,6 +66,18 @@ Style/Documentation:
 Style/DoubleNegation:
   Enabled: false
 
+Style/ExponentialNotation:
+  Enabled: true
+
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+
 # We have too much code that relies on modifying strings
 Style/FrozenStringLiteralComment:
   Enabled: false

data/.rubocop_todo.yml

@@ -9,7 +9,7 @@
 # Offense count: 17
 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
 # AllowedNames: io, id, to, by, on, in, at, ip
-Naming/UncommunicativeMethodParamName:
+Naming/MethodParameterName:
   Exclude:
     - 'lib/mock_redis/database.rb'
     - 'lib/mock_redis/expire_wrapper.rb'

data/.travis.yml

@@ -20,6 +20,7 @@ rvm:
   - 2.4
   - 2.5
   - 2.6
+  - 2.7
 
 before_script:
   - git config --local user.email "travis@travis.ci"

data/CHANGELOG.md

@@ -1,5 +1,32 @@
 # MockRedis Changelog
 
+### 0.27.1
+
+* Fix missing `ruby2_keywords` gem
+* Allow passing string `offset` to `getbit` ([#203](https://github.com/sds/mock_redis/pull/203))
+
+### 0.27.0
+
+* Fix handling of keyword arguments on Ruby 3 ([#199](https://github.com/sds/mock_redis/pull/199))
+* Allow passing string `offset` to `setbit` ([#200](https://github.com/sds/mock_redis/pull/200))
+* Add `connection` method ([#201](https://github.com/sds/mock_redis/pull/201))
+
+### 0.26.0
+
+* Add block and count support to `xread` ([#194](https://github.com/sds/mock_redis/pull/194))
+
+### 0.25.0
+
+* Add support for `xread` command ([#190](https://github.com/sds/mock_redis/pull/190))
+* Fix `mget` to raise error when passing empty array ([#191](https://github.com/sds/mock_redis/pull/191))
+* Fix `xadd` when `maxlen` is zero ([#192](https://github.com/sds/mock_redis/pull/192))
+
+### 0.24.0
+
+* Fix handling of blocks within `multi` blocks ([#185](https://github.com/sds/mock_redis/pull/185))
+* Fix handling of multiple consecutive `?` characters in key pattern matching ([#186](https://github.com/sds/mock_redis/pull/186))
+* Change `exists` to return an integer and add `exists?` ([#188](https://github.com/sds/mock_redis/pull/188))
+
 ### 0.23.0
 
 * Raise error when `setex` called with negative timeout ([#174](https://github.com/sds/mock_redis/pull/174))

data/Gemfile

@@ -4,9 +4,9 @@ source 'http://rubygems.org'
 gemspec
 
 # Run all pre-commit hooks via Overcommit during CI runs
-gem 'overcommit', '0.48.0'
+gem 'overcommit', '0.53.0'
 
 # Pin tool versions (which are executed by Overcommit) for Travis builds
-gem 'rubocop', '0.68.1'
+gem 'rubocop', '0.82.0'
 
 gem 'coveralls', require: false

data/lib/mock_redis.rb

@@ -84,7 +84,7 @@ class MockRedis
     super || @db.respond_to?(method, include_private)
   end
 
-  def method_missing(method, *args, &block)
+  ruby2_keywords def method_missing(method, *args, &block)
     @db.send(method, *args, &block)
   end
 

data/lib/mock_redis/connection_method.rb

@@ -0,0 +1,13 @@
+class MockRedis
+  module ConnectionMethod
+    def connection
+      {
+        :host => @base.host,
+        :port => @base.port,
+        :db => @base.db,
+        :id => @base.id,
+        :location => "#{@base.host}:#{@base.port}"
+      }
+    end
+  end
+end

data/lib/mock_redis/database.rb

@@ -11,6 +11,7 @@ require 'mock_redis/info_method'
 require 'mock_redis/utility_methods'
 require 'mock_redis/geospatial_methods'
 require 'mock_redis/stream_methods'
+require 'mock_redis/connection_method'
 
 class MockRedis
   class Database
@@ -24,6 +25,7 @@ class MockRedis
     include UtilityMethods
     include GeospatialMethods
     include StreamMethods
+    include ConnectionMethod
 
     attr_reader :data, :expire_times
 
@@ -35,7 +37,7 @@ class MockRedis
 
     def initialize_copy(_source)
       @data = @data.clone
-      @data.keys.each { |k| @data[k] = @data[k].clone }
+      @data.each_key { |k| @data[k] = @data[k].clone }
       @expire_times = @expire_times.map(&:clone)
     end
 
@@ -106,7 +108,7 @@ class MockRedis
         raise Redis::CommandError, 'ERR value is not an integer or out of range'
       end
 
-      if exists(key)
+      if exists?(key)
         timestamp = Rational(timestamp_ms.to_i, 1000)
         set_expiration(key, @base.time_at(timestamp))
         true
@@ -115,12 +117,17 @@ class MockRedis
       end
     end
 
-    def exists(key)
-      data.key?(key)
+    def exists(*keys)
+      keys.count { |key| data.key?(key) }
+    end
+
+    def exists?(*keys)
+      keys.each { |key| return true if data.key?(key) }
+      false
     end
 
     def flushdb
-      data.keys.each { |k| del(k) }
+      data.each_key { |k| del(k) }
       'OK'
     end
 
@@ -130,7 +137,7 @@ class MockRedis
     end
 
     def restore(key, ttl, value, replace: false)
-      if !replace && exists(key)
+      if !replace && exists?(key)
         raise Redis::CommandError, 'BUSYKEY Target key name already exists.'
       end
       data[key] = Marshal.load(value) # rubocop:disable Security/MarshalLoad
@@ -163,7 +170,7 @@ class MockRedis
     end
 
     def persist(key)
-      if exists(key) && has_expiration?(key)
+      if exists?(key) && has_expiration?(key)
         remove_expiration(key)
         true
       else
@@ -204,7 +211,7 @@ class MockRedis
         raise Redis::CommandError, 'ERR no such key'
       end
 
-      if exists(newkey)
+      if exists?(newkey)
         false
       else
         rename(key, newkey)
@@ -217,7 +224,7 @@ class MockRedis
     end
 
     def ttl(key)
-      if !exists(key)
+      if !exists?(key)
         -2
       elsif has_expiration?(key)
         now, = @base.now
@@ -231,7 +238,7 @@ class MockRedis
       now, miliseconds = @base.now
       now_ms = now * 1000 + miliseconds
 
-      if !exists(key)
+      if !exists?(key)
         -2
       elsif has_expiration?(key)
         (expiration(key).to_r * 1000).to_i - now_ms
@@ -248,7 +255,7 @@ class MockRedis
     alias time now
 
     def type(key)
-      if !exists(key)
+      if !exists?(key)
         'none'
       elsif hashy?(key)
         'hash'
@@ -323,7 +330,7 @@ class MockRedis
       Regexp.new(
         "^#{pattern}$".
         gsub(/([+|()])/, '\\\\\1').
-        gsub(/([^\\])\?/, '\\1.').
+        gsub(/(?<!\\)\?/, '\\1.').
         gsub(/([^\\])\*/, '\\1.*')
       )
     end
@@ -351,8 +358,8 @@ class MockRedis
     # This method isn't private, but it also isn't a Redis command, so
     # it doesn't belong up above with all the Redis commands.
     def expire_keys
-      now, miliseconds = self.now
-      now_ms = now * 1_000 + miliseconds
+      now_sec, miliseconds = now
+      now_ms = now_sec * 1_000 + miliseconds
 
       to_delete = expire_times.take_while do |(time, _key)|
         (time.to_r * 1_000).to_i <= now_ms

data/lib/mock_redis/expire_wrapper.rb

@@ -12,7 +12,7 @@ class MockRedis
       @db = db
     end
 
-    def method_missing(method, *args, &block)
+    ruby2_keywords def method_missing(method, *args, &block)
       @db.expire_keys
       @db.send(method, *args, &block)
     end

data/lib/mock_redis/future.rb

@@ -17,7 +17,7 @@ class MockRedis
 
     def store_result(result)
       @result_set = true
-      @result = result
+      @result = @block ? @block.call(result) : result
     end
   end
 end

data/lib/mock_redis/geospatial_methods.rb

@@ -12,7 +12,7 @@ class MockRedis
     D_R = Math::PI / 180.0
     EARTH_RADIUS_IN_METERS = 6_372_797.560856
 
-    def geoadd(key, *args)
+    ruby2_keywords def geoadd(key, *args)
       points = parse_points(args)
 
       scored_points = points.map do |point|
@@ -38,7 +38,7 @@ class MockRedis
       lng2, lat2 = geohash_decode(hash2)
 
       distance = geohash_distance(lng1, lat1, lng2, lat2) / to_meter
-      format('%.4f', distance)
+      format('%<distance>.4f', distance: distance)
     end
 
     def geohash(key, members)
@@ -95,8 +95,8 @@ class MockRedis
       lat = Float(point[1])
 
       unless LNG_RANGE.include?(lng) && LAT_RANGE.include?(lat)
-        lng = format('%.6f', lng)
-        lat = format('%.6f', lat)
+        lng = format('%<long>.6f', long: lng)
+        lat = format('%<lat>.6f', lat: lat)
         raise Redis::CommandError,
           "ERR invalid longitude,latitude pair #{lng},#{lat}"
       end
@@ -201,7 +201,7 @@ class MockRedis
     end
 
     def format_decoded_coord(coord)
-      coord = format('%.17f', coord)
+      coord = format('%<coord>.17f', coord: coord)
       l = 1
       l += 1 while coord[-l] == '0'
       coord = coord[0..-l]

data/lib/mock_redis/hash_methods.rb

@@ -128,10 +128,15 @@ class MockRedis
       end
     end
 
-    def hset(key, field, value)
-      field_exists = hexists(key, field)
-      with_hash_at(key) { |h| h[field.to_s] = value.to_s }
-      !field_exists
+    def hset(key, *args)
+      added = 0
+      with_hash_at(key) do |hash|
+        args.each_slice(2) do |field, value|
+          added += 1 unless hash.key?(field.to_s)
+          hash[field.to_s] = value.to_s
+        end
+      end
+      added
     end
 
     def hsetnx(key, field, value)

data/lib/mock_redis/info_method.rb

@@ -83,7 +83,7 @@ class MockRedis
 
     # The Ruby Redis client returns commandstats differently when it's called as
     # "INFO commandstats".
-    # rubocop:disable Metrics/LineLength
+    # rubocop:disable Layout/LineLength
     COMMAND_STATS_SOLO_INFO = {
       'auth' => { 'calls' => '572501', 'usec' => '2353163', 'usec_per_call' => '4.11' },
       'client' => { 'calls' => '1', 'usec' => '80', 'usec_per_call' => '80.00' },
@@ -123,7 +123,7 @@ class MockRedis
       'cmdstat_smembers' => 'calls=58,usec=231,usec_per_call=3.98',
       'cmdstat_sunionstore' => 'calls=4185027,usec=11762454022,usec_per_call=2810.60',
     }.freeze
-    # rubocop:enable Metrics/LineLength
+    # rubocop:enable Layout/LineLength
 
     DEFAULT_INFO = [
       SERVER_INFO,

data/lib/mock_redis/multi_db_wrapper.rb

@@ -17,14 +17,14 @@ class MockRedis
       super || current_db.respond_to?(method, include_private)
     end
 
-    def method_missing(method, *args, &block)
+    ruby2_keywords def method_missing(method, *args, &block)
       current_db.send(method, *args, &block)
     end
 
     def initialize_copy(source)
       super
       @databases = @databases.clone
-      @databases.keys.each do |k|
+      @databases.each_key do |k|
         @databases[k] = @databases[k].clone
       end
     end
@@ -39,7 +39,7 @@ class MockRedis
       src = current_db
       dest = db(db_index)
 
-      if !src.exists(key) || dest.exists(key)
+      if !src.exists?(key) || dest.exists?(key)
         false
       else
         case current_db.type(key)

data/lib/mock_redis/pipelined_wrapper.rb

@@ -18,7 +18,7 @@ class MockRedis
       @pipelined_futures = @pipelined_futures.clone
     end
 
-    def method_missing(method, *args, &block)
+    ruby2_keywords def method_missing(method, *args, &block)
       if in_pipeline?
         future = MockRedis::Future.new([method, *args], block)
         @pipelined_futures << future

data/lib/mock_redis/stream.rb

@@ -23,14 +23,26 @@ class MockRedis
 
     def add(id, values)
       @last_id = MockRedis::Stream::Id.new(id, min: @last_id)
+      if @last_id.to_s == '0-0'
+        raise Redis::CommandError,
+          'ERR The ID specified in XADD must be greater than 0-0'
+      end
       members.add [@last_id, Hash[values.map { |k, v| [k.to_s, v.to_s] }]]
       @last_id.to_s
     end
 
     def trim(count)
       deleted = @members.size - count
-      @members = @members.to_a[-count..-1].to_set
-      deleted
+      if deleted > 0
+        @members = if count == 0
+                     Set.new
+                   else
+                     @members.to_a[-count..-1].to_set
+                   end
+        deleted
+      else
+        0
+      end
     end
 
     def range(start, finish, reversed, *opts_in)
@@ -45,6 +57,14 @@ class MockRedis
       items
     end
 
+    def read(id, *opts_in)
+      opts = options opts_in, %w[count block]
+      stream_id = MockRedis::Stream::Id.new(id)
+      items = members.select { |m| (stream_id < m[0]) }.map { |m| [m[0].to_s, m[1]] }
+      return items.first(opts['count'].to_i) if opts.key?('count')
+      items
+    end
+
     def each
       members.each { |m| yield m }
     end