mock_redis 0.6.4 → 0.6.5

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 0.6.5
+* Fix `zrevrange` to return an empty array on invalid range
+* Fix `srandmember` spec on redis-rb 3.0.3
+* Stringify keys in expiration-related commands
+
 ### 0.6.4
 * Update INFO command for latest Redis 2.6 compatibility
 

data/lib/mock_redis/database.rb

@@ -199,11 +199,11 @@ class MockRedis
     end
 
     def expiration(key)
-      expire_times.find {|(_,k)| k == key}.first
+      expire_times.find {|(_,k)| k == key.to_s}.first
     end
 
     def has_expiration?(key)
-      expire_times.any? {|(_,k)| k == key}
+      expire_times.any? {|(_,k)| k == key.to_s}
     end
 
     def looks_like_integer?(str)
@@ -223,14 +223,14 @@ class MockRedis
 
     def remove_expiration(key)
       expire_times.delete_if do |(t, k)|
-        key == k
+        key.to_s == k
       end
     end
 
     def set_expiration(key, time)
       remove_expiration(key)
 
-      expire_times << [time, key]
+      expire_times << [time, key.to_s]
       expire_times.sort! do |a, b|
         a.first <=> b.first
       end

data/lib/mock_redis/indifferent_hash.rb

@@ -7,5 +7,9 @@ class MockRedis
     def []=(key, value)
       super(key.to_s, value)
     end
+
+    def has_key?(key)
+      super(key.to_s)
+    end
   end
 end

data/lib/mock_redis/set_methods.rb

@@ -82,7 +82,7 @@ class MockRedis
       end
     end
 
-    def srandmember(key)
+    def srandmember(key, count = nil)
       members = with_set_at(key, &:to_a)
       members[rand(members.length)]
     end

data/lib/mock_redis/version.rb

@@ -1,3 +1,3 @@
 class MockRedis
-  VERSION = '0.6.4'
+  VERSION = '0.6.5'
 end

data/lib/mock_redis/zset_methods.rb

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

data/spec/commands/expire_spec.rb

@@ -25,6 +25,10 @@ describe "#expire(key, seconds)" do
     end.should raise_error(RuntimeError)
   end
 
+  it "stringifies key" do
+    @redises.expire(@key.to_sym, 9).should == true
+  end
+
   context "[mock only]" do
     # These are mock-only since we can't actually manipulate time in
     # the real Redis.

data/spec/commands/srandmember_spec.rb

@@ -20,6 +20,4 @@ describe '#srandmember(key)' do
     @redises.spop(@key)
     @redises.srandmember(@key).should be_nil
   end
-
-  it_should_behave_like "a set-only command"
 end

data/spec/commands/ttl_spec.rb

@@ -14,6 +14,11 @@ describe "#ttl(key)" do
     @redises.ttl('mock-redis-test:nonesuch').should == -1
   end
 
+  it "stringifies key" do
+    @redises.expire(@key, 9)
+    @redises.ttl(@key.to_sym).should > 0
+  end
+
   context "[mock only]" do
     # These are mock-only since we can't actually manipulate time in
     # the real Redis.

data/spec/commands/zrevrange_spec.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mock_redis
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2013-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -374,4 +374,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: