mock_redis 0.36.0 → 0.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dac18dd7d43fb11953bf9988a89d64d8f82a0d6b909836d215880b5fc6c75e98
-  data.tar.gz: e34af1ec074a43fbdeefa25e27543c57a146e0e22900842875adfca1fed3a698
+  metadata.gz: a52765650d476204f43e76ce502749a8c8efb65869930fe3096d69d1fe0ce40d
+  data.tar.gz: ff2348f833c9c973da379adb3d0abd51b1d67676234c6e3d4649a2130e055fa0
 SHA512:
-  metadata.gz: a47e3c68ad32983cd4017ba6541dbfe3004d197468179713d5102bbe094a9978256831f9ee3d3c9a7abf8ec0c07b18ee8c04b911e9ca326e8d04da8288b8131e
-  data.tar.gz: 119d337effa67690de4754bfa9bfe37bcceade74089b73d8328fd7818877b14afb708ba432ea7b52c6299186d7dad736b14de95acde7bb51909ad6096eb1a143
+  metadata.gz: fd4da99b15267d322b320cfbd3533bacd24e8c4af28c4681e4ff9bedf18cbae9e9338f598904219bd743b44143e820415243e36f0a6da2ee5922926e5f5979fb
+  data.tar.gz: b33e8c8fb1943e88f3b8a7850268ae3627af27122a75cabfd1f76c5fd820118b7af8f840ae83a2830f9661750c76778fc2407accabb8d8c17c40d702c4f3321c

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # MockRedis Changelog
 
+### 0.38.0
+
+* Fix detection of stream key types
+* Add support for `EXAT` AND `PXAT` arguments to `SET` command
+
+### 0.37.0
+
+* Require Ruby 2.7 or newer, since Ruby 2.6 and older are EOL
+* Remove unnecessary files from gem contents
+* Add support for popping multiple items with `lpop`
+* Add support for `scan` with type option
+* Add support for `sadd?`
+* Add support for scanning on keys containing hash tags (`{...}`)
+
 ### 0.36.0
 
 * Add support for `smismember`

data/README.md

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

data/lib/mock_redis/database.rb

@@ -267,6 +267,8 @@ class MockRedis
         'set'
       elsif zsety?(key)
         'zset'
+      elsif streamy?(key)
+        'stream'
       else
         raise ArgumentError, "Not sure how #{data[key].inspect} got in here"
       end
@@ -336,7 +338,7 @@ class MockRedis
     def redis_pattern_to_ruby_regex(pattern)
       Regexp.new(
         "^#{pattern}$".
-        gsub(/([+|()])/, '\\\\\1').
+        gsub(/([+|(){}])/, '\\\\\1').
         gsub(/(?<!\\)\?/, '\\1.').
         gsub(/([^\\])\*/, '\\1.*')
       )

data/lib/mock_redis/hash_methods.rb

@@ -93,7 +93,7 @@ class MockRedis
     def hmset(key, *kvpairs)
       if key.is_a? Array
         err_msg = 'ERR wrong number of arguments for \'hmset\' command'
-        kvpairs = key[1..-1]
+        kvpairs = key[1..]
         key = key[0]
       end
 

data/lib/mock_redis/list_methods.rb

@@ -108,8 +108,13 @@ class MockRedis
       value
     end
 
-    def lpop(key)
-      with_list_at(key, &:shift)
+    def lpop(key, count = nil)
+      return with_list_at(key, &:shift) if count.nil?
+
+      record_count = llen(key)
+      return nil if record_count.zero?
+
+      [record_count, count].min.times.map { with_list_at(key, &:shift) }
     end
 
     def lpush(key, values)

data/lib/mock_redis/multi_db_wrapper.rb

@@ -31,7 +31,7 @@ class MockRedis
 
     # Redis commands
     def flushall
-      @databases.values.each(&:flushdb)
+      @databases.each_value(&:flushdb)
       'OK'
     end
 

data/lib/mock_redis/pipelined_wrapper.rb

@@ -41,22 +41,20 @@ class MockRedis
       end
 
       responses = @pipelined_futures.flat_map do |future|
-        begin
-          result = if future.block
-                     send(*future.command, &future.block)
-                   else
-                     send(*future.command)
-                   end
-          future.store_result(result)
+        result = if future.block
+                   send(*future.command, &future.block)
+                 else
+                   send(*future.command)
+                 end
+        future.store_result(result)
 
-          if future.block
-            result
-          else
-            [result]
-          end
-        rescue StandardError => e
-          e
+        if future.block
+          result
+        else
+          [result]
         end
+      rescue StandardError => e
+        e
       end
       @pipelined_futures = []
       responses

data/lib/mock_redis/set_methods.rb

@@ -27,6 +27,11 @@ class MockRedis
       end
     end
 
+    def sadd?(key, members)
+      res = sadd(key, members)
+      res.is_a?(Numeric) ? res > 0 : res
+    end
+
     def scard(key)
       with_set_at(key, &:length)
     end
@@ -171,7 +176,7 @@ class MockRedis
         with_set_at(keys.first, &blk)
       else
         with_set_at(keys.first) do |set|
-          with_sets_at(*(keys[1..-1])) do |*sets|
+          with_sets_at(*(keys[1..])) do |*sets|
             yield(*([set] + sets))
           end
         end

data/lib/mock_redis/stream.rb

@@ -37,7 +37,7 @@ class MockRedis
         @members = if count == 0
                      Set.new
                    else
-                     @members.to_a[-count..-1].to_set
+                     @members.to_a[-count..].to_set
                    end
         deleted
       else
@@ -71,8 +71,8 @@ class MockRedis
       items
     end
 
-    def each
-      members.each { |m| yield m }
+    def each(&block)
+      members.each(&block)
     end
 
     private

data/lib/mock_redis/string_methods.rb

@@ -38,7 +38,7 @@ class MockRedis
         type, offset = args.shift(2)
 
         is_signed = type.slice(0) == 'i'
-        type_size = type[1..-1].to_i
+        type_size = type[1..].to_i
 
         if (type_size > 64 && is_signed) || (type_size >= 64 && !is_signed)
           raise Redis::CommandError,
@@ -47,7 +47,7 @@ class MockRedis
         end
 
         if offset.to_s[0] == '#'
-          offset = offset[1..-1].to_i * type_size
+          offset = offset[1..].to_i * type_size
         end
 
         bits = []
@@ -210,9 +210,10 @@ class MockRedis
       msetnx(*hash.to_a.flatten)
     end
 
-    # Parameer list required to ensure the ArgumentError is returned correctly
+    # Parameter list required to ensure the ArgumentError is returned correctly
     # rubocop:disable Metrics/ParameterLists
-    def set(key, value, ex: nil, px: nil, nx: nil, xx: nil, keepttl: nil, get: nil)
+    def set(key, value, ex: nil, px: nil, exat: nil, pxat: nil, nx: nil, xx: nil, keepttl: nil,
+      get: nil)
       key = key.to_s
       retval = self.get(key) if get
 
@@ -248,6 +249,20 @@ class MockRedis
         pexpire(key, px)
       end
 
+      if exat
+        if exat == 0
+          raise Redis::CommandError, 'ERR invalid expire time in set'
+        end
+        expireat(key, exat)
+      end
+
+      if pxat
+        if pxat == 0
+          raise Redis::CommandError, 'ERR invalid expire time in set'
+        end
+        pexpireat(key, pxat)
+      end
+
       if get
         retval
       else
@@ -365,7 +380,7 @@ class MockRedis
       old_value = (data[key] || '')
 
       prefix = zero_pad(old_value[0...offset], offset)
-      data[key] = prefix + value + (old_value[(offset + value.length)..-1] || '')
+      data[key] = prefix + value + (old_value[(offset + value.length)..] || '')
       data[key].length
     end
 

data/lib/mock_redis/transaction_wrapper.rb

@@ -57,13 +57,11 @@ class MockRedis
       @multi_block_given = false
 
       responses = @transaction_futures.map do |future|
-        begin
-          result = send(*future.command)
-          future.store_result(result)
-          future.value
-        rescue StandardError => e
-          e
-        end
+        result = send(*future.command)
+        future.store_result(result)
+        future.value
+      rescue StandardError => e
+        e
       end
 
       @transaction_futures = []

data/lib/mock_redis/utility_methods.rb

@@ -28,6 +28,7 @@ class MockRedis
       cursor = cursor.to_i
       match = opts[:match] || '*'
       key = opts[:key] || lambda { |x| x }
+      type_opt = opts[:type]
       filtered_values = []
 
       limit = cursor + count
@@ -35,7 +36,8 @@ class MockRedis
 
       unless values[cursor...limit].nil?
         filtered_values = values[cursor...limit].select do |val|
-          redis_pattern_to_ruby_regex(match).match(key.call(val))
+          redis_pattern_to_ruby_regex(match).match(key.call(val)) &&
+            (type_opt.nil? || type(val) == type_opt)
         end
       end
 
@@ -68,7 +70,7 @@ class MockRedis
     end
 
     def left_pad(str, size)
-      str = '0' + str while str.length < size
+      str = "0#{str}" while str.length < size
 
       str
     end

data/lib/mock_redis/version.rb

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

data/lib/mock_redis/zset.rb

@@ -10,9 +10,11 @@ class MockRedis
 
     def_delegators :members, :empty?, :include?, :size
 
-    def initialize
+    def initialize(enum = nil)
       @members = Set.new
-      @scores  = {}
+      @members.merge(enum) if enum
+
+      @scores = {}
     end
 
     def initialize_copy(source)

data/lib/mock_redis/zset_methods.rb

@@ -26,7 +26,7 @@ class MockRedis
     end
 
     def zadd_one_member(key, score, member, zadd_options = {})
-      assert_scorey(score) unless score.to_s =~ /(\+|\-)inf/
+      assert_scorey(score) unless score.to_s =~ /(\+|-)inf/
 
       with_zset_at(key) do |zset|
         if zadd_options[:incr]
@@ -316,7 +316,7 @@ class MockRedis
         with_zset_at(keys.first, coercible: coercible, &blk)
       else
         with_zset_at(keys.first, coercible: coercible) do |set|
-          with_zsets_at(*(keys[1..-1]), coercible: coercible) do |*sets|
+          with_zsets_at(*(keys[1..]), coercible: coercible) do |*sets|
             yield(*([set] + sets))
           end
         end
@@ -351,7 +351,7 @@ class MockRedis
     end
 
     def assert_scorey(value, message = 'ERR value is not a valid float')
-      return if value.to_s =~ /\(?(\-|\+)inf/
+      return if value.to_s =~ /\(?(-|\+)inf/
 
       value = $1 if value.to_s =~ /\((.*)/
       unless looks_like_float?(value)

data/lib/mock_redis.rb

@@ -1,5 +1,4 @@
 require 'set'
-require 'ruby2_keywords'
 
 require 'mock_redis/assertions'
 require 'mock_redis/database'
@@ -130,7 +129,7 @@ class MockRedis
         defaults[:host]     = uri.host
         defaults[:port]     = uri.port if uri.port
         defaults[:password] = uri.password if uri.password
-        defaults[:db]       = uri.path[1..-1].to_i if uri.path
+        defaults[:db]       = uri.path[1..].to_i if uri.path
       end
     end