mock_redis 0.13.2 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3d7978080e5d75386c90cbae717fee17d6194c7
-  data.tar.gz: abfc802fe90cf8e2a9a996311b0859451a8abff0
+  metadata.gz: 994ce4cc7000897238012b0a9f11a8417b31358d
+  data.tar.gz: 44f03b45a1310b977d0bf996fe042a7b32c70b36
 SHA512:
-  metadata.gz: 19b2a107cbb896b8fd5435a83e84c45e64a5b0603e1e130611fcf4655e4f20a68427d230c4cd6c4133925a1bbf8bd49a783a0f94b676c5999df7f1f94bdb8b96
-  data.tar.gz: a74a10f31f47764a4c09ed3a838587b384771f3a72130ea57dc8e09cb82556fa0974fc3e12285d78c4374580b0f7f5bd3686badea137fee95aa20231c2558f5f
+  metadata.gz: 84bd359ec9c9eff9b5b40cacc7ac65f206bdd8a720d00445fcb53cd0729abcd003c3fe66f96e220728575f305e00495c0fa75a55290a268ba304f4cf92597035
+  data.tar.gz: e09387fa284e38847e8ebec0d8ed1a7c3681ebfad0b661a239c54b976adada92ffb08661f736abdde1686aaba5ed394e53d6620326979b84811c42d65d63ba2c

data/.rspec

@@ -1 +1 @@
--c -d
+-c

data/.travis.yml

@@ -7,6 +7,9 @@ rvm:
   - 2.1.1
   - jruby-19mode
 
+script:
+  - bundle exec rspec
+
 matrix:
   allow_failures:
     - rvm: 2.1.0

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # MockRedis Changelog
 
+### 0.14.0
+
+* Fix bug where SETBIT command would not correctly unset a bit
+* Fix bug where a key that expired would cause another key that expired later
+  to prematurely expire
+* Add support to set methods to take array as argument
+* Evaluate futures at the end of `#multi` blocks
+* Add support for the SCAN command
+* Add support for `[+/-]inf` values for min/max in ordered set commands
+
 ### 0.13.2
 
 * Fix SMEMBERS command to not return frozen elements

data/Gemfile

@@ -2,8 +2,3 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in mock_redis.gemspec
 gemspec
-
-group :test do
-  gem 'debugger', platforms: [:mri, :mswin]
-  gem 'ruby-debug', platforms: [:jruby]
-end

data/README.md

@@ -8,7 +8,7 @@ MockRedis provides the same interface as `redis-rb`, but it stores its
 data in memory instead of talking to a Redis server. It is intended
 for use in tests.
 
-The current implementation is tested against *Redis 2.8.4*. Older versions
+The current implementation is tested against *Redis 2.8.17*. Older versions
 of Redis may return different results or not support some commands.
 
 ## Getting Started
@@ -98,7 +98,7 @@ supported.
 
 If you want to work on this, you'll probably want to run the
 tests. (Just kidding! There's no probably about it.) These tests were
-written with Redis `2.8.4` running on localhost without any passwords
+written with Redis running on `localhost` without any passwords
 required. If you're using a different version of Redis, you may see
 failures due to error message text being different. If you're running
 a really old version of Redis, you'll definitely see failures due to

data/lib/mock_redis.rb

@@ -3,6 +3,7 @@ require 'set'
 require 'mock_redis/assertions'
 require 'mock_redis/database'
 require 'mock_redis/expire_wrapper'
+require 'mock_redis/future'
 require 'mock_redis/multi_db_wrapper'
 require 'mock_redis/pipelined_wrapper'
 require 'mock_redis/transaction_wrapper'

data/lib/mock_redis/database.rb

@@ -112,6 +112,17 @@ class MockRedis
       data.keys.grep(redis_pattern_to_ruby_regex(format))
     end
 
+    def scan(cursor, opts = {})
+      count = (opts[:count] || 10).to_i
+      match = opts[:match] || '*'
+
+      keys = data.keys
+      limit = cursor + count
+      next_cursor = limit >= keys.length ? '0' : limit.to_s
+
+      [next_cursor, keys[cursor..limit].grep(redis_pattern_to_ruby_regex(match))]
+    end
+
     def lastsave
       @base.now.to_i
     end
@@ -296,8 +307,6 @@ class MockRedis
       to_delete.each do |(time, key)|
         del(key)
       end
-
-      expire_times.slice!(0, to_delete.length)
     end
   end
 end

data/lib/mock_redis/future.rb

@@ -0,0 +1,22 @@
+class MockRedis
+  class FutureNotReady < RuntimeError; end
+
+  class Future
+    attr_reader :command
+
+    def initialize(command)
+      @command = command
+      @result_set = false
+    end
+
+    def value
+      raise FutureNotReady unless @result_set
+      @result
+    end
+
+    def set_result(result)
+      @result_set = true
+      @result = result
+    end
+  end
+end

data/lib/mock_redis/pipelined_wrapper.rb

@@ -1,25 +1,4 @@
 class MockRedis
-  class FutureNotReady < RuntimeError; end
-
-  class Future
-    attr_reader :command
-
-    def initialize(command)
-      @command = command
-      @result_set = false
-    end
-
-    def value
-      raise FutureNotReady unless @result_set
-      @result
-    end
-
-    def set_result(result)
-      @result_set = true
-      @result = result
-    end
-  end
-
   class PipelinedWrapper
     include UndefRedisMethods
 

data/lib/mock_redis/set_methods.rb

@@ -127,6 +127,7 @@ class MockRedis
     end
 
     def with_sets_at(*keys, &blk)
+      keys = keys.flatten
       if keys.length == 1
         with_set_at(keys.first, &blk)
       else

data/lib/mock_redis/string_methods.rb

@@ -123,7 +123,7 @@ class MockRedis
     def msetnx(*kvpairs)
       assert_has_args(kvpairs, 'msetnx')
 
-      if kvpairs.each_slice(2).any? {|(k,v)| exists(k)}
+      if kvpairs.each_slice(2).any? {|(k,_)| exists(k)}
         false
       else
         mset(*kvpairs)
@@ -159,7 +159,7 @@ class MockRedis
       if expire_option
         type, duration = expire_option
         if duration == 0
-          raise Redis::CommandError, 'ERR invalid expire time in SETEX'
+          raise Redis::CommandError, 'ERR invalid expire time in set'
         end
         expire(key, type.to_sym == :ex ? duration : duration / 1000.0)
       end
@@ -199,9 +199,17 @@ class MockRedis
       char_as_number = char.each_byte.reduce(0) do |a, byte|
         (a << 8) + byte
       end
-      char_as_number ^=
-        (2**((char.bytesize * 8)-1) >>
-        (offset_within_char * 8 + offset_within_byte))
+
+      bitmask_length = (char.bytesize * 8 - offset_within_char * 8 - offset_within_byte - 1)
+      bitmask = 1 << bitmask_length
+
+      if value.zero?
+        bitmask ^= 2**(char.bytesize * 8) - 1
+        char_as_number &= bitmask
+      else
+        char_as_number |= bitmask
+      end
+
       str[char_index] = char_as_number.chr
 
       data[key] = str

data/lib/mock_redis/transaction_wrapper.rb

@@ -10,14 +10,21 @@ class MockRedis
 
     def initialize(db)
       @db = db
-      @queued_commands = []
+      @transaction_futures = []
       @in_multi = false
+      @multi_block_given = false
     end
 
     def method_missing(method, *args, &block)
       if @in_multi
-        @queued_commands << [method, *args]
-        'QUEUED'
+        future = MockRedis::Future.new([method, *args])
+        @transaction_futures << future
+
+        if @multi_block_given
+          future
+        else
+          'QUEUED'
+        end
       else
         @db.expire_keys
         @db.send(method, *args, &block)
@@ -27,7 +34,7 @@ class MockRedis
     def initialize_copy(source)
       super
       @db = @db.clone
-      @queued_commands = @queued_commands.clone
+      @transaction_futures = @transaction_futures.clone
     end
 
     def discard
@@ -35,7 +42,8 @@ class MockRedis
         raise Redis::CommandError, "ERR DISCARD without MULTI"
       end
       @in_multi = false
-      @queued_commands = []
+      @multi_block_given = false
+      @transaction_futures = []
       'OK'
     end
 
@@ -44,14 +52,19 @@ class MockRedis
         raise Redis::CommandError, "ERR EXEC without MULTI"
       end
       @in_multi = false
-      responses = @queued_commands.map do |cmd|
+      @multi_block_given = false
+
+      responses = @transaction_futures.map do |future|
         begin
-          send(*cmd)
+          result = send(*future.command)
+          future.set_result(result)
+          result
         rescue => e
           e
         end
       end
-      @queued_commands = []
+
+      @transaction_futures = []
       responses
     end
 
@@ -61,6 +74,7 @@ class MockRedis
       end
       @in_multi = true
       if block_given?
+        @multi_block_given = true
         begin
           yield(self)
           self.exec

data/lib/mock_redis/version.rb

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

data/lib/mock_redis/zset_methods.rb

@@ -19,7 +19,7 @@ class MockRedis
         end
       elsif args.size == 2
         score, member = args
-        assert_scorey(score)
+        assert_scorey(score) unless score =~ /(\+|\-)inf/
         retval = !zscore(key, member)
         with_zset_at(key) {|z| z.add(score, member.to_s)}
       else
@@ -34,8 +34,7 @@ class MockRedis
     end
 
     def zcount(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'
+      assert_range_args(min, max)
 
       with_zset_at(key) do |zset|
         zset.in_range(min, max).size
@@ -67,8 +66,7 @@ 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'
+      assert_range_args(min, max)
 
       with_zset_at(key) do |zset|
         all_results = zset.in_range(min, max)
@@ -107,8 +105,7 @@ 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'
+      assert_range_args(min, max)
 
       zrangebyscore(key, min, max).
         each {|member| zrem(key, member)}.
@@ -116,8 +113,7 @@ class MockRedis
     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'
+      assert_range_args(min, max)
 
       with_zset_at(key) do |zset|
         to_response(
@@ -232,11 +228,18 @@ class MockRedis
     end
 
     def assert_scorey(value, message = "ERR value is not a valid float")
+      return if value =~ /\(?(\-|\+)inf/
+
       value = $1 if value.to_s.match(/\((.*)/)
       unless looks_like_float?(value)
         raise Redis::CommandError, message
       end
     end
 
+    def assert_range_args(min, max)
+      [min, max].each do |value|
+        assert_scorey(value, 'ERR min or max is not a float')
+      end
+    end
   end
 end

data/mock_redis.gemspec

@@ -23,5 +23,6 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'rake', '~> 10.0'
   s.add_development_dependency 'redis', '~> 3.0.0'
-  s.add_development_dependency 'rspec', '~> 2.14.0'
+  s.add_development_dependency 'rspec', '~> 3.1.0'
+  s.add_development_dependency 'rspec-its', '~> 1.0'
 end

data/spec/commands/connected_spec.rb

@@ -2,6 +2,6 @@ require 'spec_helper'
 
 describe "#connected? [mock only]" do
   it "returns true" do
-    @redises.mock.connected?.should be_true
+    @redises.mock.connected?.should == true
   end
 end

data/spec/commands/exists_spec.rb

@@ -4,11 +4,11 @@ describe "#exists(key)" do
   before { @key = 'mock-redis-test:45794' }
 
   it "returns false for keys that do not exist" do
-    @redises.exists(@key).should be_false
+    @redises.exists(@key).should == false
   end
 
   it "returns true for keys that do exist" do
     @redises.set(@key, 1)
-    @redises.exists(@key).should be_true
+    @redises.exists(@key).should == true
   end
 end

data/spec/commands/expire_spec.rb

@@ -7,11 +7,11 @@ describe "#expire(key, seconds)" do
   end
 
   it "returns true for a key that exists" do
-    @redises.expire(@key, 1).should be_true
+    @redises.expire(@key, 1).should == true
   end
 
   it "returns false for a key that does not exist" do
-    @redises.expire('mock-redis-test:nonesuch', 1).should be_false
+    @redises.expire('mock-redis-test:nonesuch', 1).should == false
   end
 
   it "removes a key immediately when seconds==0" do
@@ -91,5 +91,21 @@ describe "#expire(key, seconds)" do
       end
     end
 
+    context 'with two key expirations' do
+      let(:other_key) { 'mock-redis-test:expire-other' }
+
+      before { @redises.set(other_key, 'spork-other') }
+
+      it 'removes keys after enough time has passed' do
+        @mock.expire(@key, 5)
+        @mock.expire(other_key, 10)
+
+        Time.stub(:now).and_return(@now + 5)
+        @mock.get(@key).should be_nil
+
+        Time.stub(:now).and_return(@now + 10)
+        @mock.get(other_key).should be_nil
+      end
+    end
   end
 end

data/spec/commands/expireat_spec.rb

@@ -7,11 +7,11 @@ describe "#expireat(key, timestamp)" do
   end
 
   it "returns true for a key that exists" do
-    @redises.expireat(@key, Time.now.to_i + 1).should be_true
+    @redises.expireat(@key, Time.now.to_i + 1).should == true
   end
 
   it "returns false for a key that does not exist" do
-    @redises.expireat('mock-redis-test:nonesuch', Time.now.to_i + 1).should be_false
+    @redises.expireat('mock-redis-test:nonesuch', Time.now.to_i + 1).should == false
   end
 
   it "removes a key immediately when timestamp is now" do

data/spec/commands/hexists_spec.rb

@@ -7,20 +7,20 @@ describe "#hexists(key, field)" do
   end
 
   it "returns true if the hash has that field" do
-    @redises.hexists(@key, 'field').should be_true
+    @redises.hexists(@key, 'field').should == true
   end
 
   it "returns false if the hash lacks that field" do
-    @redises.hexists(@key, 'nonesuch').should be_false
+    @redises.hexists(@key, 'nonesuch').should == false
   end
 
   it "treats the field as a string" do
     @redises.hset(@key, 1, 'one')
-    @redises.hexists(@key, 1).should be_true
+    @redises.hexists(@key, 1).should == true
   end
 
   it "returns nil when there is no such key" do
-    @redises.hexists('mock-redis-test:nonesuch', 'key').should be_false
+    @redises.hexists('mock-redis-test:nonesuch', 'key').should == false
   end
 
   it_should_behave_like "a hash-only command"