mock_redis 0.35.0 → 0.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac517fcc81e569da0e5e0512027dd381ebd8c0553aaa9aa373ffb7be3afe983e
-  data.tar.gz: 5e64b3ac11ab9c403165c082b8c2db641858ffd7430a6f6fd1c3c88c1d7b7090
+  metadata.gz: 1d7bda05082845039ee8e7aa688238c8006fb6754b5198e325e92723f4ec63bd
+  data.tar.gz: 430cd98257705509362934dc755f9e88820ebb1e7d39dee2a056ffd28c120d4d
 SHA512:
-  metadata.gz: c4ab0e03ac161be256d4920837fe1cc70da6ae57f29b4e75c1f2eec404b46ad2efa5679552b089eddd3234d49eb85a8ec0f1a51cbfa118654da31a0c43f4c7cb
-  data.tar.gz: 8c97fae25f874bdbbaedd52e0ac10bd793fae3cb711e7e6a368147301fbc653a35d0630e9c0ae172cc625b2b9c4f266d9d7dd08fe92441cfc5e04156d98a1ebd
+  metadata.gz: cff49225d6412aababaaad3cca42394764168862cc1c6d2b434fb83b5889582f0a74698b696e244036b695b318da0ea444cda16abe6e1ca73bfe9e2e3ab05ed9
+  data.tar.gz: 32cbd749e2180f56c1e779aedc726114c2aa242fe6d87e95a75f98d85b51814befea89c27f6cf6d7a1d306cb526236b9bf186b0aa1c541c4621969103c485691

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # MockRedis Changelog
 
+### 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`
+* Add support for `lmove` and `blmove`
+* Fix `zrem` to support passing array of integers
+
 ### 0.35.0
 
 * Add support for `getdel`

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.
 
@@ -55,8 +55,8 @@ since it's an in-memory object confined to a single process. MockRedis
 makes every attempt to be Redis-compatible, but there are some
 necessary exceptions.
 
-* Blocking list commands (`#blpop`, `#brpop`, and `#brpoplpush`) work
-  as expected if there is data for them to retrieve. If you use one of
+* Blocking list commands (`#blmove`, `#blpop`, `#brpop`, and `#brpoplpush`)
+  work as expected if there is data for them to retrieve. If you use one of
   these commands with a nonzero timeout and there is no data for it to
   retrieve, then the command returns immediately. However, if you ask
   one of these commands for data with a 0 timeout (means "wait

data/lib/mock_redis/database.rb

@@ -336,7 +336,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

@@ -6,6 +6,20 @@ class MockRedis
     include Assertions
     include UtilityMethods
 
+    def blmove(source, destination, wherefrom, whereto, options = {})
+      options = { :timeout => options } if options.is_a?(Integer)
+      timeout = options.is_a?(Hash) && options[:timeout] || 0
+      assert_valid_timeout(timeout)
+
+      if llen(source) > 0
+        lmove(source, destination, wherefrom, whereto)
+      elsif timeout > 0
+        nil
+      else
+        raise MockRedis::WouldBlock, "Can't block forever"
+      end
+    end
+
     def blpop(*args)
       lists, timeout = extract_timeout(args)
       nonempty_list = first_nonempty_list(lists)
@@ -78,8 +92,29 @@ class MockRedis
       with_list_at(key, &:length)
     end
 
-    def lpop(key)
-      with_list_at(key, &:shift)
+    def lmove(source, destination, wherefrom, whereto)
+      assert_listy(source)
+      assert_listy(destination)
+
+      wherefrom = wherefrom.to_s.downcase
+      whereto = whereto.to_s.downcase
+
+      unless %w[left right].include?(wherefrom) && %w[left right].include?(whereto)
+        raise Redis::CommandError, 'ERR syntax error'
+      end
+
+      value = wherefrom == 'left' ? lpop(source) : rpop(source)
+      (whereto == 'left' ? lpush(destination, value) : rpush(destination, value)) unless value.nil?
+      value
+    end
+
+    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
@@ -64,6 +69,12 @@ class MockRedis
       with_set_at(key) { |s| s.include?(member.to_s) }
     end
 
+    def smismember(key, *members)
+      with_set_at(key) do |set|
+        members.flatten.map { |m| set.include?(m.to_s) }
+      end
+    end
+
     def smembers(key)
       with_set_at(key, &:to_a).map(&:dup).reverse
     end
@@ -165,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 = []
@@ -365,7 +365,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.35.0'
+  VERSION = '0.37.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]
@@ -147,7 +147,7 @@ class MockRedis
         else
           retval = args.map { |member| !!zscore(key, member.to_s) }.count(true)
           with_zset_at(key) do |z|
-            args.each { |member| z.delete?(member) }
+            args.each { |member| z.delete?(member.to_s) }
           end
         end
       end
@@ -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