mock_redis 0.40.0 → 0.41.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a994c84019da05c17affd08708c56468251ad9c8667893b5841d57c238ae5ad
-  data.tar.gz: 3d21509554037fc70d813de8265ea64c8dce549c8bbbb2d4872875e83a01fcb1
+  metadata.gz: 38600e39b89ea4f37c414a69fb7ed50e4915d0f723d2d7f50e11141b4f9f9e33
+  data.tar.gz: 5e2830a85a5dcf6326ed01c3cac52cf5c5136393dd79f979b9a197a79dd12c60
 SHA512:
-  metadata.gz: 1db6f45379ac2252fd1024e8eecdf1a3f49289bd457cd63cb075c2baa19fdb9e1e775c537c7089e184e7d7e644d6d30b81f796516fa8bd3631bab623154e9531
-  data.tar.gz: 5177f6c22cd0f7561ee9eaf46ebce4ba1f43f0c2b461fe87baa4c50dfe76ffeee05db2c5cc552e90431be44d01aa293ed6a672bd7a303ab16f0f6ee5659ea34e
+  metadata.gz: 1fcdf6c59782080a318f7915b918367aa7935f4de4dee130fac4bae158574e39685db1a81a598fae56d7c97a14e33c4b333c0e357375c45edd691c31bed20455
+  data.tar.gz: f0a336671d8a76ad0984604ad3f29ab231188442155de7968c1e0698489f5a02f3a012ab3ae3f38a8398c3d553cbc1ca68b9915514d6c5046ebede63a5c9e842

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # MockRedis Changelog
 
+### 0.41.0
+
+* Add support for `expire`-related command options `nx`/`xx`/`lt`/`gt`
+
 ### 0.40.0
 
 * Add support for `call` method name to be case insensitive

data/lib/mock_redis/database.rb

@@ -43,6 +43,9 @@ class MockRedis
 
     # Redis commands go below this line and above 'private'
 
+    # FIXME: Current implementation of `call` does not work propetly with kwarg-options.
+    # i.e. `call("EXPIRE", "foo", 40, "NX")` (which redis-rb will simply transmit to redis-server)
+    # will be passed to `#expire` without keywords transformation.
     def call(command, &_block)
       public_send(command[0].downcase, *command[1..])
     end
@@ -89,32 +92,42 @@ class MockRedis
       msg.to_s
     end
 
-    def expire(key, seconds)
+    def expire(key, seconds, nx: nil, xx: nil, lt: nil, gt: nil) # rubocop:disable Metrics/ParameterLists
       assert_valid_integer(seconds)
 
-      pexpire(key, seconds.to_i * 1000)
+      pexpire(key, seconds.to_i * 1000, nx: nx, xx: xx, lt: lt, gt: gt)
     end
 
-    def pexpire(key, ms)
+    def pexpire(key, ms, nx: nil, xx: nil, lt: nil, gt: nil) # rubocop:disable Metrics/ParameterLists
       assert_valid_integer(ms)
 
       now, miliseconds = @base.now
       now_ms = (now * 1000) + miliseconds
-      pexpireat(key, now_ms + ms.to_i)
+      pexpireat(key, now_ms + ms.to_i, nx: nx, xx: xx, lt: lt, gt: gt)
     end
 
-    def expireat(key, timestamp)
+    def expireat(key, timestamp, nx: nil, xx: nil, lt: nil, gt: nil) # rubocop:disable Metrics/ParameterLists
       assert_valid_integer(timestamp)
 
-      pexpireat(key, timestamp.to_i * 1000)
+      pexpireat(key, timestamp.to_i * 1000, nx: nx, xx: xx, lt: lt, gt: gt)
     end
 
-    def pexpireat(key, timestamp_ms)
+    def pexpireat(key, timestamp_ms, nx: nil, xx: nil, lt: nil, gt: nil) # rubocop:disable Metrics/ParameterLists
       assert_valid_integer(timestamp_ms)
 
-      if exists?(key)
-        timestamp = Rational(timestamp_ms.to_i, 1000)
-        set_expiration(key, @base.time_at(timestamp))
+      if nx && gt || gt && lt || lt && nx || nx && xx
+        raise Redis::CommandError, <<~TXT.chomp
+          ERR NX and XX, GT or LT options at the same time are not compatible
+        TXT
+      end
+
+      return false unless exists?(key)
+
+      expiry = expiration(key)
+      new_expiry = @base.time_at(Rational(timestamp_ms.to_i, 1000))
+
+      if should_update_expiration?(expiry, new_expiry, nx: nx, xx: xx, lt: lt, gt: gt)
+        set_expiration(key, new_expiry)
         true
       else
         false
@@ -324,7 +337,7 @@ class MockRedis
     end
 
     def expiration(key)
-      expire_times.find { |(_, k)| k == key.to_s }.first
+      expire_times.find { |(_, k)| k == key.to_s }&.first
     end
 
     def has_expiration?(key)
@@ -339,6 +352,14 @@ class MockRedis
       !!Float(str) rescue false
     end
 
+    def should_update_expiration?(expiry, new_expiry, nx:, xx:, lt:, gt:) # rubocop:disable Metrics/ParameterLists
+      return false if nx && expiry || xx && !expiry
+      return false if lt && expiry && new_expiry > expiry
+      return false if gt && (!expiry || new_expiry < expiry)
+
+      true
+    end
+
     def redis_pattern_to_ruby_regex(pattern)
       Regexp.new(
         "^#{pattern}$".

data/lib/mock_redis/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mock_redis
 version: !ruby/object:Gem::Version
-  version: 0.40.0
+  version: 0.41.0
 platform: ruby
 authors:
 - Shane da Silva
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-16 00:00:00.000000000 Z
+date: 2023-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -123,10 +123,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/sds/mock_redis/issues
-  changelog_uri: https://github.com/sds/mock_redis/blob/v0.40.0/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/mock_redis/0.40.0
+  changelog_uri: https://github.com/sds/mock_redis/blob/v0.41.0/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/mock_redis/0.41.0
   homepage_uri: https://github.com/sds/mock_redis
-  source_code_uri: https://github.com/sds/mock_redis/tree/v0.40.0
+  source_code_uri: https://github.com/sds/mock_redis/tree/v0.41.0
 post_install_message:
 rdoc_options: []
 require_paths: