mock_redis 0.55.0 → 0.56.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f61c25ac91aa99558a90e5035269dbabc36c565d7aec85e78356a2178c5aa1a6
-  data.tar.gz: bdb253307125c9dc1418bc11ea5884e36d4d0e425b8243c3619816b3cc91cd48
+  metadata.gz: 9941cda3e99b0e5f90f9d0e0d27eb242b8af20b52beb23f52075f77b0843a2c4
+  data.tar.gz: 293c9b589d9876fd4c907e6e76ec73bafcf6e20cbb4af4beb2d3150b956c6a15
 SHA512:
-  metadata.gz: 40e400a1c118712a11c638e26cdc1ce0e10cb70e34c8a390c94e904a94d1141cd152167fa465ff5e78f8c4cf31e9eeb02efc568211dbd83ae4c18a87917d61ba
-  data.tar.gz: d68b5609c754e1c1dc0a90433e25d22466cf1a88f9733a90e8aa3daa2abe2a389b80ed32ef0daa27fd8952d2ce6c0baa80e0f28c2edb887d4e749d6b6a258689
+  metadata.gz: 9a9f887b2dd27f3c242498a65c121d67d18cd98727c9c3b0a208aa4405903db077b824c8103cd326d5e900323fc631a9abb88553c7a73ab7321deb97be331d0a
+  data.tar.gz: c80f28279ed2aff3cac655ecaa3d8d7e56c08ae7f24d5a0403b8de63543e627b07b698eea6f3788d59734ac23575930e6d6c0c78f7c17c26e2bbac82c9ef35a9

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # MockRedis Changelog
 
+### 0.56.0
+
+* Add support for `redis-rb` 6 and return `GEOPOS` coordinates as floats under RESP3
+* Add support for `username` option to Redis connection
+* Fix `send_expires` when option is `nil`
+* Fix `SET` command with positional arguments via `call` method
+* Add `BYSCORE`, `BYLEX`, and `REV` options to `ZRANGE`
+* Add `LT` and `CH` options to `ZADD` command
+* Fix handling of nonpositive SET expirations before changing key state
+
 ### 0.55.0
 
 * Add `GT` option support to `ZADD`

data/lib/mock_redis/database.rb

@@ -56,6 +56,8 @@ class MockRedis
 
       if cmd_name.include?('expire')
         send_expires(command)
+      elsif cmd_name == 'set'
+        send_set(command)
       elsif cmd_name == 'info'
         # call(:info) returns a string, not a parsed hash
         info_raw(*command[1..])
@@ -362,8 +364,34 @@ class MockRedis
     end
 
     def send_expires(command)
-      command, key, ttl, option = *command
-      public_send(command, key, ttl, option.downcase.to_sym => option)
+      cmd, key, ttl, option = *command
+      if option
+        public_send(cmd, key, ttl, option.downcase.to_sym => true)
+      else
+        public_send(cmd, key, ttl)
+      end
+    end
+
+    def send_set(command)
+      _cmd, key, value, *options = *command
+      kwargs = {}
+
+      i = 0
+      while i < options.length
+        opt = options[i].to_s.downcase
+        case opt
+        when 'ex', 'px', 'exat', 'pxat'
+          kwargs[opt.to_sym] = options[i + 1].to_i
+          i += 2
+        when 'nx', 'xx', 'keepttl', 'get'
+          kwargs[opt.to_sym] = true
+          i += 1
+        else
+          i += 1
+        end
+      end
+
+      set(key, value, **kwargs)
     end
 
     def should_update_expiration?(expiry, new_expiry, nx:, xx:, lt:, gt:) # rubocop:disable Metrics/ParameterLists

data/lib/mock_redis/geospatial_methods.rb

@@ -71,9 +71,7 @@ class MockRedis
         next nil unless score
         hash = { bits: score.to_i, step: STEP }
         lng, lat = geohash_decode(hash)
-        lng = format_decoded_coord(lng)
-        lat = format_decoded_coord(lat)
-        [lng, lat]
+        [format_decoded_coord(lng), format_decoded_coord(lat)].map { |c| resp3? ? c.to_f : c }
       end
     end
 
@@ -203,6 +201,11 @@ class MockRedis
       x | (y << 32)
     end
 
+    # redis-rb 6 defaults to RESP3, which returns GEO coordinates as Floats
+    def resp3?
+      @base.options.fetch(:protocol) { Redis::VERSION.to_i >= 6 ? 3 : 2 }.to_i == 3
+    end
+
     def format_decoded_coord(coord)
       coord = format('%<coord>.17f', coord: coord)
       l = 1

data/lib/mock_redis/string_methods.rb

@@ -212,6 +212,9 @@ class MockRedis
     def set(key, value, _hash = nil, ex: nil, px: nil, exat: nil, pxat: nil, nx: nil, xx: nil,
       keepttl: nil, get: nil)
       key = key.to_s
+      if [ex, px, exat, pxat].any? { |expiration| expiration && Integer(expiration) <= 0 }
+        raise Error.command_error('ERR invalid expire time in set', self)
+      end
       retval = self.get(key) if get
 
       return_true = false
@@ -233,30 +236,18 @@ class MockRedis
 
       remove_expiration(key) unless keepttl
       if ex
-        if ex == 0
-          raise Error.command_error('ERR invalid expire time in set', self)
-        end
         expire(key, ex)
       end
 
       if px
-        if px == 0
-          raise Error.command_error('ERR invalid expire time in set', self)
-        end
         pexpire(key, px)
       end
 
       if exat
-        if exat == 0
-          raise Error.command_error('ERR invalid expire time in set', self)
-        end
         expireat(key, exat)
       end
 
       if pxat
-        if pxat == 0
-          raise Error.command_error('ERR invalid expire time in set', self)
-        end
         pexpireat(key, pxat)
       end
 

data/lib/mock_redis/version.rb

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

data/lib/mock_redis/zset_methods.rb

@@ -11,14 +11,28 @@ class MockRedis
       zadd_options = {}
       zadd_options = args.pop if args.last.is_a?(Hash)
 
-      if zadd_options&.include?(:nx) && zadd_options&.include?(:xx)
+      if zadd_options.include?(:nx) && zadd_options.include?(:xx)
         raise Error.command_error(
           'ERR XX and NX options at the same time are not compatible',
           self
         )
       end
 
-      if zadd_options&.include?(:gt) && zadd_options&.include?(:nx)
+      if zadd_options.include?(:gt) && zadd_options.include?(:nx)
+        raise Error.command_error(
+          'ERR GT, LT, and/or NX options at the same time are not compatible',
+          self
+        )
+      end
+
+      if zadd_options.include?(:lt) && zadd_options.include?(:nx)
+        raise Error.command_error(
+          'ERR GT, LT, and/or NX options at the same time are not compatible',
+          self
+        )
+      end
+
+      if zadd_options.include?(:gt) && zadd_options.include?(:lt)
         raise Error.command_error(
           'ERR GT, LT, and/or NX options at the same time are not compatible',
           self
@@ -58,6 +72,24 @@ class MockRedis
             return zincrby(key, score, member)
           end
 
+          if zadd_options[:lt]
+            current_score = zset.score(member.to_s)
+
+            # NOTE: does nothing if the member doesn't exist and XX option is set.
+            return nil if current_score.nil? && zadd_options[:xx]
+
+            # NOTE: zincrby add the increment if the member doesn't exist and XX option is not set.
+            return zincrby(key, score, member) if current_score.nil? && !zadd_options[:xx]
+
+            new_score = current_score + score.to_f
+
+            # NOTE: does nothing if the new score is not less than the current score.
+            return nil if current_score && new_score >= current_score
+
+            # NOTE: zincrby update the score if the new score is less than the current score.
+            return zincrby(key, score, member)
+          end
+
           if zadd_options[:xx]
             member_present = zset.include?(member)
             return member_present ? zincrby(key, score, member) : nil
@@ -79,8 +111,23 @@ class MockRedis
             zset.add(new_score, member.to_s)
             true
           else
-            zset.add(new_score, member.to_s) if new_score > current_score
-            false
+            changed = new_score > current_score
+            zset.add(new_score, member.to_s) if changed
+            zadd_options[:ch] ? changed : false
+          end
+        elsif zadd_options[:lt]
+          current_score = zset.score(member.to_s)
+          new_score = score.to_f
+
+          if current_score.nil?
+            return false if zadd_options[:xx]
+
+            zset.add(new_score, member.to_s)
+            true
+          else
+            changed = new_score < current_score
+            zset.add(new_score, member.to_s) if changed
+            zadd_options[:ch] ? changed : false
           end
         elsif zadd_options[:xx]
           # NOTE: gt and xx options are handled at the gt branch above, so its not handled here.
@@ -89,9 +136,14 @@ class MockRedis
         elsif zadd_options[:nx]
           !zset.include?(member) && !!zset.add(score, member.to_s)
         else
-          retval = !zscore(key, member)
+          is_new = !zscore(key, member)
+          old_score = zset.score(member.to_s)
           zset.add(score, member.to_s)
-          retval
+          if zadd_options[:ch]
+            is_new || (old_score && old_score != score.to_f) # rubocop:disable Lint/FloatComparison
+          else
+            is_new
+          end
         end
       end
     end
@@ -116,13 +168,44 @@ class MockRedis
               end
             else
               score_f = score.to_f
-              zset.add(score_f, member.to_s) if score_f > current_score
+              if score_f > current_score
+                zset.add(score_f, member.to_s)
+                retval += 1 if zadd_options[:ch]
+              end
+            end
+            retval
+          end
+        elsif zadd_options[:lt]
+          args.reduce(0) do |retval, (score, member)|
+            current_score = zset.score(member.to_s)
+            if current_score.nil?
+              unless zadd_options[:xx]
+                zset.add(score.to_f, member.to_s)
+                retval += 1
+              end
+            else
+              score_f = score.to_f
+              if score_f < current_score
+                zset.add(score_f, member.to_s)
+                retval += 1 if zadd_options[:ch]
+              end
             end
             retval
           end
         elsif zadd_options[:xx]
-          args.each { |score, member| zset.include?(member) && zset.add(score, member.to_s) }
-          0
+          if zadd_options[:ch]
+            args.reduce(0) do |retval, (score, member)|
+              if zset.include?(member)
+                old_score = zset.score(member.to_s)
+                zset.add(score, member.to_s)
+                retval += 1 if old_score != score.to_f # rubocop:disable Lint/FloatComparison
+              end
+              retval
+            end
+          else
+            args.each { |score, member| zset.include?(member) && zset.add(score, member.to_s) }
+            0
+          end
         elsif zadd_options[:nx]
           args.reduce(0) do |retval, (score, member)|
             unless zset.include?(member)
@@ -133,8 +216,13 @@ class MockRedis
           end
         else
           args.reduce(0) do |retval, (score, member)|
-            retval += 1 unless zset.include?(member)
+            is_new = !zset.include?(member)
+            old_score = zset.score(member.to_s)
             zset.add(score, member.to_s)
+            # rubocop:disable Lint/FloatComparison
+            changed = is_new || (zadd_options[:ch] && old_score && old_score != score.to_f)
+            # rubocop:enable Lint/FloatComparison
+            retval += 1 if changed
             retval
           end
         end
@@ -175,9 +263,50 @@ class MockRedis
 
     def zrange(key, start, stop, options = {})
       with_zset_at(key) do |z|
-        start = [start.to_i, -z.sorted.size].max
-        stop = stop.to_i
-        to_response(z.sorted[start..stop] || [], options)
+        if options[:byscore]
+          # With REV, arguments are (max, min) not (min, max)
+          min = options[:rev] ? stop : start
+          max = options[:rev] ? start : stop
+          assert_range_args(min, max)
+          results = z.in_range(min, max)
+          results = results.reverse if options[:rev]
+          results = apply_limit(results, options[:limit])
+          to_response(results, options)
+        elsif options[:bylex]
+          # With REV, arguments are (max, min) not (min, max)
+          lex_min = options[:rev] ? stop : start
+          lex_max = options[:rev] ? start : stop
+          results = z.sorted.select do |_score, member|
+            in_lex_range?(member, lex_min, lex_max)
+          end
+          results = results.reverse if options[:rev]
+          results = apply_limit(results, options[:limit])
+          to_response(results, options)
+        else
+          sorted = options[:rev] ? z.sorted.reverse : z.sorted
+          start_idx = [start.to_i, -sorted.size].max
+          stop_idx = stop.to_i
+          to_response(sorted[start_idx..stop_idx] || [], options)
+        end
+      end
+    end
+
+    def in_lex_range?(member, min, max)
+      return false if min != '-' && !lex_compare(member, min, :min)
+      return false if max != '+' && !lex_compare(member, max, :max)
+
+      true
+    end
+
+    def lex_compare(member, bound, direction)
+      if bound.start_with?('[')
+        value = bound[1..]
+        direction == :min ? member >= value : member <= value
+      elsif bound.start_with?('(')
+        value = bound[1..]
+        direction == :min ? member > value : member < value
+      else
+        false
       end
     end
 

data/lib/mock_redis.rb

@@ -21,6 +21,7 @@ class MockRedis
     :port => 6379,
     :path => nil,
     :timeout => 5.0,
+    :username => nil,
     :password => nil,
     :logger => nil,
     :db => 0,
@@ -62,6 +63,14 @@ class MockRedis
     options[:db]
   end
 
+  def username
+    options[:username]
+  end
+
+  def password
+    options[:password]
+  end
+
   def logger
     options[:logger]
   end
@@ -125,6 +134,7 @@ class MockRedis
         defaults[:scheme]   = uri.scheme
         defaults[:host]     = uri.host
         defaults[:port]     = uri.port if uri.port
+        defaults[:username] = uri.user if uri.user
         defaults[:password] = uri.password if uri.password
         defaults[:db]       = uri.path[1..].to_i if uri.path
       end

metadata

@@ -1,30 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: mock_redis
 version: !ruby/object:Gem::Version
-  version: 0.55.0
+  version: 0.56.0
 platform: ruby
 authors:
 - Shane da Silva
 - Samuel Merritt
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-04 00:00:00.000000000 Z
+date: 2026-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -125,11 +131,11 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/sds/mock_redis/issues
-  changelog_uri: https://github.com/sds/mock_redis/blob/v0.55.0/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/mock_redis/0.55.0
+  changelog_uri: https://github.com/sds/mock_redis/blob/v0.56.0/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/mock_redis/0.56.0
   homepage_uri: https://github.com/sds/mock_redis
-  source_code_uri: https://github.com/sds/mock_redis/tree/v0.55.0
-post_install_message: 
+  source_code_uri: https://github.com/sds/mock_redis/tree/v0.56.0
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -144,8 +150,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Redis mock that just lives in memory; useful for testing.
 test_files: []