mock_redis 0.6.6 → 0.7.0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 0.7.0
+* Implemented `mapped_mget`, `mapped_mset`, `mapped_msetnx`
+* Fixed `rpoplpush` when the `rpop` is nil
+
 ### 0.6.6
 * Avoid mutation of @data from external reference
 * Fix sorted set (e.g. `zadd`) with multiple score/member pairs

data/lib/mock_redis/list_methods.rb

@@ -150,7 +150,7 @@ class MockRedis
 
     def rpoplpush(source, destination)
       value = rpop(source)
-      lpush(destination, value)
+      lpush(destination, value) unless value.nil?
       value
     end
 

data/lib/mock_redis/string_methods.rb

@@ -99,6 +99,10 @@ class MockRedis
       end
     end
 
+    def mapped_mget(*keys)
+      Hash[keys.zip(mget(*keys))]
+    end
+
     def mset(*kvpairs)
       assert_has_args(kvpairs, 'mset')
       if kvpairs.length.odd?
@@ -112,6 +116,10 @@ class MockRedis
       "OK"
     end
 
+    def mapped_mset(hash)
+      mset(*hash.to_a.flatten)
+    end
+
     def msetnx(*kvpairs)
       assert_has_args(kvpairs, 'msetnx')
 
@@ -123,6 +131,10 @@ class MockRedis
       end
     end
 
+    def mapped_msetnx(hash)
+      msetnx(*hash.to_a.flatten)
+    end
+
     def set(key, value)
       data[key] = value.to_s
       'OK'

data/lib/mock_redis/version.rb

@@ -1,3 +1,3 @@
 class MockRedis
-  VERSION = '0.6.6'
+  VERSION = '0.7.0'
 end

data/spec/commands/mapped_mget_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe '#mapped_mget(*keys)' do
+  before do
+    @key1 = 'mock-redis-test:a'
+    @key2 = 'mock-redis-test:b'
+    @key3 = 'mock-redis-test:c'
+
+    @redises.set(@key1, '1')
+    @redises.set(@key2, '2')
+  end
+
+  it 'returns a hash' do
+    @redises.mapped_mget(@key1, @key2, @key3).should eq({@key1 => '1',
+                                                         @key2 => '2',
+                                                         @key3 => nil})
+  end
+
+  it 'returns a hash even when no matches' do
+    @redises.mapped_mget('qwer').should eq({'qwer' => nil})
+  end
+end

data/spec/commands/mapped_mset_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe '#mapped_mset(hash)' do
+  before do
+    @key1 = 'mock-redis-test:a'
+    @key2 = 'mock-redis-test:b'
+    @key3 = 'mock-redis-test:c'
+
+    @redises.set(@key1, '1')
+    @redises.set(@key2, '2')
+  end
+
+  it 'sets the values properly' do
+    @redises.mapped_mset({@key1 => 'one', @key3 => 'three'}).should eq('OK')
+    @redises.get(@key1).should eq('one')
+    @redises.get(@key2).should eq('2') # left alone
+    @redises.get(@key3).should eq('three')
+  end
+end

data/spec/commands/mapped_msetnx_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe '#mapped_msetnx(hash)' do
+  before do
+    @key1 = 'mock-redis-test:a'
+    @key2 = 'mock-redis-test:b'
+    @key3 = 'mock-redis-test:c'
+
+    @redises.set(@key1, '1')
+    @redises.set(@key2, '2')
+  end
+
+  it 'sets properly when none collide' do
+    @redises.mapped_msetnx(@key3 => 'three').should eq(true)
+    @redises.get(@key1).should eq('1') # existed; untouched
+    @redises.get(@key2).should eq('2') # existed; untouched
+    @redises.get(@key3).should eq('three')
+  end
+
+  it 'does not set any when any collide' do
+    @redises.mapped_msetnx(@key1 => 'one', @key3 => 'three').should eq(false)
+    @redises.get(@key1).should eq('1') # existed; untouched
+    @redises.get(@key2).should eq('2') # existed; untouched
+    @redises.get(@key3).should be_nil
+  end
+end

data/spec/commands/rpoplpush_spec.rb

@@ -16,6 +16,11 @@ describe '#rpoplpush(source, destination)' do
     @redises.rpoplpush(@list1, @list2).should == "b"
   end
 
+  it "returns false and doesn't append if source empty" do
+    @redises.rpoplpush('empty', @list1).should be_nil
+    @redises.lrange(@list1, 0, -1).should == %w[a b]
+  end
+
   it "takes the last element of destination and prepends it to source" do
     @redises.rpoplpush(@list1, @list2)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mock_redis
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-03 00:00:00.000000000 Z
+date: 2013-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -153,6 +153,9 @@ files:
 - spec/commands/ltrim_spec.rb
 - spec/commands/mapped_hmget_spec.rb
 - spec/commands/mapped_hmset_spec.rb
+- spec/commands/mapped_mget_spec.rb
+- spec/commands/mapped_mset_spec.rb
+- spec/commands/mapped_msetnx_spec.rb
 - spec/commands/mget_spec.rb
 - spec/commands/move_spec.rb
 - spec/commands/mset_spec.rb
@@ -304,6 +307,9 @@ test_files:
 - spec/commands/ltrim_spec.rb
 - spec/commands/mapped_hmget_spec.rb
 - spec/commands/mapped_hmset_spec.rb
+- spec/commands/mapped_mget_spec.rb
+- spec/commands/mapped_mset_spec.rb
+- spec/commands/mapped_msetnx_spec.rb
 - spec/commands/mget_spec.rb
 - spec/commands/move_spec.rb
 - spec/commands/mset_spec.rb