mock_redis 0.27.3 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f61e830490badf3dffbb7dff2ba426f7a359bbc9023243de838e4698318e8aaa
-  data.tar.gz: 21bc925aad3d1b8b67e799da8ea8015810a79f40f0d8962a08d32ca9cee9c9bc
+  metadata.gz: 9dc2b4dd866fe426a0ee5b767bc46668c1ccb515f0b927feeac129b47f28a4a6
+  data.tar.gz: cccf8ea1f98f9376afadcc57738eef1578bd07166b08bb5a11eb6c3410412f23
 SHA512:
-  metadata.gz: 01c57f3b8db4fb7835a6cf83cbe67010f3a501945751b7f2c7138b5488f62b72734903592e9bf189b2e41d6c9c6caad4d33799c0158bf5707990cec853860961
-  data.tar.gz: 352e3efacf4b47935dcb20f4a427833858fe2229a33568251dc6f670b40ba5a0db22e484f92d5467ff26bd95b42696971211d86b97513efb9d6e65cd21d71740
+  metadata.gz: f8827a5223d959f27d33223904f0cdf705dfa280da700733ea83cb581ddc89ca3e427af39ec247ea05ebb79ecb9fe58ba3e8f2f1b7fd62204aacc65025f010cf
+  data.tar.gz: e1e3115c5577f1e22249f3c6b9fb3b82ac1be4b8a4967824cbea5f56ce35efec15154d1f9871de5ba3abc337cbe6d38c9d93787150c8e3262ba30b395bcb58b4

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # MockRedis Changelog
 
+### 0.28.0
+
+* Fix `hmset` exception ([#206](https://github.com/sds/mock_redis/pull/206))
+* Fix `hmset` to accept hashes in addition to key/value pairs ([#208](https://github.com/sds/mock_redis/pull/208))
+* Fix stream ID regex to support `(` ([#209](https://github.com/sds/mock_redis/pull/209))
+* Allow `mget` to accept a block ([#210](https://github.com/sds/mock_redis/pull/210))
+
 ### 0.27.3
 
 * Ensure `ruby2_keywords` dependency is `require`d at runtime

data/lib/mock_redis/hash_methods.rb

@@ -94,7 +94,7 @@ class MockRedis
       assert_has_args(kvpairs, 'hmset')
 
       if kvpairs.length.odd?
-        raise Redis::CommandError, err_msg || 'ERR wrong number of arguments for HMSET'
+        raise Redis::CommandError, err_msg || 'ERR wrong number of arguments for \'hmset\' command'
       end
 
       kvpairs.each_slice(2) do |(k, v)|
@@ -131,6 +131,10 @@ class MockRedis
     def hset(key, *args)
       added = 0
       with_hash_at(key) do |hash|
+        if args.length == 1 && args[0].is_a?(Hash)
+          args = args[0].to_a.flatten
+        end
+
         args.each_slice(2) do |field, value|
           added += 1 unless hash.key?(field.to_s)
           hash[field.to_s] = value.to_s

data/lib/mock_redis/stream.rb

@@ -49,9 +49,15 @@ class MockRedis
       opts = options opts_in, ['count']
       start_id = MockRedis::Stream::Id.new(start)
       finish_id = MockRedis::Stream::Id.new(finish, sequence: Float::INFINITY)
-      items = members
-              .select { |m| (start_id <= m[0]) && (finish_id >= m[0]) }
-              .map { |m| [m[0].to_s, m[1]] }
+      if start_id.exclusive
+        items = members
+                .select { |m| (start_id < m[0]) && (finish_id >= m[0]) }
+                .map { |m| [m[0].to_s, m[1]] }
+      else
+        items = members
+                .select { |m| (start_id <= m[0]) && (finish_id >= m[0]) }
+                .map { |m| [m[0].to_s, m[1]] }
+      end
       items.reverse! if reversed
       return items.first(opts['count'].to_i) if opts.key?('count')
       items

data/lib/mock_redis/stream/id.rb

@@ -3,9 +3,10 @@ class MockRedis
     class Id
       include Comparable
 
-      attr_accessor :timestamp, :sequence
+      attr_accessor :timestamp, :sequence, :exclusive
 
       def initialize(id, min: nil, sequence: 0)
+        @exclusive = false
         case id
         when '*'
           @timestamp = (Time.now.to_f * 1000).to_i
@@ -20,8 +21,12 @@ class MockRedis
           @timestamp = @sequence = Float::INFINITY
         else
           if id.is_a? String
-            (_, @timestamp, @sequence) = id.match(/^(\d+)-?(\d+)?$/)
-                                           .to_a
+            # See https://redis.io/topics/streams-intro
+            # Ids are a unix timestamp in milliseconds followed by an
+            # optional dash sequence number, e.g. -0. They can also optionally
+            # be prefixed with '(' to change the XRANGE to exclusive.
+            (_, @timestamp, @sequence) = id.match(/^\(?(\d+)-?(\d+)?$/).to_a
+            @exclusive = true if id[0] == '('
             if @timestamp.nil?
               raise Redis::CommandError,
                     'ERR Invalid stream ID specified as stream command argument'

data/lib/mock_redis/string_methods.rb

@@ -154,14 +154,16 @@ class MockRedis
       new_value
     end
 
-    def mget(*keys)
+    def mget(*keys, &blk)
       keys.flatten!
 
       assert_has_args(keys, 'mget')
 
-      keys.map do |key|
+      data = keys.map do |key|
         get(key) if stringy?(key)
       end
+
+      blk ? blk.call(data) : data
     end
 
     def mapped_mget(*keys)

data/lib/mock_redis/version.rb

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

data/spec/commands/hset_spec.rb

@@ -34,5 +34,9 @@ describe '#hset(key, field)' do
     @redises.hget(@key, '1').should == 'one'
   end
 
+  it 'stores fields sent in a hash' do
+    @redises.hset(@key, {'k1' => 'v1', 'k2' => 'v2'}).should == 2
+  end
+
   it_should_behave_like 'a hash-only command'
 end

data/spec/commands/mget_spec.rb

@@ -56,4 +56,10 @@ describe '#mget(key [, key, ...])' do
       end.should raise_error(Redis::CommandError)
     end
   end
+
+  context 'emulate block' do
+    it 'returns an array of values' do
+      @redises.mget(@key1, @key2) { |values| values.map(&:to_i) }.should == [1, 2]
+    end
+  end
 end

data/spec/commands/xadd_spec.rb

@@ -14,20 +14,20 @@ describe '#xadd("mystream", { f1: "v1", f2: "v2" }, id: "0-0", maxlen: 1000, app
 
   it 'returns an id based on the timestamp' do
     t = Time.now.to_i
-    id = @redises.xadd(@key, key: 'value')
-    expect(@redises.xadd(@key, key: 'value')).to match(/#{t}\d{3}-0/)
+    id = @redises.xadd(@key, { key: 'value' })
+    expect(@redises.xadd(@key, { key: 'value' })).to match(/#{t}\d{3}-0/)
   end
 
   it 'adds data with symbols' do
-    @redises.xadd(@key, symbol_key: :symbol_value)
+    @redises.xadd(@key, { symbol_key: :symbol_value })
     expect(@redises.xrange(@key, '-', '+').last[1])
       .to eq('symbol_key' => 'symbol_value')
   end
 
   it 'increments the sequence number with the same timestamp' do
     Timecop.freeze do
-      @redises.xadd(@key, key: 'value')
-      expect(@redises.xadd(@key, key: 'value')).to match(/\d+-1/)
+      @redises.xadd(@key, { key: 'value' })
+      expect(@redises.xadd(@key, { key: 'value' })).to match(/\d+-1/)
     end
   end
 
@@ -67,7 +67,7 @@ describe '#xadd("mystream", { f1: "v1", f2: "v2" }, id: "0-0", maxlen: 1000, app
   it 'caters for the current time being before the last time' do
     t = (Time.now.to_f * 1000).to_i + 2000
     @redises.xadd(@key, { key: 'value' }, id: "#{t}-0")
-    expect(@redises.xadd(@key, key: 'value')).to match(/#{t}-1/)
+    expect(@redises.xadd(@key, { key: 'value' })).to match(/#{t}-1/)
   end
 
   it 'appends a sequence number if it is missing' do

data/spec/commands/xlen_spec.rb

@@ -14,9 +14,9 @@ describe '#xlen(key)' do
 
   it 'returns the number of items in the stream' do
     expect(@redises.xlen(@key)).to eq 0
-    @redises.xadd(@key, key: 'value')
+    @redises.xadd(@key, { key: 'value' })
     expect(@redises.xlen(@key)).to eq 1
-    3.times { @redises.xadd(@key, key: 'value') }
+    3.times { @redises.xadd(@key, { key: 'value' }) }
     expect(@redises.xlen(@key)).to eq 4
   end
 end

data/spec/commands/xrange_spec.rb

@@ -79,13 +79,23 @@ describe '#xrange("mystream", first: "0-1", last: "0-3", count: 10)' do
       )
     end
 
-    it 'returns entries with both a lower and an upper limit' do
-      expect(@redises.xrange(@key, '1234567891239-0', '1234567891285-0')).to eq(
+    it 'returns entries with both a lower and an upper limit inclusive' do
+      expect(@redises.xrange(@key, '1234567891245-0', '1234567891278-0')).to eq(
         [
           ['1234567891245-0', { 'key2' => 'value2' }],
           ['1234567891245-1', { 'key3' => 'value3' }],
+          ['1234567891278-0', { 'key4' => 'value4' }]
+        ]
+      )
+    end
+
+    it 'returns entries with both a lower and an upper limit exclusive' do
+      expect(@redises.xrange(@key, '(1234567891245-0', '1234567891285-1')).to eq(
+        [
+          # We no longer get '1234567891245-0'
+          ['1234567891245-1', { 'key3' => 'value3' }],
           ['1234567891278-0', { 'key4' => 'value4' }],
-          ['1234567891278-1', { 'key5' => 'value5' }]
+          ['1234567891278-1', { 'key5' => 'value5' }] # Note sequence -1
         ]
       )
     end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: mock_redis
 version: !ruby/object:Gem::Version
-  version: 0.27.3
+  version: 0.28.0
 platform: ruby
 authors:
 - Shane da Silva
 - Samuel Merritt
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-10 00:00:00.000000000 Z
+date: 2021-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby2_keywords
@@ -295,7 +295,7 @@ homepage: https://github.com/sds/mock_redis
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -311,7 +311,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.4
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Redis mock that just lives in memory; useful for testing.
 test_files: