mock_redis 0.34.0 → 0.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85e71d6b9f2fa3400db015c2c29a7f8c0d017c1c6c0f44f45c404fd1eb8d6fd6
-  data.tar.gz: b61b3a420aa7dc9232fffbddd263c82719665cc738e1e36834d95fcd9566cff3
+  metadata.gz: dac18dd7d43fb11953bf9988a89d64d8f82a0d6b909836d215880b5fc6c75e98
+  data.tar.gz: e34af1ec074a43fbdeefa25e27543c57a146e0e22900842875adfca1fed3a698
 SHA512:
-  metadata.gz: ce57715bda59804aeed319d49a76d81ac9cd1e4d9093005402dd256b804b20245c2a723051eef79c7da883896e75b72b91fe0066ae6e830dd1d24130a751b965
-  data.tar.gz: b4a4d237d9705b64b973fd5959ed2544fd8fbf037f5525b1080d647c1b4a1743fb22110e8d5af4cf4077ba7a185e880f4cfbb303ff23346db3611adc64d5aab3
+  metadata.gz: a47e3c68ad32983cd4017ba6541dbfe3004d197468179713d5102bbe094a9978256831f9ee3d3c9a7abf8ec0c07b18ee8c04b911e9ca326e8d04da8288b8131e
+  data.tar.gz: 119d337effa67690de4754bfa9bfe37bcceade74089b73d8328fd7818877b14afb708ba432ea7b52c6299186d7dad736b14de95acde7bb51909ad6096eb1a143

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # MockRedis Changelog
 
+### 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`
+
 ### 0.34.0
 
 * Add support for `with`

data/README.md

@@ -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/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,6 +92,22 @@ class MockRedis
       with_list_at(key, &:length)
     end
 
+    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)
       with_list_at(key, &:shift)
     end

data/lib/mock_redis/set_methods.rb

@@ -64,6 +64,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

data/lib/mock_redis/string_methods.rb

@@ -107,6 +107,12 @@ class MockRedis
       end
     end
 
+    def getdel(key)
+      value = get(key)
+      del(key)
+      value
+    end
+
     def getrange(key, start, stop)
       assert_stringy(key)
       (data[key] || '')[start..stop]

data/lib/mock_redis/version.rb

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

data/lib/mock_redis/zset_methods.rb

@@ -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

data/spec/commands/blmove_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+describe '#blmove(source, destination, wherefrom, whereto, timeout)' do
+  before do
+    @list1 = 'mock-redis-test:blmove-list1'
+    @list2 = 'mock-redis-test:blmove-list2'
+
+    @redises.lpush(@list1, 'b')
+    @redises.lpush(@list1, 'a')
+
+    @redises.lpush(@list2, 'y')
+    @redises.lpush(@list2, 'x')
+  end
+
+  it 'returns the value moved' do
+    @redises.blmove(@list1, @list2, 'left', 'right').should == 'a'
+  end
+
+  it 'takes the first element of source and appends it to destination' do
+    @redises.blmove(@list1, @list2, 'left', 'right')
+
+    @redises.lrange(@list1, 0, -1).should == %w[b]
+    @redises.lrange(@list2, 0, -1).should == %w[x y a]
+  end
+
+  it 'raises an error on negative timeout' do
+    lambda do
+      @redises.blmove(@list1, @list2, 'left', 'right', :timeout => -1)
+    end.should raise_error(Redis::CommandError)
+  end
+
+  let(:default_error) { RedisMultiplexer::MismatchedResponse }
+  it_should_behave_like 'a list-only command'
+
+  context '[mock only]' do
+    it 'ignores positive timeouts and returns nil' do
+      @redises.mock.blmove('mock-redis-test:not-here', @list1, 'left', 'right', :timeout => 1).
+        should be_nil
+    end
+
+    it 'ignores positive legacy timeouts and returns nil' do
+      @redises.mock.blmove('mock-redis-test:not-here', @list1, 'left', 'right', 1).
+        should be_nil
+    end
+
+    it 'raises WouldBlock on zero timeout (no blocking in the mock)' do
+      lambda do
+        @redises.mock.blmove('mock-redis-test:not-here', @list1, 'left', 'right', :timeout => 0)
+      end.should raise_error(MockRedis::WouldBlock)
+    end
+  end
+end

data/spec/commands/getdel.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe '#getdel(key)' do
+  before do
+    @key = 'mock-redis-test:73288'
+  end
+
+  it 'returns nil for a nonexistent value' do
+    @redises.getdel('mock-redis-test:does-not-exist').should be_nil
+  end
+
+  it 'returns a stored string value' do
+    @redises.set(@key, 'forsooth')
+    @redises.getdel(@key).should == 'forsooth'
+  end
+
+  it 'deletes the key after returning it' do
+    @redises.set(@key, 'forsooth')
+    @redises.getdel(@key)
+    @redises.get(@key).should be_nil
+  end
+
+  it_should_behave_like 'a string-only command'
+end

data/spec/commands/lmove_spec.rb

@@ -0,0 +1,72 @@
+require 'spec_helper'
+
+describe '#lmove(source, destination, wherefrom, whereto)' do
+  before do
+    @list1 = 'mock-redis-test:lmove-list1'
+    @list2 = 'mock-redis-test:lmove-list2'
+
+    @redises.lpush(@list1, 'b')
+    @redises.lpush(@list1, 'a')
+
+    @redises.lpush(@list2, 'y')
+    @redises.lpush(@list2, 'x')
+  end
+
+  it 'returns the value moved' do
+    @redises.lmove(@list1, @list2, 'left', 'right').should == 'a'
+  end
+
+  it "returns nil and doesn't append if source empty" do
+    @redises.lmove('empty', @list1, 'left', 'right').should be_nil
+    @redises.lrange(@list1, 0, -1).should == %w[a b]
+  end
+
+  it 'takes the first element of source and prepends it to destination' do
+    @redises.lmove(@list1, @list2, 'left', 'left')
+
+    @redises.lrange(@list1, 0, -1).should == %w[b]
+    @redises.lrange(@list2, 0, -1).should == %w[a x y]
+  end
+
+  it 'takes the first element of source and appends it to destination' do
+    @redises.lmove(@list1, @list2, 'left', 'right')
+
+    @redises.lrange(@list1, 0, -1).should == %w[b]
+    @redises.lrange(@list2, 0, -1).should == %w[x y a]
+  end
+
+  it 'takes the last element of source and prepends it to destination' do
+    @redises.lmove(@list1, @list2, 'right', 'left')
+
+    @redises.lrange(@list1, 0, -1).should == %w[a]
+    @redises.lrange(@list2, 0, -1).should == %w[b x y]
+  end
+
+  it 'takes the last element of source and appends it to destination' do
+    @redises.lmove(@list1, @list2, 'right', 'right')
+
+    @redises.lrange(@list1, 0, -1).should == %w[a]
+    @redises.lrange(@list2, 0, -1).should == %w[x y b]
+  end
+
+  it 'rotates a list when source and destination are the same' do
+    @redises.lmove(@list1, @list1, 'left', 'right')
+    @redises.lrange(@list1, 0, -1).should == %w[b a]
+  end
+
+  it 'removes empty lists' do
+    @redises.llen(@list1).times { @redises.lmove(@list1, @list2, 'left', 'right') }
+    @redises.get(@list1).should be_nil
+  end
+
+  it 'raises an error for non-list source value' do
+    @redises.set(@list1, 'string value')
+
+    lambda do
+      @redises.lmove(@list1, @list2, 'left', 'right')
+    end.should raise_error(Redis::CommandError)
+  end
+
+  let(:default_error) { RedisMultiplexer::MismatchedResponse }
+  it_should_behave_like 'a list-only command'
+end

data/spec/commands/smismember_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe '#smismember(key, *members)' do
+  before do
+    @key = 'mock-redis-test:smismember'
+    @redises.sadd(@key, 'whiskey')
+    @redises.sadd(@key, 'beer')
+  end
+
+  it 'returns true if member is in set' do
+    @redises.smismember(@key, 'whiskey').should == [true]
+    @redises.smismember(@key, 'beer').should == [true]
+    @redises.smismember(@key, 'whiskey', 'beer').should == [true, true]
+    @redises.smismember(@key, %w[whiskey beer]).should == [true, true]
+  end
+
+  it 'returns false if member is not in set' do
+    @redises.smismember(@key, 'cola').should == [false]
+    @redises.smismember(@key, 'whiskey', 'cola').should == [true, false]
+    @redises.smismember(@key, %w[whiskey beer cola]).should == [true, true, false]
+  end
+
+  it 'stringifies member' do
+    @redises.sadd(@key, '1')
+    @redises.smismember(@key, 1).should == [true]
+    @redises.smismember(@key, [1]).should == [true]
+  end
+
+  it 'treats a nonexistent value as an empty set' do
+    @redises.smismember('mock-redis-test:nonesuch', 'beer').should == [false]
+  end
+
+  it_should_behave_like 'a set-only command'
+end

data/spec/commands/zrem_spec.rb

@@ -28,6 +28,13 @@ describe '#zrem(key, member)' do
     @redises.zrange(@key, 0, -1).should == %w[one two]
   end
 
+  it 'removes integer members inside an array from the set' do
+    member = 11
+    @redises.zadd(@key, 3, member)
+    @redises.zrem(@key, [member]).should == 1
+    @redises.zrange(@key, 0, -1).should == %w[one two]
+  end
+
   it 'supports a variable number of arguments' do
     @redises.zrem(@key, %w[one two])
     @redises.zrange(@key, 0, -1).should be_empty

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mock_redis
 version: !ruby/object:Gem::Version
-  version: 0.34.0
+  version: 0.36.0
 platform: ruby
 authors:
 - Shane da Silva
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-19 00:00:00.000000000 Z
+date: 2023-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby2_keywords
@@ -138,6 +138,7 @@ files:
 - spec/commands/bgsave_spec.rb
 - spec/commands/bitcount_spec.rb
 - spec/commands/bitfield_spec.rb
+- spec/commands/blmove_spec.rb
 - spec/commands/blpop_spec.rb
 - spec/commands/brpop_spec.rb
 - spec/commands/brpoplpush_spec.rb
@@ -164,6 +165,7 @@ files:
 - spec/commands/geopos_spec.rb
 - spec/commands/get_spec.rb
 - spec/commands/getbit_spec.rb
+- spec/commands/getdel.rb
 - spec/commands/getrange_spec.rb
 - spec/commands/getset_spec.rb
 - spec/commands/hdel_spec.rb
@@ -190,6 +192,7 @@ files:
 - spec/commands/lindex_spec.rb
 - spec/commands/linsert_spec.rb
 - spec/commands/llen_spec.rb
+- spec/commands/lmove_spec.rb
 - spec/commands/lpop_spec.rb
 - spec/commands/lpush_spec.rb
 - spec/commands/lpushx_spec.rb
@@ -240,6 +243,7 @@ files:
 - spec/commands/sinterstore_spec.rb
 - spec/commands/sismember_spec.rb
 - spec/commands/smembers_spec.rb
+- spec/commands/smismember_spec.rb
 - spec/commands/smove_spec.rb
 - spec/commands/sort_list_spec.rb
 - spec/commands/sort_set_spec.rb
@@ -325,6 +329,7 @@ test_files:
 - spec/commands/bgsave_spec.rb
 - spec/commands/bitcount_spec.rb
 - spec/commands/bitfield_spec.rb
+- spec/commands/blmove_spec.rb
 - spec/commands/blpop_spec.rb
 - spec/commands/brpop_spec.rb
 - spec/commands/brpoplpush_spec.rb
@@ -351,6 +356,7 @@ test_files:
 - spec/commands/geopos_spec.rb
 - spec/commands/get_spec.rb
 - spec/commands/getbit_spec.rb
+- spec/commands/getdel.rb
 - spec/commands/getrange_spec.rb
 - spec/commands/getset_spec.rb
 - spec/commands/hdel_spec.rb
@@ -377,6 +383,7 @@ test_files:
 - spec/commands/lindex_spec.rb
 - spec/commands/linsert_spec.rb
 - spec/commands/llen_spec.rb
+- spec/commands/lmove_spec.rb
 - spec/commands/lpop_spec.rb
 - spec/commands/lpush_spec.rb
 - spec/commands/lpushx_spec.rb
@@ -427,6 +434,7 @@ test_files:
 - spec/commands/sinterstore_spec.rb
 - spec/commands/sismember_spec.rb
 - spec/commands/smembers_spec.rb
+- spec/commands/smismember_spec.rb
 - spec/commands/smove_spec.rb
 - spec/commands/sort_list_spec.rb
 - spec/commands/sort_set_spec.rb