mock_redis 0.3.0 → 0.4.0

data/.gitignore

@@ -2,3 +2,4 @@ pkg/*
 *.gem
 .bundle
 Gemfile.lock
+.rvmrc

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 0.4.0
+* Support `mapped_hmset`/`mapped_hmget`
+* Support `pipelined`
+* Correctly handle out-of-range conditions for `zremrangebyrank` and `zrange`
+* Fix off-by-one error in calculation of `ttl`
+
 ### 0.3.0
 * Support hash operator (`[]`/`[]=`) as synonym of `get`/`set`
 * Misc bugfixes

data/lib/mock_redis.rb

@@ -2,6 +2,7 @@ require 'set'
 
 require 'mock_redis/assertions'
 require 'mock_redis/database'
+require 'mock_redis/distributed'
 require 'mock_redis/expire_wrapper'
 require 'mock_redis/multi_db_wrapper'
 require 'mock_redis/transaction_wrapper'

data/lib/mock_redis/database.rb

@@ -329,7 +329,7 @@ class MockRedis
 
     def ttl(key)
       if has_expiration?(key)
-        (expiration(key) - Time.now).to_i
+        expiration(key).to_i - Time.now.to_i
       else
         -1
       end

data/lib/mock_redis/distributed.rb

@@ -0,0 +1,6 @@
+class MockRedis
+  def pipelined(options = {})
+    yield
+    nil
+  end
+end

data/lib/mock_redis/hash_methods.rb

@@ -52,6 +52,11 @@ class MockRedis
       fields.map{|f| hget(key, f)}
     end
 
+    def mapped_hmget(key, *fields)
+      reply = hmget(key, *fields)
+      Hash[*fields.zip(reply).flatten]
+    end
+
     def hmset(key, *kvpairs)
       assert_has_args(kvpairs, 'hmset')
       if kvpairs.length.odd?
@@ -64,6 +69,16 @@ class MockRedis
       'OK'
     end
 
+    def mapped_hmset(key, hash)
+      kvpairs = hash.to_a.flatten
+      assert_has_args(kvpairs, 'hmset')
+      if kvpairs.length.odd?
+        raise RuntimeError, "ERR wrong number of arguments for 'hmset' command"
+      end
+
+      hmset(key, *kvpairs)
+    end
+
     def hset(key, field, value)
       with_hash_at(key) {|h| h[field] = value.to_s}
       true

data/lib/mock_redis/version.rb

@@ -1,3 +1,3 @@
 class MockRedis
-  VERSION = "0.3.0"
+  VERSION = '0.4.0'
 end

data/lib/mock_redis/zset_methods.rb

@@ -49,7 +49,7 @@ class MockRedis
 
     def zrange(key, start, stop, options={})
       with_zset_at(key) do |z|
-        to_response(z.sorted[start..stop], options)
+        to_response(z.sorted[start..stop] || [], options)
       end
     end
 

data/mock_redis.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.name        = "mock_redis"
   s.version     = MockRedis::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Samuel Merritt"]
-  s.email       = ["spam@andcheese.org"]
+  s.authors     = ['Causes Engineering', 'Samuel Merritt']
+  s.email       = ['eng@causes.com']
   s.homepage    = "https://github.com/causes/mock_redis"
   s.summary     = %q{Redis mock that just lives in memory; useful for testing.}
 

data/spec/commands/mapped_hmget_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe "#mapped_hmget(key, *fields)" do
+  before do
+    @key = "mock-redis-test:mapped_hmget"
+    @redises.hmset(@key, 'k1', 'v1', 'k2', 'v2')
+  end
+
+  it "returns values stored at key" do
+    @redises.mapped_hmget(@key, 'k1', 'k2').should == {'k1' => 'v1', 'k2' => 'v2'}
+  end
+
+  it "returns nils for missing fields" do
+    @redises.mapped_hmget(@key, 'k1', 'mock-redis-test:nonesuch').
+      should == {'k1' => 'v1', 'mock-redis-test:nonesuch' => nil}
+  end
+
+  it "raises an error if given no fields" do
+    lambda do
+      @redises.mapped_hmget(@key)
+    end.should raise_error(RuntimeError)
+  end
+
+  it_should_behave_like "a hash-only command"
+end

data/spec/commands/mapped_hmset_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe "#mapped_hmset(key, hash={})" do
+  before do
+    @key = "mock-redis-test:mapped_hmset"
+  end
+
+  it "returns 'OK'" do
+    @redises.mapped_hmset(@key, {'k1'=>'v1', 'k2'=>'v2'}).should == 'OK'
+  end
+
+  it "sets the values" do
+    @redises.mapped_hmset(@key, {'k1'=>'v1', 'k2'=>'v2'})
+    @redises.hmget(@key, 'k1', 'k2').should == %w[v1 v2]
+  end
+
+  it "updates an existing hash" do
+    @redises.hmset(@key, 'foo', 'bar')
+    @redises.mapped_hmset(@key, {'bert' => 'ernie', 'diet' => 'coke'})
+
+    @redises.hmget(@key, 'foo', 'bert', 'diet').
+      should == %w[bar ernie coke]
+  end
+
+  it "stores the values as strings" do
+    @redises.mapped_hmset(@key, {'one' => 1})
+    @redises.hget(@key, 'one').should == '1'
+  end
+
+  it "raises an error if given no hash" do
+    lambda do
+      @redises.mapped_hmset(@key)
+    end.should raise_error(ArgumentError)
+  end
+
+  it "raises an error if given a non-hash value" do
+    lambda do
+      @redises.mapped_hmset(@key, 1)
+    end.should raise_error(RuntimeError)
+  end
+end

data/spec/commands/pipelined_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe '#pipelined' do
+  it 'yields to its block' do
+    res = false
+    @redises.pipelined do
+      res = true
+    end
+    res.should == true
+  end
+end

data/spec/commands/select_spec.rb

@@ -35,11 +35,11 @@ describe "#select(db)" do
 
       @mock.select(0)
       @mock.set(@key, 1)
-      @mock.expire(@key, 101)
+      @mock.expire(@key, 100)
 
       @mock.select(1)
       @mock.set(@key, 2)
-      @mock.expire(@key, 201)
+      @mock.expire(@key, 200)
     end
 
     it "keeps expire times per-db" do

data/spec/commands/ttl_spec.rb

@@ -29,8 +29,7 @@ describe "#ttl(key)" do
 
     it "gives you the key's remaining lifespan in seconds" do
       @mock.expire(@key, 5)
-      @mock.ttl(@key).should == 4
+      @mock.ttl(@key).should == 5
     end
-
   end
 end

data/spec/commands/zrange_spec.rb

@@ -17,6 +17,10 @@ describe "#zrange(key, start, stop [, :with_scores => true])" do
     @redises.zrange(@key, -2, -1).should == ['Jefferson', 'Madison']
   end
 
+  it 'returns empty list when start is too large' do
+    @redises.zrange(@key, 5, -1).should == []
+  end
+
   it "returns the scores when :with_scores is specified" do
     @redises.zrange(@key, 0, 1, :with_scores => true).
       should == ["Washington", "1", "Adams", "2"]

data/spec/commands/zremrangebyrank_spec.rb

@@ -18,5 +18,10 @@ describe "#zremrangebyrank(key, start, stop)" do
     @redises.zrange(@key, 0, -1).should == %w[Washington Adams]
   end
 
+  it "does nothing if start is greater than cardinality of set" do
+    @redises.zremrangebyrank(@key, 5, -1)
+    @redises.zrange(@key, 0, -1).should == %w[Washington Adams Jefferson Madison]
+  end
+
   it_should_behave_like "a zset-only command"
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification 
 name: mock_redis
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  segments_generated: true
+  version: 0.4.0
 platform: ruby
 authors: 
+- Causes Engineering
 - Samuel Merritt
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-12-16 00:00:00 -08:00
+date: 2012-03-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -31,13 +31,14 @@ dependencies:
         - 0
         - 9
         - 2
+        segments_generated: true
         version: 0.9.2
+  requirement: *id001
+  name: rake
+  prerelease: false
   type: :development
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: redis
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -47,13 +48,14 @@ dependencies:
         - 2
         - 2
         - 1
+        segments_generated: true
         version: 2.2.1
+  requirement: *id002
+  name: redis
+  prerelease: false
   type: :development
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,12 +65,15 @@ dependencies:
         - 2
         - 6
         - 0
+        segments_generated: true
         version: 2.6.0
+  requirement: *id003
+  name: rspec
+  prerelease: false
   type: :development
-  version_requirements: *id003
 description: Instantiate one with `redis = MockRedis.new` and treat it like you would a normal Redis object. It supports all the usual Redis operations.
 email: 
-- spam@andcheese.org
+- eng@causes.com
 executables: []
 
 extensions: []
@@ -86,6 +91,7 @@ files:
 - lib/mock_redis.rb
 - lib/mock_redis/assertions.rb
 - lib/mock_redis/database.rb
+- lib/mock_redis/distributed.rb
 - lib/mock_redis/exceptions.rb
 - lib/mock_redis/expire_wrapper.rb
 - lib/mock_redis/hash_methods.rb
@@ -150,12 +156,15 @@ files:
 - spec/commands/lrem_spec.rb
 - spec/commands/lset_spec.rb
 - spec/commands/ltrim_spec.rb
+- spec/commands/mapped_hmget_spec.rb
+- spec/commands/mapped_hmset_spec.rb
 - spec/commands/mget_spec.rb
 - spec/commands/move_spec.rb
 - spec/commands/mset_spec.rb
 - spec/commands/msetnx_spec.rb
 - spec/commands/persist_spec.rb
 - spec/commands/ping_spec.rb
+- spec/commands/pipelined_spec.rb
 - spec/commands/quit_spec.rb
 - spec/commands/randomkey_spec.rb
 - spec/commands/rename_spec.rb
@@ -231,6 +240,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       hash: 3
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
@@ -240,6 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       hash: 3
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 requirements: []
 
@@ -299,12 +310,15 @@ test_files:
 - spec/commands/lrem_spec.rb
 - spec/commands/lset_spec.rb
 - spec/commands/ltrim_spec.rb
+- spec/commands/mapped_hmget_spec.rb
+- spec/commands/mapped_hmset_spec.rb
 - spec/commands/mget_spec.rb
 - spec/commands/move_spec.rb
 - spec/commands/mset_spec.rb
 - spec/commands/msetnx_spec.rb
 - spec/commands/persist_spec.rb
 - spec/commands/ping_spec.rb
+- spec/commands/pipelined_spec.rb
 - spec/commands/quit_spec.rb
 - spec/commands/randomkey_spec.rb
 - spec/commands/rename_spec.rb