mock_redis 0.52.0 → 0.54.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e933ae58d27e242f827d68d17dc8361327ce7c662cba7973ca4a44c4c9265a7
-  data.tar.gz: f9bd080555a7c7f3aaec09d5e55327281b3a2860d5045d4e172812def4ea8c82
+  metadata.gz: afef9e22e0d014b5f2ebbf3c0d33ade376c134f26f4853099d2a792901740e8f
+  data.tar.gz: 926fa68ded405d6161072cc09f366bdd8fd069872b1a840735c0ab72984e51a8
 SHA512:
-  metadata.gz: c09ef4f19dce4b289f5a205a1d34c284d0c78b98969cfeb8aa04eb76d5a10cf41e5d88f8bb2d85332a5d37d66d09c6262bc19f179ffce2e0e754113c8bfdaa71
-  data.tar.gz: a8e824ef5dbf40a9406404eb5c8b5e2bd3cde46c0be994f36724be3beac97bb1f2d4168d557ede3c15f3085e8a03f155d4a88f48b83720b28c1779b8ebd5a0a0
+  metadata.gz: e069988875e87c06a4127670c362a7a43aeb793822ff3abde8708982ddf84bfbfba1ba50bf1681e0db85fbfcb75ba8bc9e204ae87cfacf57fe0c7d2289816e22
+  data.tar.gz: 69a994eb58218bce941320c3f74ac1faf01efb8c3a17bb6112136c189d89b26f4c6f1ef6d9d8fe4dc144c9e4a3acb44c0331db4dea3b7853df6a878d41a05539

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # MockRedis Changelog
 
+### 0.54.0
+
+* Add `(B)ZMPOP`, `BZPOPMIN`, and `BZPOPMAX` commands
+
+### 0.53.0
+
+* Fix `redis.call("info")`
+
 ### 0.52.0
 
 * Fix handling of `expire*` via `.call`

data/lib/mock_redis/database.rb

@@ -49,13 +49,18 @@ class MockRedis
     # 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)
-      # allow for single array argument or multiple arguments
-      command = command[0] if command.length == 1
+      # flatten any nested arrays (eg from [:call, ["GET", "X"]] in pipelined commands)
+      command = command.flatten
 
-      if command[0].downcase.to_s.include?('expire')
+      cmd_name = command[0].downcase.to_s
+
+      if cmd_name.include?('expire')
         send_expires(command)
+      elsif cmd_name == 'info'
+        # call(:info) returns a string, not a parsed hash
+        info_raw(*command[1..])
       else
-        public_send(command[0].downcase, *command[1..])
+        public_send(cmd_name, *command[1..])
       end
     end
 

data/lib/mock_redis/info_method.rb

@@ -125,35 +125,65 @@ class MockRedis
     }.freeze
     # rubocop:enable Layout/LineLength
 
-    DEFAULT_INFO = [
-      SERVER_INFO,
-      CLIENTS_INFO,
-      MEMORY_INFO,
-      PERSISTENCE_INFO,
-      STATS_INFO,
-      REPLICATION_INFO,
-      CPU_INFO,
-      KEYSPACE_INFO,
-    ].inject({}) { |memo, info| memo.merge(info) }
-
-    ALL_INFO = [
-      DEFAULT_INFO,
-      COMMAND_STATS_COMBINED_INFO,
-    ].inject({}) { |memo, info| memo.merge(info) }
+    SECTIONS = {
+      server: SERVER_INFO,
+      clients: CLIENTS_INFO,
+      memory: MEMORY_INFO,
+      persistence: PERSISTENCE_INFO,
+      stats: STATS_INFO,
+      replication: REPLICATION_INFO,
+      cpu: CPU_INFO,
+      keyspace: KEYSPACE_INFO,
+      commandstats: COMMAND_STATS_COMBINED_INFO,
+    }.freeze
+    SECTION_NAMES = {
+      server: 'Server',
+      clients: 'Clients',
+      memory: 'Memory',
+      persistence: 'Persistence',
+      stats: 'Stats',
+      replication: 'Replication',
+      cpu: 'Cpu',
+      keyspace: 'Keyspace',
+      commandstats: 'Commandstats',
+    }.freeze
+    DEFAULT_SECTIONS = [
+      :server, :clients, :memory, :persistence, :stats, :replication, :cpu, :keyspace
+    ].freeze
+    ALL_SECTIONS = DEFAULT_SECTIONS + [:commandstats].freeze
 
     def info(section = :default)
+      if section.to_s.downcase == 'commandstats'
+        # `redis.info(:commandstats)` gives a nested hash structure,
+        # unlike when commandstats is printed as part of `redis.info(:all)`
+        COMMAND_STATS_SOLO_INFO
+      else
+        sections = relevant_info_sections(section)
+        sections.inject({}) { |memo, name| memo.merge(SECTIONS[name]) }
+      end
+    end
+
+    private
+
+    # Format info hash as raw string (used by call("info"))
+    def info_raw(section = :default)
+      sections = relevant_info_sections(section)
+      sections.map do |name|
+        header = "# #{SECTION_NAMES[name]}"
+        lines = SECTIONS[name].map { |k, v| "#{k}:#{v}" }
+        [header, *lines].join("\n")
+      end.join("\n\n") << "\n"
+    end
+
+    def relevant_info_sections(section)
+      section = section.to_s.downcase.to_sym
       case section
-      when :default;      DEFAULT_INFO
-      when :all;          ALL_INFO
-      when :server;       SERVER_INFO
-      when :clients;      CLIENTS_INFO
-      when :memory;       MEMORY_INFO
-      when :persistence;  PERSISTENCE_INFO
-      when :stats;        STATS_INFO
-      when :replication;  REPLICATION_INFO
-      when :cpu;          CPU_INFO
-      when :keyspace;     KEYSPACE_INFO
-      when :commandstats; COMMAND_STATS_SOLO_INFO
+      when :default
+        DEFAULT_SECTIONS
+      when :all
+        ALL_SECTIONS
+      else
+        [section]
       end
     end
   end

data/lib/mock_redis/version.rb

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

data/lib/mock_redis/zset_methods.rb

@@ -253,6 +253,92 @@ class MockRedis
       zcard(destination)
     end
 
+    def bzpopmin(*args)
+      keys, timeout = extract_timeout(args)
+      nonempty_zset = first_nonempty_zset(keys)
+
+      if nonempty_zset
+        member, score = zpopmin(nonempty_zset)
+        [nonempty_zset, member, score]
+      elsif timeout > 0
+        nil
+      else
+        raise MockRedis::WouldBlock, "Can't block forever"
+      end
+    end
+
+    def bzpopmax(*args)
+      keys, timeout = extract_timeout(args)
+      nonempty_zset = first_nonempty_zset(keys)
+
+      if nonempty_zset
+        member, score = zpopmax(nonempty_zset)
+        [nonempty_zset, member, score]
+      elsif timeout > 0
+        nil
+      else
+        raise MockRedis::WouldBlock, "Can't block forever"
+      end
+    end
+
+    def zmpop(*keys, **options)
+      keys.each do |key|
+        assert_zsety(key)
+      end
+
+      modifier = options.is_a?(Hash) && options[:modifier]&.to_s&.downcase || 'min'
+      count = (options.is_a?(Hash) && options[:count]) || 1
+
+      unless %w[min max].include?(modifier)
+        raise ArgumentError, 'Pick either MIN or MAX'
+      end
+
+      keys.each do |key|
+        record_count = zcard(key)
+        next if record_count.zero?
+
+        values = [count, record_count].min.times.map do
+          modifier == 'min' ? zpopmin(key) : zpopmax(key)
+        end
+
+        return [key, values]
+      end
+
+      nil
+    end
+
+    def bzmpop(timeout, *keys, **options)
+      timeout = assert_valid_timeout(timeout)
+
+      keys.each do |key|
+        assert_zsety(key)
+      end
+
+      modifier = options.is_a?(Hash) && options[:modifier]&.to_s&.downcase || 'min'
+      count = (options.is_a?(Hash) && options[:count]) || 1
+
+      unless %w[min max].include?(modifier)
+        raise ArgumentError, 'Pick either MIN or MAX'
+      end
+
+      keys.each do |key|
+        record_count = zcard(key)
+        next if record_count.zero?
+
+        values = [count, record_count].min.times.map do
+          modifier == 'min' ? zpopmin(key) : zpopmax(key)
+        end
+
+        return [key, values]
+      end
+
+      if timeout > 0
+        nil
+      else
+        raise MockRedis::WouldBlock, "Can't block forever"
+      end
+    end
+
     private
 
     def apply_limit(collection, limit)
@@ -376,5 +462,9 @@ class MockRedis
         assert_scorey(value, 'ERR min or max is not a float')
       end
     end
+
+    def first_nonempty_zset(keys)
+      keys.find { |k| zcard(k) > 0 }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mock_redis
 version: !ruby/object:Gem::Version
-  version: 0.52.0
+  version: 0.54.0
 platform: ruby
 authors:
 - Shane da Silva
 - Samuel Merritt
 bindir: bin
 cert_chain: []
-date: 2025-08-21 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -124,10 +124,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/sds/mock_redis/issues
-  changelog_uri: https://github.com/sds/mock_redis/blob/v0.52.0/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/mock_redis/0.52.0
+  changelog_uri: https://github.com/sds/mock_redis/blob/v0.54.0/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/mock_redis/0.54.0
   homepage_uri: https://github.com/sds/mock_redis
-  source_code_uri: https://github.com/sds/mock_redis/tree/v0.52.0
+  source_code_uri: https://github.com/sds/mock_redis/tree/v0.54.0
 rdoc_options: []
 require_paths:
 - lib
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Redis mock that just lives in memory; useful for testing.
 test_files: []