mock_redis 0.24.0 → 0.27.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.travis.yml +1 -0
- data/CHANGELOG.md +25 -0
- data/lib/mock_redis.rb +1 -1
- data/lib/mock_redis/connection_method.rb +13 -0
- data/lib/mock_redis/database.rb +2 -0
- data/lib/mock_redis/expire_wrapper.rb +1 -1
- data/lib/mock_redis/geospatial_methods.rb +1 -1
- data/lib/mock_redis/multi_db_wrapper.rb +1 -1
- data/lib/mock_redis/pipelined_wrapper.rb +1 -1
- data/lib/mock_redis/stream.rb +22 -2
- data/lib/mock_redis/stream/id.rb +0 -7
- data/lib/mock_redis/stream_methods.rb +16 -1
- data/lib/mock_redis/string_methods.rb +17 -16
- data/lib/mock_redis/transaction_wrapper.rb +1 -1
- data/lib/mock_redis/utility_methods.rb +1 -1
- data/lib/mock_redis/version.rb +1 -1
- data/mock_redis.gemspec +2 -0
- data/spec/commands/connection_spec.rb +15 -0
- data/spec/commands/del_spec.rb +17 -0
- data/spec/commands/mget_spec.rb +6 -0
- data/spec/commands/set_spec.rb +52 -6
- data/spec/commands/xadd_spec.rb +23 -5
- data/spec/commands/xlen_spec.rb +3 -1
- data/spec/commands/xrange_spec.rb +13 -0
- data/spec/commands/xread_spec.rb +66 -0
- data/spec/commands/xtrim_spec.rb +6 -0
- data/spec/spec_helper.rb +1 -2
- data/spec/support/redis_multiplexer.rb +1 -1
- metadata +22 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 5a02f4ad5b82a9a913511533ca04c80bb75025dd0a4a1537917b57d65d34982c
|
4
|
+
data.tar.gz: 0fac5aab079e4cbad0cab684f3c670ae7f0b17650670347eae1402306d2f05e3
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f5276d3d1f052bdf6c7e1ab8a78b450091ca673deb8e15bd02d4ee2e1f22aa43e98bff1cc33e03fd370e4db790ce3b59caadc5675358ffa85687e2972be873f5
|
7
|
+
data.tar.gz: ad4882bf89ce3654b99f2b90880b43a693dbd4ee7569458539d2e115dacc896ae4e86f766fbb9fed5cbab5868172b711c76d2fa7c37f9f05fc7a5a96495f6d47
|
data/.travis.yml
CHANGED
data/CHANGELOG.md
CHANGED
@@ -1,5 +1,30 @@
|
|
1
1
|
# MockRedis Changelog
|
2
2
|
|
3
|
+
### 0.27.2
|
4
|
+
|
5
|
+
* Switch `ruby2_keywords` gem from development dependency to runtime dependency
|
6
|
+
|
7
|
+
### 0.27.1
|
8
|
+
|
9
|
+
* Fix missing `ruby2_keywords` gem
|
10
|
+
* Allow passing string `offset` to `getbit` ([#203](https://github.com/sds/mock_redis/pull/203))
|
11
|
+
|
12
|
+
### 0.27.0
|
13
|
+
|
14
|
+
* Fix handling of keyword arguments on Ruby 3 ([#199](https://github.com/sds/mock_redis/pull/199))
|
15
|
+
* Allow passing string `offset` to `setbit` ([#200](https://github.com/sds/mock_redis/pull/200))
|
16
|
+
* Add `connection` method ([#201](https://github.com/sds/mock_redis/pull/201))
|
17
|
+
|
18
|
+
### 0.26.0
|
19
|
+
|
20
|
+
* Add block and count support to `xread` ([#194](https://github.com/sds/mock_redis/pull/194))
|
21
|
+
|
22
|
+
### 0.25.0
|
23
|
+
|
24
|
+
* Add support for `xread` command ([#190](https://github.com/sds/mock_redis/pull/190))
|
25
|
+
* Fix `mget` to raise error when passing empty array ([#191](https://github.com/sds/mock_redis/pull/191))
|
26
|
+
* Fix `xadd` when `maxlen` is zero ([#192](https://github.com/sds/mock_redis/pull/192))
|
27
|
+
|
3
28
|
### 0.24.0
|
4
29
|
|
5
30
|
* Fix handling of blocks within `multi` blocks ([#185](https://github.com/sds/mock_redis/pull/185))
|
data/lib/mock_redis.rb
CHANGED
data/lib/mock_redis/database.rb
CHANGED
@@ -11,6 +11,7 @@ require 'mock_redis/info_method'
|
|
11
11
|
require 'mock_redis/utility_methods'
|
12
12
|
require 'mock_redis/geospatial_methods'
|
13
13
|
require 'mock_redis/stream_methods'
|
14
|
+
require 'mock_redis/connection_method'
|
14
15
|
|
15
16
|
class MockRedis
|
16
17
|
class Database
|
@@ -24,6 +25,7 @@ class MockRedis
|
|
24
25
|
include UtilityMethods
|
25
26
|
include GeospatialMethods
|
26
27
|
include StreamMethods
|
28
|
+
include ConnectionMethod
|
27
29
|
|
28
30
|
attr_reader :data, :expire_times
|
29
31
|
|
@@ -18,7 +18,7 @@ class MockRedis
|
|
18
18
|
@pipelined_futures = @pipelined_futures.clone
|
19
19
|
end
|
20
20
|
|
21
|
-
def method_missing(method, *args, &block)
|
21
|
+
ruby2_keywords def method_missing(method, *args, &block)
|
22
22
|
if in_pipeline?
|
23
23
|
future = MockRedis::Future.new([method, *args], block)
|
24
24
|
@pipelined_futures << future
|
data/lib/mock_redis/stream.rb
CHANGED
@@ -23,14 +23,26 @@ class MockRedis
|
|
23
23
|
|
24
24
|
def add(id, values)
|
25
25
|
@last_id = MockRedis::Stream::Id.new(id, min: @last_id)
|
26
|
+
if @last_id.to_s == '0-0'
|
27
|
+
raise Redis::CommandError,
|
28
|
+
'ERR The ID specified in XADD must be greater than 0-0'
|
29
|
+
end
|
26
30
|
members.add [@last_id, Hash[values.map { |k, v| [k.to_s, v.to_s] }]]
|
27
31
|
@last_id.to_s
|
28
32
|
end
|
29
33
|
|
30
34
|
def trim(count)
|
31
35
|
deleted = @members.size - count
|
32
|
-
|
33
|
-
|
36
|
+
if deleted > 0
|
37
|
+
@members = if count == 0
|
38
|
+
Set.new
|
39
|
+
else
|
40
|
+
@members.to_a[-count..-1].to_set
|
41
|
+
end
|
42
|
+
deleted
|
43
|
+
else
|
44
|
+
0
|
45
|
+
end
|
34
46
|
end
|
35
47
|
|
36
48
|
def range(start, finish, reversed, *opts_in)
|
@@ -45,6 +57,14 @@ class MockRedis
|
|
45
57
|
items
|
46
58
|
end
|
47
59
|
|
60
|
+
def read(id, *opts_in)
|
61
|
+
opts = options opts_in, %w[count block]
|
62
|
+
stream_id = MockRedis::Stream::Id.new(id)
|
63
|
+
items = members.select { |m| (stream_id < m[0]) }.map { |m| [m[0].to_s, m[1]] }
|
64
|
+
return items.first(opts['count'].to_i) if opts.key?('count')
|
65
|
+
items
|
66
|
+
end
|
67
|
+
|
48
68
|
def each
|
49
69
|
members.each { |m| yield m }
|
50
70
|
end
|
data/lib/mock_redis/stream/id.rb
CHANGED
@@ -31,13 +31,6 @@ class MockRedis
|
|
31
31
|
@timestamp = id
|
32
32
|
end
|
33
33
|
@sequence = @sequence.nil? ? sequence : @sequence.to_i
|
34
|
-
if @timestamp == 0 && @sequence == 0
|
35
|
-
raise Redis::CommandError,
|
36
|
-
'ERR The ID specified in XADD is equal or smaller than ' \
|
37
|
-
'the target stream top item'
|
38
|
-
# TOOD: Redis version 6.0.4, w redis 4.2.1 generates the following error message:
|
39
|
-
# 'ERR The ID specified in XADD must be greater than 0-0'
|
40
|
-
end
|
41
34
|
if self <= min
|
42
35
|
raise Redis::CommandError,
|
43
36
|
'ERR The ID specified in XADD is equal or smaller than ' \
|
@@ -4,7 +4,6 @@ require 'mock_redis/stream'
|
|
4
4
|
|
5
5
|
# TODO: Implement the following commands
|
6
6
|
#
|
7
|
-
# * xread
|
8
7
|
# * xgroup
|
9
8
|
# * xreadgroup
|
10
9
|
# * xack
|
@@ -67,6 +66,22 @@ class MockRedis
|
|
67
66
|
end
|
68
67
|
end
|
69
68
|
|
69
|
+
def xread(keys, ids, count: nil, block: nil)
|
70
|
+
args = []
|
71
|
+
args += ['COUNT', count] if count
|
72
|
+
args += ['BLOCK', block.to_i] if block
|
73
|
+
result = {}
|
74
|
+
keys = keys.is_a?(Array) ? keys : [keys]
|
75
|
+
ids = ids.is_a?(Array) ? ids : [ids]
|
76
|
+
keys.each_with_index do |key, index|
|
77
|
+
with_stream_at(key) do |stream|
|
78
|
+
data = stream.read(ids[index], *args)
|
79
|
+
result[key] = data unless data.empty?
|
80
|
+
end
|
81
|
+
end
|
82
|
+
result
|
83
|
+
end
|
84
|
+
|
70
85
|
private
|
71
86
|
|
72
87
|
def with_stream_at(key, &blk)
|
@@ -93,6 +93,7 @@ class MockRedis
|
|
93
93
|
def getbit(key, offset)
|
94
94
|
assert_stringy(key)
|
95
95
|
|
96
|
+
offset = offset.to_i
|
96
97
|
offset_of_byte = offset / 8
|
97
98
|
offset_within_byte = offset % 8
|
98
99
|
|
@@ -154,9 +155,10 @@ class MockRedis
|
|
154
155
|
end
|
155
156
|
|
156
157
|
def mget(*keys)
|
158
|
+
keys.flatten!
|
159
|
+
|
157
160
|
assert_has_args(keys, 'mget')
|
158
161
|
|
159
|
-
keys.flatten!
|
160
162
|
keys.map do |key|
|
161
163
|
get(key) if stringy?(key)
|
162
164
|
end
|
@@ -200,18 +202,19 @@ class MockRedis
|
|
200
202
|
msetnx(*hash.to_a.flatten)
|
201
203
|
end
|
202
204
|
|
203
|
-
|
205
|
+
# Parameer list required to ensure the ArgumentError is returned correctly
|
206
|
+
# rubocop:disable Metrics/ParameterLists
|
207
|
+
def set(key, value, ex: nil, px: nil, nx: nil, xx: nil, keepttl: nil)
|
204
208
|
key = key.to_s
|
205
209
|
return_true = false
|
206
|
-
|
207
|
-
if options.delete(:nx)
|
210
|
+
if nx
|
208
211
|
if exists?(key)
|
209
212
|
return false
|
210
213
|
else
|
211
214
|
return_true = true
|
212
215
|
end
|
213
216
|
end
|
214
|
-
if
|
217
|
+
if xx
|
215
218
|
if exists?(key)
|
216
219
|
return_true = true
|
217
220
|
else
|
@@ -220,27 +223,24 @@ class MockRedis
|
|
220
223
|
end
|
221
224
|
data[key] = value.to_s
|
222
225
|
|
223
|
-
|
224
|
-
if
|
225
|
-
if
|
226
|
+
remove_expiration(key) unless keepttl
|
227
|
+
if ex
|
228
|
+
if ex == 0
|
226
229
|
raise Redis::CommandError, 'ERR invalid expire time in set'
|
227
230
|
end
|
228
|
-
expire(key,
|
231
|
+
expire(key, ex)
|
229
232
|
end
|
230
233
|
|
231
|
-
|
232
|
-
|
233
|
-
if duration == 0
|
234
|
+
if px
|
235
|
+
if px == 0
|
234
236
|
raise Redis::CommandError, 'ERR invalid expire time in set'
|
235
237
|
end
|
236
|
-
pexpire(key,
|
237
|
-
end
|
238
|
-
unless options.empty?
|
239
|
-
raise ArgumentError, "unknown keyword: #{options.keys[0]}"
|
238
|
+
pexpire(key, px)
|
240
239
|
end
|
241
240
|
|
242
241
|
return_true ? true : 'OK'
|
243
242
|
end
|
243
|
+
# rubocop:enable Metrics/ParameterLists
|
244
244
|
|
245
245
|
def setbit(key, offset, value)
|
246
246
|
assert_stringy(key, 'ERR bit is not an integer or out of range')
|
@@ -248,6 +248,7 @@ class MockRedis
|
|
248
248
|
|
249
249
|
str = data[key] || ''
|
250
250
|
|
251
|
+
offset = offset.to_i
|
251
252
|
offset_of_byte = offset / 8
|
252
253
|
offset_within_byte = offset % 8
|
253
254
|
|
@@ -15,7 +15,7 @@ class MockRedis
|
|
15
15
|
@multi_block_given = false
|
16
16
|
end
|
17
17
|
|
18
|
-
def method_missing(method, *args, &block)
|
18
|
+
ruby2_keywords def method_missing(method, *args, &block)
|
19
19
|
if in_multi?
|
20
20
|
future = MockRedis::Future.new([method, *args], block)
|
21
21
|
@transaction_futures << future
|
data/lib/mock_redis/version.rb
CHANGED
data/mock_redis.gemspec
CHANGED
@@ -23,6 +23,8 @@ Gem::Specification.new do |s|
|
|
23
23
|
|
24
24
|
s.required_ruby_version = '>= 2.4'
|
25
25
|
|
26
|
+
s.add_runtime_dependency 'ruby2_keywords'
|
27
|
+
|
26
28
|
s.add_development_dependency 'redis', '~> 4.2.0'
|
27
29
|
s.add_development_dependency 'rspec', '~> 3.0'
|
28
30
|
s.add_development_dependency 'rspec-its', '~> 1.0'
|
@@ -0,0 +1,15 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
describe '#connection' do
|
4
|
+
let(:redis) { @redises.mock }
|
5
|
+
|
6
|
+
it 'returns the correct values' do
|
7
|
+
redis.connection.should == {
|
8
|
+
:host => '127.0.0.1',
|
9
|
+
:port => 6379,
|
10
|
+
:db => 0,
|
11
|
+
:id => 'redis://127.0.0.1:6379/0',
|
12
|
+
:location => '127.0.0.1:6379'
|
13
|
+
}
|
14
|
+
end
|
15
|
+
end
|
data/spec/commands/del_spec.rb
CHANGED
@@ -1,6 +1,16 @@
|
|
1
1
|
require 'spec_helper'
|
2
2
|
|
3
3
|
describe '#del(key [, key, ...])' do
|
4
|
+
before :all do
|
5
|
+
sleep 1 - (Time.now.to_f % 1)
|
6
|
+
end
|
7
|
+
|
8
|
+
before :each do
|
9
|
+
# TODO: Redis appears to be returning a timestamp a few seconds in the future
|
10
|
+
# so we're ignoring the last 5 digits (time in milliseconds)
|
11
|
+
@redises._gsub(/\d{5}-\d/, '...-.')
|
12
|
+
end
|
13
|
+
|
4
14
|
it 'returns the number of keys deleted' do
|
5
15
|
@redises.set('mock-redis-test:1', 1)
|
6
16
|
@redises.set('mock-redis-test:2', 1)
|
@@ -32,4 +42,11 @@ describe '#del(key [, key, ...])' do
|
|
32
42
|
it 'raises an error if an empty array is given' do
|
33
43
|
expect { @redises.del [] }.to raise_error Redis::CommandError
|
34
44
|
end
|
45
|
+
|
46
|
+
it 'removes a stream key' do
|
47
|
+
@redises.xadd('mock-redis-stream', { key: 'value' }, maxlen: 0)
|
48
|
+
expect(@redises.exists?('mock-redis-stream')).to eq true
|
49
|
+
@redises.del('mock-redis-stream')
|
50
|
+
expect(@redises.exists?('mock-redis-stream')).to eq false
|
51
|
+
end
|
35
52
|
end
|
data/spec/commands/mget_spec.rb
CHANGED
@@ -49,5 +49,11 @@ describe '#mget(key [, key, ...])' do
|
|
49
49
|
@redises.mget
|
50
50
|
end.should raise_error(Redis::CommandError)
|
51
51
|
end
|
52
|
+
|
53
|
+
it 'raises an error if you pass it empty array' do
|
54
|
+
lambda do
|
55
|
+
@redises.mget([])
|
56
|
+
end.should raise_error(Redis::CommandError)
|
57
|
+
end
|
52
58
|
end
|
53
59
|
end
|
data/spec/commands/set_spec.rb
CHANGED
@@ -1,6 +1,8 @@
|
|
1
1
|
require 'spec_helper'
|
2
2
|
|
3
3
|
describe '#set(key, value)' do
|
4
|
+
let(:key) { 'mock-redis-test' }
|
5
|
+
|
4
6
|
it "responds with 'OK'" do
|
5
7
|
@redises.set('mock-redis-test', 1).should == 'OK'
|
6
8
|
end
|
@@ -19,26 +21,72 @@ describe '#set(key, value)' do
|
|
19
21
|
end
|
20
22
|
|
21
23
|
it 'accepts NX' do
|
22
|
-
key = 'mock-redis-test'
|
23
24
|
@redises.del(key)
|
24
25
|
@redises.set(key, 1, nx: true).should == true
|
25
26
|
@redises.set(key, 1, nx: true).should == false
|
26
27
|
end
|
27
28
|
|
28
29
|
it 'accepts XX' do
|
29
|
-
key = 'mock-redis-test'
|
30
30
|
@redises.del(key)
|
31
31
|
@redises.set(key, 1, xx: true).should == false
|
32
32
|
@redises.set(key, 1).should == 'OK'
|
33
33
|
@redises.set(key, 1, xx: true).should == true
|
34
34
|
end
|
35
35
|
|
36
|
+
it 'sets the ttl to -1' do
|
37
|
+
@redises.set(key, 1)
|
38
|
+
expect(@redises.ttl(key)).to eq(-1)
|
39
|
+
end
|
40
|
+
|
41
|
+
context 'with an expiry time' do
|
42
|
+
before :each do
|
43
|
+
Timecop.freeze
|
44
|
+
@redises.set(key, 1, ex: 90)
|
45
|
+
end
|
46
|
+
|
47
|
+
after :each do
|
48
|
+
@redises.del(key)
|
49
|
+
Timecop.return
|
50
|
+
end
|
51
|
+
|
52
|
+
it 'has the TTL set' do
|
53
|
+
expect(@redises.ttl(key)).to eq 90
|
54
|
+
end
|
55
|
+
|
56
|
+
it 'resets the TTL without keepttl' do
|
57
|
+
expect do
|
58
|
+
@redises.set(key, 2)
|
59
|
+
end.to change { @redises.ttl(key) }.from(90).to(-1)
|
60
|
+
end
|
61
|
+
|
62
|
+
it 'does not change the TTL with keepttl: true' do
|
63
|
+
expect do
|
64
|
+
@redises.set(key, 2, keepttl: true)
|
65
|
+
end.not_to change { @redises.ttl(key) }.from(90)
|
66
|
+
end
|
67
|
+
end
|
68
|
+
|
69
|
+
it 'accepts KEEPTTL' do
|
70
|
+
expect(@redises.set(key, 1, keepttl: true)).to eq 'OK'
|
71
|
+
end
|
72
|
+
|
73
|
+
it 'does not set TTL without ex' do
|
74
|
+
@redises.set(key, 1)
|
75
|
+
expect(@redises.ttl(key)).to eq(-1)
|
76
|
+
end
|
77
|
+
|
78
|
+
it 'sets the TTL' do
|
79
|
+
Timecop.freeze do
|
80
|
+
@redises.set(key, 1, ex: 90)
|
81
|
+
expect(@redises.ttl(key)).to eq 90
|
82
|
+
end
|
83
|
+
end
|
84
|
+
|
36
85
|
it 'raises on unknown options' do
|
37
|
-
key = 'mock-redis-test'
|
38
86
|
@redises.del(key)
|
39
87
|
expect do
|
40
88
|
@redises.set(key, 1, logger: :something)
|
41
|
-
end.to raise_error(ArgumentError,
|
89
|
+
end.to raise_error(ArgumentError, /unknown keyword/)
|
42
90
|
end
|
43
91
|
|
44
92
|
context '[mock only]' do
|
@@ -52,7 +100,6 @@ describe '#set(key, value)' do
|
|
52
100
|
end
|
53
101
|
|
54
102
|
it 'accepts EX seconds' do
|
55
|
-
key = 'mock-redis-test'
|
56
103
|
@mock.set(key, 1, ex: 1).should == 'OK'
|
57
104
|
@mock.get(key).should_not be_nil
|
58
105
|
Time.stub(:now).and_return(@now + 2)
|
@@ -60,7 +107,6 @@ describe '#set(key, value)' do
|
|
60
107
|
end
|
61
108
|
|
62
109
|
it 'accepts PX milliseconds' do
|
63
|
-
key = 'mock-redis-test'
|
64
110
|
@mock.set(key, 1, px: 500).should == 'OK'
|
65
111
|
@mock.get(key).should_not be_nil
|
66
112
|
Time.stub(:now).and_return(@now + 300 / 1000.to_f)
|
data/spec/commands/xadd_spec.rb
CHANGED
@@ -7,11 +7,14 @@ describe '#xadd("mystream", { f1: "v1", f2: "v2" }, id: "0-0", maxlen: 1000, app
|
|
7
7
|
end
|
8
8
|
|
9
9
|
before :each do
|
10
|
-
|
10
|
+
# TODO: Redis appears to be returning a timestamp a few seconds in the future
|
11
|
+
# so we're ignoring the last 5 digits (time in milliseconds)
|
12
|
+
@redises._gsub(/\d{5}-\d/, '....-.')
|
11
13
|
end
|
12
14
|
|
13
15
|
it 'returns an id based on the timestamp' do
|
14
16
|
t = Time.now.to_i
|
17
|
+
id = @redises.xadd(@key, key: 'value')
|
15
18
|
expect(@redises.xadd(@key, key: 'value')).to match(/#{t}\d{3}-0/)
|
16
19
|
end
|
17
20
|
|
@@ -52,10 +55,7 @@ describe '#xadd("mystream", { f1: "v1", f2: "v2" }, id: "0-0", maxlen: 1000, app
|
|
52
55
|
expect { @redises.xadd('mock-redis-test:unknown-stream', { key: 'value' }, id: '0') }
|
53
56
|
.to raise_error(
|
54
57
|
Redis::CommandError,
|
55
|
-
'ERR The ID specified in XADD
|
56
|
-
'stream top item'
|
57
|
-
# TOOD: Redis version 6.0.4, w redis 4.2.1 generates the following error message:
|
58
|
-
# 'ERR The ID specified in XADD must be greater than 0-0'
|
58
|
+
'ERR The ID specified in XADD must be greater than 0-0'
|
59
59
|
)
|
60
60
|
end
|
61
61
|
|
@@ -101,4 +101,22 @@ describe '#xadd("mystream", { f1: "v1", f2: "v2" }, id: "0-0", maxlen: 1000, app
|
|
101
101
|
]
|
102
102
|
)
|
103
103
|
end
|
104
|
+
|
105
|
+
it 'supports a maxlen greater than the current size' do
|
106
|
+
@redises.xadd(@key, { key1: 'value1' }, id: '1234567891234-0')
|
107
|
+
@redises.xadd(@key, { key2: 'value2' }, id: '1234567891245-0', maxlen: 1000)
|
108
|
+
expect(@redises.xrange(@key, '-', '+')).to eq(
|
109
|
+
[
|
110
|
+
['1234567891234-0', { 'key1' => 'value1' }],
|
111
|
+
['1234567891245-0', { 'key2' => 'value2' }],
|
112
|
+
]
|
113
|
+
)
|
114
|
+
end
|
115
|
+
|
116
|
+
it 'creates an empty stream with maxlen of 0' do
|
117
|
+
@redises.xadd(@key, { key: 'value' }, maxlen: 0)
|
118
|
+
expect(@redises.xlen(@key)).to eq 0
|
119
|
+
expect(@redises.xrange(@key, '-', '+')).to eq([])
|
120
|
+
expect(@redises.exists?(@key)).to eq true
|
121
|
+
end
|
104
122
|
end
|
data/spec/commands/xlen_spec.rb
CHANGED
@@ -7,7 +7,9 @@ describe '#xlen(key)' do
|
|
7
7
|
end
|
8
8
|
|
9
9
|
before :each do
|
10
|
-
|
10
|
+
# TODO: Redis appears to be returning a timestamp a few seconds in the future
|
11
|
+
# so we're ignoring the last 5 digits (time in milliseconds)
|
12
|
+
@redises._gsub(/\d{5}-\d/, '...-.')
|
11
13
|
end
|
12
14
|
|
13
15
|
it 'returns the number of items in the stream' do
|
@@ -54,6 +54,19 @@ describe '#xrange("mystream", first: "0-1", last: "0-3", count: 10)' do
|
|
54
54
|
)
|
55
55
|
end
|
56
56
|
|
57
|
+
it 'returns all entries with a lower limit of 0-0' do
|
58
|
+
expect(@redises.xrange(@key, '0-0', '+')).to eq(
|
59
|
+
[
|
60
|
+
['1234567891234-0', { 'key1' => 'value1' }],
|
61
|
+
['1234567891245-0', { 'key2' => 'value2' }],
|
62
|
+
['1234567891245-1', { 'key3' => 'value3' }],
|
63
|
+
['1234567891278-0', { 'key4' => 'value4' }],
|
64
|
+
['1234567891278-1', { 'key5' => 'value5' }],
|
65
|
+
['1234567891299-0', { 'key6' => 'value6' }]
|
66
|
+
]
|
67
|
+
)
|
68
|
+
end
|
69
|
+
|
57
70
|
it 'returns entries with an upper limit' do
|
58
71
|
expect(@redises.xrange(@key, '-', '1234567891285-0')).to eq(
|
59
72
|
[
|
@@ -0,0 +1,66 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
describe '#xread(keys, ids)' do
|
4
|
+
before :all do
|
5
|
+
sleep 1 - (Time.now.to_f % 1)
|
6
|
+
@key = 'mock-redis-test:xread'
|
7
|
+
@key1 = 'mock-redis-test:xread1'
|
8
|
+
end
|
9
|
+
|
10
|
+
it 'reads a single entry' do
|
11
|
+
@redises.xadd(@key, { key: 'value' }, id: '1234567891234-0')
|
12
|
+
expect(@redises.xread(@key, '0-0'))
|
13
|
+
.to eq({ @key => [['1234567891234-0', { 'key' => 'value' }]] })
|
14
|
+
end
|
15
|
+
|
16
|
+
it 'reads multiple entries from the beginning of the stream' do
|
17
|
+
@redises.xadd(@key, { key0: 'value0' }, id: '1234567891234-0')
|
18
|
+
@redises.xadd(@key, { key1: 'value1' }, id: '1234567891234-1')
|
19
|
+
expect(@redises.xread(@key, '0-0'))
|
20
|
+
.to eq({ @key => [['1234567891234-0', { 'key0' => 'value0' }],
|
21
|
+
['1234567891234-1', { 'key1' => 'value1' }]] })
|
22
|
+
end
|
23
|
+
|
24
|
+
it 'reads entries greater than the ID passed' do
|
25
|
+
@redises.xadd(@key, { key0: 'value0' }, id: '1234567891234-0')
|
26
|
+
@redises.xadd(@key, { key1: 'value1' }, id: '1234567891234-1')
|
27
|
+
expect(@redises.xread(@key, '1234567891234-0'))
|
28
|
+
.to eq({ @key => [['1234567891234-1', { 'key1' => 'value1' }]] })
|
29
|
+
end
|
30
|
+
|
31
|
+
it 'reads from multiple streams' do
|
32
|
+
@redises.xadd(@key, { key: 'value' }, id: '1234567891234-0')
|
33
|
+
@redises.xadd(@key1, { key1: 'value1' }, id: '1234567891234-0')
|
34
|
+
expect(@redises.xread([@key, @key1], %w[0-0 0-0]))
|
35
|
+
.to eq({ @key => [['1234567891234-0', { 'key' => 'value' }]],
|
36
|
+
@key1 => [['1234567891234-0', { 'key1' => 'value1' }]] })
|
37
|
+
end
|
38
|
+
|
39
|
+
it 'reads from multiple streams at the given IDs' do
|
40
|
+
@redises.xadd(@key, { key: 'value0' }, id: '1234567891234-0')
|
41
|
+
@redises.xadd(@key, { key: 'value1' }, id: '1234567891234-1')
|
42
|
+
@redises.xadd(@key, { key: 'value2' }, id: '1234567891234-2')
|
43
|
+
@redises.xadd(@key1, { key1: 'value0' }, id: '1234567891234-0')
|
44
|
+
@redises.xadd(@key1, { key1: 'value1' }, id: '1234567891234-1')
|
45
|
+
@redises.xadd(@key1, { key1: 'value2' }, id: '1234567891234-2')
|
46
|
+
# The first stream won't return anything since we specify the last ID
|
47
|
+
expect(@redises.xread([@key, @key1], %w[1234567891234-2 1234567891234-1]))
|
48
|
+
.to eq({ @key1 => [['1234567891234-2', { 'key1' => 'value2' }]] })
|
49
|
+
end
|
50
|
+
|
51
|
+
it 'supports the block parameter' do
|
52
|
+
@redises.xadd(@key, { key: 'value' }, id: '1234567891234-0')
|
53
|
+
expect(@redises.xread(@key, '0-0', block: 1000))
|
54
|
+
.to eq({ @key => [['1234567891234-0', { 'key' => 'value' }]] })
|
55
|
+
end
|
56
|
+
|
57
|
+
it 'limits results with count' do
|
58
|
+
@redises.xadd(@key, { key: 'value' }, id: '1234567891234-0')
|
59
|
+
@redises.xadd(@key, { key: 'value' }, id: '1234567891234-1')
|
60
|
+
@redises.xadd(@key, { key: 'value' }, id: '1234567891234-2')
|
61
|
+
expect(@redises.xread(@key, '0-0', count: 1))
|
62
|
+
.to eq({ @key => [['1234567891234-0', { 'key' => 'value' }]] })
|
63
|
+
expect(@redises.xread(@key, '1234567891234-0', count: 1))
|
64
|
+
.to eq({ @key => [['1234567891234-1', { 'key' => 'value' }]] })
|
65
|
+
end
|
66
|
+
end
|
data/spec/commands/xtrim_spec.rb
CHANGED
@@ -16,6 +16,12 @@ describe '#xtrim("mystream", 1000, approximate: true)' do
|
|
16
16
|
expect(@redises.xtrim(@key, 4)).to eq 2
|
17
17
|
end
|
18
18
|
|
19
|
+
it 'returns 0 if count is greater than size' do
|
20
|
+
initial = @redises.xrange(@key, '-', '+')
|
21
|
+
expect(@redises.xtrim(@key, 1000)).to eq 0
|
22
|
+
expect(@redises.xrange(@key, '-', '+')).to eql(initial)
|
23
|
+
end
|
24
|
+
|
19
25
|
it 'deletes the oldes elements' do
|
20
26
|
@redises.xtrim(@key, 4)
|
21
27
|
expect(@redises.xrange(@key, '-', '+')).to eq(
|
data/spec/spec_helper.rb
CHANGED
@@ -11,6 +11,7 @@ end
|
|
11
11
|
require 'rspec/its'
|
12
12
|
require 'redis'
|
13
13
|
$LOAD_PATH.unshift(File.expand_path(File.join(__FILE__, '..', '..', 'lib')))
|
14
|
+
require 'ruby2_keywords'
|
14
15
|
require 'mock_redis'
|
15
16
|
require 'timecop'
|
16
17
|
|
@@ -40,8 +41,6 @@ end
|
|
40
41
|
RSpec.configure do |config|
|
41
42
|
config.expect_with :rspec do |c|
|
42
43
|
c.syntax = [:expect, :should]
|
43
|
-
# Allow for a large output so we can debug error messages
|
44
|
-
c.max_formatted_output_length = 1_000_000
|
45
44
|
end
|
46
45
|
|
47
46
|
config.mock_with :rspec do |c|
|
@@ -23,7 +23,7 @@ class RedisMultiplexer < BlankSlate
|
|
23
23
|
@gsub_from = @gsub_to = ''
|
24
24
|
end
|
25
25
|
|
26
|
-
def method_missing(method, *args, &blk)
|
26
|
+
ruby2_keywords def method_missing(method, *args, &blk)
|
27
27
|
# If we're in a Redis command that accepts a block, and we execute more
|
28
28
|
# redis commands, ONLY execute them on the Redis implementation that the
|
29
29
|
# block came from.
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: mock_redis
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.27.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Shane da Silva
|
@@ -9,8 +9,22 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date:
|
12
|
+
date: 2021-01-07 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
|
+
- !ruby/object:Gem::Dependency
|
15
|
+
name: ruby2_keywords
|
16
|
+
requirement: !ruby/object:Gem::Requirement
|
17
|
+
requirements:
|
18
|
+
- - ">="
|
19
|
+
- !ruby/object:Gem::Version
|
20
|
+
version: '0'
|
21
|
+
type: :runtime
|
22
|
+
prerelease: false
|
23
|
+
version_requirements: !ruby/object:Gem::Requirement
|
24
|
+
requirements:
|
25
|
+
- - ">="
|
26
|
+
- !ruby/object:Gem::Version
|
27
|
+
version: '0'
|
14
28
|
- !ruby/object:Gem::Dependency
|
15
29
|
name: redis
|
16
30
|
requirement: !ruby/object:Gem::Requirement
|
@@ -90,6 +104,7 @@ files:
|
|
90
104
|
- Rakefile
|
91
105
|
- lib/mock_redis.rb
|
92
106
|
- lib/mock_redis/assertions.rb
|
107
|
+
- lib/mock_redis/connection_method.rb
|
93
108
|
- lib/mock_redis/database.rb
|
94
109
|
- lib/mock_redis/exceptions.rb
|
95
110
|
- lib/mock_redis/expire_wrapper.rb
|
@@ -126,6 +141,7 @@ files:
|
|
126
141
|
- spec/commands/brpop_spec.rb
|
127
142
|
- spec/commands/brpoplpush_spec.rb
|
128
143
|
- spec/commands/connected_spec.rb
|
144
|
+
- spec/commands/connection_spec.rb
|
129
145
|
- spec/commands/dbsize_spec.rb
|
130
146
|
- spec/commands/decr_spec.rb
|
131
147
|
- spec/commands/decrby_spec.rb
|
@@ -241,6 +257,7 @@ files:
|
|
241
257
|
- spec/commands/xadd_spec.rb
|
242
258
|
- spec/commands/xlen_spec.rb
|
243
259
|
- spec/commands/xrange_spec.rb
|
260
|
+
- spec/commands/xread_spec.rb
|
244
261
|
- spec/commands/xrevrange_spec.rb
|
245
262
|
- spec/commands/xtrim_spec.rb
|
246
263
|
- spec/commands/zadd_spec.rb
|
@@ -293,7 +310,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
293
310
|
- !ruby/object:Gem::Version
|
294
311
|
version: '0'
|
295
312
|
requirements: []
|
296
|
-
rubygems_version: 3.1.
|
313
|
+
rubygems_version: 3.1.4
|
297
314
|
signing_key:
|
298
315
|
specification_version: 4
|
299
316
|
summary: Redis mock that just lives in memory; useful for testing.
|
@@ -310,6 +327,7 @@ test_files:
|
|
310
327
|
- spec/commands/brpop_spec.rb
|
311
328
|
- spec/commands/brpoplpush_spec.rb
|
312
329
|
- spec/commands/connected_spec.rb
|
330
|
+
- spec/commands/connection_spec.rb
|
313
331
|
- spec/commands/dbsize_spec.rb
|
314
332
|
- spec/commands/decr_spec.rb
|
315
333
|
- spec/commands/decrby_spec.rb
|
@@ -425,6 +443,7 @@ test_files:
|
|
425
443
|
- spec/commands/xadd_spec.rb
|
426
444
|
- spec/commands/xlen_spec.rb
|
427
445
|
- spec/commands/xrange_spec.rb
|
446
|
+
- spec/commands/xread_spec.rb
|
428
447
|
- spec/commands/xrevrange_spec.rb
|
429
448
|
- spec/commands/xtrim_spec.rb
|
430
449
|
- spec/commands/zadd_spec.rb
|