mock_redis 0.12.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c44bae9b73824aa1ed4b8a5e745d45f1b511dab
-  data.tar.gz: b055a6c704f08fba3ba9910bf75b953ec2bb4a1f
+  metadata.gz: 8a63181a124183a90e68a84d2aaa16957e47398e
+  data.tar.gz: a633c58b9b8eabe402eeb593bfb72fe83e36f069
 SHA512:
-  metadata.gz: 247bdc2430fad048264a198fc2d023b08df49e89ba2563693bc4b131cbf675079499236f8cd4e9c3bfc3a6c720bc400a0427722b6faf4d8abf2ac5ee097f34f0
-  data.tar.gz: 20d485098a4c0b402c18addd39fa68d949068e3cade53e35b850f84ad1d262e44b64de72c8a83337ec5c4eace639c014fcaa875ad515f709da7beaad9a313d47
+  metadata.gz: 41f515662a87bb3a51d2c1f8f5f9f92a0d3d93f9a909a30eb89b03a6a7a454b64d136cb2c3286217e45e9b64252bcd3bc177bae52655f1ad0f8aa773cdaa2b7f
+  data.tar.gz: f262b7fc4dcf2cfe0a6a44017521a8962ba4769899d65271214a6d909a5aca17f3cbe628b7811d22678e69b014f632d2bc2705032158aebe91f6964b7c768ec4

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # MockRedis Changelog
 
+### 0.13.0
+
+* Fix bug where SETBIT command would not correctly unset a bit
+* Add support for the `connect` method
+* Check that `min`/`max` parameters are floats in `zrangebyscore`,
+  `zremrangebyscore`, and `zrevrangebyscore`
+* Update blocking list commands to take `timeout` in an options hash
+  for compatibility with `redis-rb` >= 3.0.0
+
 ### 0.12.1
 
 * RENAME command now keeps key expiration

data/lib/mock_redis.rb

@@ -71,6 +71,10 @@ class MockRedis
     self
   end
 
+  def connect
+    self
+  end
+
   def reconnect
     self
   end

data/lib/mock_redis/database.rb

@@ -210,8 +210,8 @@ class MockRedis
     private
 
     def assert_valid_timeout(timeout)
-      if !looks_like_float?(timeout.to_s)
-        raise Redis::CommandError, "ERR timeout is not a float or out of range"
+      if !looks_like_integer?(timeout.to_s)
+        raise Redis::CommandError, "ERR timeout is not an integer or out of range"
       elsif timeout < 0
         raise Redis::CommandError, "ERR timeout is negative"
       end
@@ -227,8 +227,13 @@ class MockRedis
     end
 
     def extract_timeout(arglist)
-      timeout = assert_valid_timeout(arglist.last)
-      [arglist[0..-2], arglist.last]
+      options = arglist.last
+      if options.is_a?(Hash) && options[:timeout]
+        timeout = assert_valid_timeout(options[:timeout])
+        [arglist[0..-2], timeout]
+      else
+        [arglist, 0]
+      end
     end
 
     def expiration(key)

data/lib/mock_redis/list_methods.rb

@@ -32,7 +32,8 @@ class MockRedis
       end
     end
 
-    def brpoplpush(source, destination, timeout)
+    def brpoplpush(source, destination, options = {})
+      timeout = options.is_a?(Hash) && options[:timeout] || 0
       assert_valid_timeout(timeout)
 
       if llen(source) > 0

data/lib/mock_redis/string_methods.rb

@@ -199,7 +199,7 @@ class MockRedis
       char_as_number = char.each_byte.reduce(0) do |a, byte|
         (a << 8) + byte
       end
-      char_as_number |=
+      char_as_number ^=
         (2**((char.bytesize * 8)-1) >>
         (offset_within_char * 8 + offset_within_byte))
       str[char_index] = char_as_number.chr

data/lib/mock_redis/version.rb

@@ -1,4 +1,4 @@
 # Defines the gem version.
 class MockRedis
-  VERSION = '0.12.1'
+  VERSION = '0.13.0'
 end

data/lib/mock_redis/zset_methods.rb

@@ -67,6 +67,9 @@ class MockRedis
     end
 
     def zrangebyscore(key, min, max, options={})
+      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|
         all_results = zset.in_range(min, max)
         to_response(apply_limit(all_results, options[:limit]), options)
@@ -104,12 +107,18 @@ class MockRedis
     end
 
     def zremrangebyscore(key, min, max)
+      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'
+
       zrangebyscore(key, min, max).
         each {|member| zrem(key, member)}.
         size
     end
 
     def zrevrangebyscore(key, max, min, options={})
+      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|
         to_response(
           apply_limit(

data/spec/client_spec.rb

@@ -7,4 +7,11 @@ describe 'client' do
       redis.reconnect.should == redis
     end
   end
+
+  context '#connect' do
+    it 'connects' do
+      redis = MockRedis.new
+      redis.connect.should == redis
+    end
+  end
 end

data/spec/commands/blpop_spec.rb

@@ -12,30 +12,30 @@ describe '#blpop(key [, key, ...,], timeout)' do
   end
 
   it "returns [first-nonempty-list, popped-value]" do
-    @redises.blpop(@list1, @list2, 1).should == [@list1, 'one']
+    @redises.blpop(@list1, @list2).should == [@list1, 'one']
   end
 
   it "pops that value off the list" do
-    @redises.blpop(@list1, @list2, 1)
-    @redises.blpop(@list1, @list2, 1)
+    @redises.blpop(@list1, @list2)
+    @redises.blpop(@list1, @list2)
 
-    @redises.blpop(@list1, @list2, 1).should == [@list2, 'ten']
+    @redises.blpop(@list1, @list2).should == [@list2, 'ten']
   end
 
   it "ignores empty keys" do
-    @redises.blpop('mock-redis-test:not-here', @list1, 1).should ==
+    @redises.blpop('mock-redis-test:not-here', @list1).should ==
       [@list1, 'one']
   end
 
-  it "allows subsecond timeouts" do
+  it "raises an error on subsecond timeouts" do
     lambda do
-      @redises.blpop(@list1, @list2, 0.5)
-    end.should_not raise_error
+      @redises.blpop(@list1, @list2, :timeout => 0.5)
+    end.should raise_error(Redis::CommandError)
   end
 
   it "raises an error on negative timeout" do
     lambda do
-      @redises.blpop(@list1, @list2, -1)
+      @redises.blpop(@list1, @list2, :timeout => -1)
     end.should raise_error(Redis::CommandError)
   end
 
@@ -43,12 +43,12 @@ describe '#blpop(key [, key, ...,], timeout)' do
 
   context "[mock only]" do
     it "ignores positive timeouts and returns nil" do
-      @redises.mock.blpop('mock-redis-test:not-here', 1).should be_nil
+      @redises.mock.blpop('mock-redis-test:not-here', :timeout => 1).should be_nil
     end
 
     it "raises WouldBlock on zero timeout (no blocking in the mock)" do
       lambda do
-        @redises.mock.blpop('mock-redis-test:not-here', 0)
+        @redises.mock.blpop('mock-redis-test:not-here', :timeout => 0)
       end.should raise_error(MockRedis::WouldBlock)
     end
   end

data/spec/commands/brpop_spec.rb

@@ -12,29 +12,29 @@ describe '#brpop(key [, key, ...,], timeout)' do
   end
 
   it "returns [first-nonempty-list, popped-value]" do
-    @redises.brpop(@list1, @list2, 1).should == [@list1, 'two']
+    @redises.brpop(@list1, @list2).should == [@list1, 'two']
   end
 
   it "pops that value off the list" do
-    @redises.brpop(@list1, @list2, 1)
-    @redises.brpop(@list1, @list2, 1)
-    @redises.brpop(@list1, @list2, 1).should == [@list2, 'ten']
+    @redises.brpop(@list1, @list2)
+    @redises.brpop(@list1, @list2)
+    @redises.brpop(@list1, @list2).should == [@list2, 'ten']
   end
 
   it "ignores empty keys" do
-    @redises.brpop('mock-redis-test:not-here', @list1, 1).should ==
+    @redises.brpop('mock-redis-test:not-here', @list1).should ==
       [@list1, 'two']
   end
 
-  it "allows subsecond timeouts" do
+  it "raises an error on subsecond timeouts" do
     lambda do
-      @redises.brpop(@list1, @list2, 0.5)
-    end.should_not raise_error
+      @redises.brpop(@list1, @list2, :timeout => 0.5)
+    end.should raise_error(Redis::CommandError)
   end
 
   it "raises an error on negative timeout" do
     lambda do
-      @redises.brpop(@list1, @list2, -1)
+      @redises.brpop(@list1, @list2, :timeout => -1)
     end.should raise_error(Redis::CommandError)
   end
 
@@ -42,12 +42,12 @@ describe '#brpop(key [, key, ...,], timeout)' do
 
   context "[mock only]" do
     it "ignores positive timeouts and returns nil" do
-      @redises.mock.brpop('mock-redis-test:not-here', 1).should be_nil
+      @redises.mock.brpop('mock-redis-test:not-here', :timeout => 1).should be_nil
     end
 
     it "raises WouldBlock on zero timeout (no blocking in the mock)" do
       lambda do
-        @redises.mock.brpop('mock-redis-test:not-here', 0)
+        @redises.mock.brpop('mock-redis-test:not-here', :timeout => 0)
       end.should raise_error(MockRedis::WouldBlock)
     end
   end

data/spec/commands/brpoplpush_spec.rb

@@ -15,18 +15,18 @@ describe '#brpoplpush(source, destination, timeout)' do
   end
 
   it "takes the last element of source and prepends it to destination" do
-    @redises.brpoplpush(@list1, @list2, 0)
+    @redises.brpoplpush(@list1, @list2)
     @redises.lrange(@list1, 0, -1).should == %w[A]
     @redises.lrange(@list2, 0, -1).should == %w[B alpha beta]
   end
 
   it "returns the moved element" do
-    @redises.brpoplpush(@list1, @list2, 0).should == "B"
+    @redises.brpoplpush(@list1, @list2).should == "B"
   end
 
   it "raises an error on negative timeout" do
     lambda do
-      @redises.brpoplpush(@list1, @list2, -1)
+      @redises.brpoplpush(@list1, @list2, :timeout => -1)
     end.should raise_error(Redis::CommandError)
   end
 
@@ -34,13 +34,13 @@ describe '#brpoplpush(source, destination, timeout)' do
 
   context "[mock only]" do
     it "ignores positive timeouts and returns nil" do
-      @redises.mock.brpoplpush('mock-redis-test:not-here', @list1, 1).
+      @redises.mock.brpoplpush('mock-redis-test:not-here', @list1, :timeout => 1).
         should be_nil
     end
 
     it "raises WouldBlock on zero timeout (no blocking in the mock)" do
       lambda do
-        @redises.mock.brpoplpush('mock-redis-test:not-here', @list1, 0)
+        @redises.mock.brpoplpush('mock-redis-test:not-here', @list1, :timeout => 0)
       end.should raise_error(MockRedis::WouldBlock)
     end
   end

data/spec/commands/setbit_spec.rb

@@ -13,12 +13,15 @@ describe "#setbit(key, offset)" do
   end
 
   it "sets the bit within the string" do
-    $debug = true
     @redises.setbit(@key, 7, 1)
-    $debug = false
     @redises.get(@key).should == 'i'  # ASCII 0x69
   end
 
+  it "unsets the bit within the string" do
+    @redises.setbit(@key, 1, 0)
+    @redises.get(@key).should == '('  # ASCII 0x28
+  end
+
   it "does the right thing with multibyte characters" do
     @redises.set(@key, "€99.94")   # the euro sign is 3 bytes wide in UTF-8
     @redises.setbit(@key, 63, 1).should == 0
@@ -43,4 +46,3 @@ describe "#setbit(key, offset)" do
 
   it_should_behave_like "a string-only command"
 end
- 

data/spec/commands/zremrangebyscore_spec.rb

@@ -25,4 +25,8 @@ describe "#zremrangebyscore(key, min, max)" do
   end
 
   it_should_behave_like "a zset-only command"
+
+  it "throws a command error" do
+    expect { @redises.zrevrangebyscore(@key, DateTime.now, '-inf') }.to raise_error(Redis::CommandError)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mock_redis
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0
 platform: ruby
 authors:
 - Causes Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -387,4 +387,3 @@ test_files:
 - spec/support/shared_examples/only_operates_on_zsets.rb
 - spec/support/shared_examples/sorts_enumerables.rb
 - spec/transactions_spec.rb
-has_rdoc: