mock_redis 0.5.3 → 0.5.4

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 0.5.4
+* Support `incrbyfloat` (new in Redis 2.6)
+* Fix specs to pass in Redis 2.6
+* Deprecated spec suite on 2.4
+
 ### 0.5.3
 * Support `location` as an alias to `id` for `Sidekiq`'s benefit
 

data/lib/mock_redis/database.rb

@@ -372,6 +372,10 @@ class MockRedis
       value.nil? || looks_like_integer?(value)
     end
 
+    def can_incr_float?(value)
+      value.nil? || looks_like_float?(value)
+    end
+
     def extract_timeout(arglist)
       timeout = assert_valid_timeout(arglist.last)
       [arglist[0..-2], arglist.last]

data/lib/mock_redis/list_methods.rb

@@ -97,6 +97,9 @@ class MockRedis
     end
 
     def lrem(key, count, value)
+      unless looks_like_integer?(count.to_s)
+        raise Redis::CommandError, "ERR value is not an integer or out of range"
+      end
       count = count.to_i
       value = value.to_s
 

data/lib/mock_redis/string_methods.rb

@@ -75,6 +75,22 @@ class MockRedis
       new_value
     end
 
+    def incrbyfloat(key, n)
+      assert_stringy(key)
+      unless can_incr_float?(data[key])
+        raise Redis::CommandError, "ERR value is not a valid float"
+      end
+
+      unless looks_like_float?(n.to_s)
+        raise Redis::CommandError, "ERR value is not a valid float"
+      end
+
+      new_value = data[key].to_f + n.to_f
+      data[key] = new_value.to_s
+      # for some reason, redis-rb doesn't return this as a string.
+      new_value
+    end
+
     def mget(*keys)
       assert_has_args(keys, 'mget')
 

data/lib/mock_redis/version.rb

@@ -1,3 +1,3 @@
 class MockRedis
-  VERSION = '0.5.3'
+  VERSION = '0.5.4'
 end

data/lib/mock_redis/zset_methods.rb

@@ -42,8 +42,8 @@ class MockRedis
     end
 
     def zcount(key, min, max)
-      assert_scorey(min, 'min or max') unless min == '-inf'
-      assert_scorey(max, 'min or max') unless max == '+inf'
+      assert_scorey(min, 'ERR min or max is not a float') unless min == '-inf'
+      assert_scorey(max, 'ERR min or max is not a float') unless max == '+inf'
 
       with_zset_at(key) do |zset|
         zset.in_range(min, max).size
@@ -230,9 +230,9 @@ class MockRedis
       !!Float(x) rescue false
     end
 
-    def assert_scorey(value, what='value')
+    def assert_scorey(value, message = "ERR value is not a valid float")
       unless looks_like_float?(value)
-        raise Redis::CommandError, "ERR #{what} is not a double"
+        raise Redis::CommandError, message
       end
     end
 

data/spec/commands/incrbyfloat_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe '#incrbyfloat(key, increment)' do
+  before { @key = 'mock-redis-test:65374' }
+
+  it "returns the value after the increment" do
+    @redises.set(@key, 2.0)
+    @redises.incrbyfloat(@key, 2.1).should be_within(0.0001).of(4.1)
+  end
+
+  it "treats a missing key like 0" do
+    @redises.incrbyfloat(@key, 1.2).should be_within(0.0001).of(1.2)
+  end
+
+  it "increments negative numbers" do
+    @redises.set(@key, -10.4)
+    @redises.incrbyfloat(@key, 2.3).should be_within(0.0001).of(-8.1)
+  end
+
+  it "works multiple times" do
+    @redises.incrbyfloat(@key, 2.1).should be_within(0.0001).of(2.1)
+    @redises.incrbyfloat(@key, 2.2).should be_within(0.0001).of(4.3)
+    @redises.incrbyfloat(@key, 2.3).should be_within(0.0001).of(6.6)
+  end
+
+  it "accepts an float-ish string" do
+    @redises.incrbyfloat(@key, "2.2").should be_within(0.0001).of(2.2)
+  end
+
+  it "raises an error if the value does not look like an float" do
+    @redises.set(@key, "one.two")
+    lambda do
+      @redises.incrbyfloat(@key, 1)
+    end.should raise_error(RuntimeError)
+  end
+
+  it "raises an error if the delta does not look like an float" do
+    lambda do
+      @redises.incrbyfloat(@key, "foobar.baz")
+    end.should raise_error(RuntimeError)
+  end
+
+  it_should_behave_like "a string-only command"
+end

data/spec/commands/lrem_spec.rb

@@ -61,9 +61,10 @@ describe "#lrem(key, count, value)" do
     @redises.lrem(@key, 0, "beer").should == 0
   end
 
-  it "treats non-integer count as 0" do
-    @redises.lrem(@key, 'foo', 'bottles').should == 3
-    @redises.lrange(@key, 0, -1).grep(/bottles/).should be_empty
+  it "raises an error if the value does not look like an integer" do
+    lambda do
+      @redises.lrem(@key, 'foo', 'bottles')
+    end.should raise_error(RuntimeError)
   end
 
   it "removes empty lists" do

data/spec/support/redis_multiplexer.rb

@@ -69,6 +69,9 @@ class RedisMultiplexer < BlankSlate
       a.collect(&:to_s).sort == b.collect(&:to_s).sort
     elsif a.is_a?(Exception) && b.is_a?(Exception)
       a.class == b.class && a.message == b.message
+    elsif a.is_a?(Float) && b.is_a?(Float)
+      delta = [a.abs, b.abs].min / 1_000_000.0
+      (a - b).abs < delta
     else
       false
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mock_redis
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-14 00:00:00.000000000 Z
+date: 2012-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -131,6 +131,7 @@ files:
 - spec/commands/hvals_spec.rb
 - spec/commands/incr_spec.rb
 - spec/commands/incrby_spec.rb
+- spec/commands/incrbyfloat_spec.rb
 - spec/commands/info_spec.rb
 - spec/commands/keys_spec.rb
 - spec/commands/lastsave_spec.rb
@@ -274,6 +275,7 @@ test_files:
 - spec/commands/hvals_spec.rb
 - spec/commands/incr_spec.rb
 - spec/commands/incrby_spec.rb
+- spec/commands/incrbyfloat_spec.rb
 - spec/commands/info_spec.rb
 - spec/commands/keys_spec.rb
 - spec/commands/lastsave_spec.rb