mock_redis 0.7.0 → 0.8.0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 0.8.0
+* Fixed `watch` to return OK when passed no block
+* Implemented `pexpire`, `pexpireat`
+* Fixed `expire` to use millisecond precision
+
 ### 0.7.0
 * Implemented `mapped_mget`, `mapped_mset`, `mapped_msetnx`
 * Fixed `rpoplpush` when the `rpop` is nil

data/lib/mock_redis/database.rb

@@ -66,7 +66,12 @@ class MockRedis
     end
 
     def expire(key, seconds)
-      expireat(key, @base.now.to_i + seconds.to_i)
+      pexpire(key, seconds.to_i * 1000)
+    end
+
+    def pexpire(key, ms)
+      now_ms = (@base.now.to_f * 1000).to_i
+      pexpireat(key, now_ms + ms.to_i)
     end
 
     def expireat(key, timestamp)
@@ -74,8 +79,17 @@ class MockRedis
         raise Redis::CommandError, "ERR value is not an integer or out of range"
       end
 
+      pexpireat(key, timestamp.to_i * 1000)
+    end
+
+    def pexpireat(key, timestamp_ms)
+      unless looks_like_integer?(timestamp_ms.to_s)
+        raise Redis::CommandError, "ERR value is not an integer or out of range"
+      end
+
       if exists(key)
-        set_expiration(key, @base.time_at(timestamp.to_i))
+        timestamp = timestamp_ms.to_i / 1000.0
+        set_expiration(key, @base.time_at(timestamp))
         true
       else
         false

data/lib/mock_redis/transaction_wrapper.rb

@@ -78,7 +78,11 @@ class MockRedis
     end
 
     def watch(_)
-      yield self if block_given?
+      if block_given?
+        yield self
+      else
+        'OK'
+      end
     end
 
   end

data/lib/mock_redis/version.rb

@@ -1,3 +1,3 @@
 class MockRedis
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end

data/spec/commands/expire_spec.rb

@@ -52,7 +52,15 @@ describe "#expire(key, seconds)" do
       @mock.expire(@key, 5)
       @mock.expire(@key, 6)
 
-      Time.stub!(:now).and_return(@now + 5) 
+      Time.stub!(:now).and_return(@now + 5)
+      @mock.get(@key).should_not be_nil
+    end
+
+    it "has millisecond precision" do
+      @now = Time.at(@now.to_i + 0.5)
+      Time.stub!(:now).and_return(@now)
+      @mock.expire(@key, 5)
+      Time.stub!(:now).and_return(@now + 4.9)
       @mock.get(@key).should_not be_nil
     end
 

data/spec/commands/pexpire_spec.rb

@@ -0,0 +1,87 @@
+require 'spec_helper'
+
+describe "#pexpire(key, ms)" do
+  before do
+    @key = 'mock-redis-test:pexpire'
+    @redises.set(@key, 'spork')
+  end
+
+  it "returns true for a key that exists" do
+    @redises.pexpire(@key, 1).should be_true
+  end
+
+  it "returns false for a key that does not exist" do
+    @redises.pexpire('mock-redis-test:nonesuch', 1).should be_false
+  end
+
+  it "removes a key immediately when ms==0" do
+    @redises.pexpire(@key, 0)
+    @redises.get(@key).should be_nil
+  end
+
+  it "raises an error if ms is bogus" do
+    lambda do
+      @redises.pexpireat(@key, 'a couple minutes or so')
+    end.should raise_error(RuntimeError)
+  end
+
+  it "stringifies key" do
+    @redises.pexpire(@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.
+
+    before(:all) do
+      @mock = @redises.mock
+    end
+
+    before do
+      @now = Time.now
+      Time.stub!(:now).and_return(@now)
+    end
+
+    it "removes keys after enough time has passed" do
+      @mock.pexpire(@key, 5)
+      Time.stub!(:now).and_return(@now + 0.006)
+      @mock.get(@key).should be_nil
+    end
+
+    it "updates an existing pexpire time" do
+      @mock.pexpire(@key, 5)
+      @mock.pexpire(@key, 6)
+
+      Time.stub!(:now).and_return(@now + 0.005)
+      @mock.get(@key).should_not be_nil
+    end
+
+    context "expirations on a deleted key" do
+      before { @mock.del(@key) }
+
+      it "cleans up the expiration once the key is gone (string)" do
+        @mock.set(@key, 'string')
+        @mock.pexpire(@key, 2)
+        @mock.del(@key)
+        @mock.set(@key, 'string')
+
+        Time.stub!(:now).and_return(@now + 0.003)
+
+        @mock.get(@key).should_not be_nil
+      end
+
+      it "cleans up the expiration once the key is gone (list)" do
+        @mock.rpush(@key, 'coconuts')
+        @mock.pexpire(@key, 2)
+        @mock.rpop(@key)
+
+        @mock.rpush(@key, 'coconuts')
+
+        Time.stub!(:now).and_return(@now + 0.003)
+
+        @mock.lindex(@key, 0).should_not be_nil
+      end
+    end
+
+  end
+end

data/spec/commands/pexpireat_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe "#pexpireat(key, timestamp_ms)" do
+  before do
+    @key = 'mock-redis-test:pexpireat'
+    @redises.set(@key, 'spork')
+  end
+
+  it "returns true for a key that exists" do
+    @redises.pexpireat(@key, (Time.now.to_f * 1000).to_i + 1).should be_true
+  end
+
+  it "returns false for a key that does not exist" do
+    @redises.pexpireat('mock-redis-test:nonesuch',
+                       (Time.now.to_f * 1000).to_i + 1).should be_false
+  end
+
+  it "removes a key immediately when timestamp is now" do
+    @redises.pexpireat(@key, (Time.now.to_f * 1000).to_i)
+    @redises.get(@key).should be_nil
+  end
+
+  it "raises an error if you don't give it a Unix timestamp" do
+    lambda do
+      @redises.pexpireat(@key, Time.now)   # oops, forgot .to_i
+    end.should raise_error(RuntimeError)
+  end
+
+  context "[mock only]" do
+    # These are mock-only since we can't actually manipulate time in
+    # the real Redis.
+
+    before(:all) do
+      @mock = @redises.mock
+    end
+
+    before do
+      @now = Time.now
+      Time.stub!(:now).and_return(@now)
+    end
+
+    it "removes keys after enough time has passed" do
+      @mock.pexpireat(@key, (@now.to_f * 1000).to_i + 5)
+      Time.stub!(:now).and_return(@now + 0.006)
+      @mock.get(@key).should be_nil
+    end
+  end
+end

data/spec/commands/watch_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe '#watch(key)' do
-  it "responds with nil" do
-    @redises.watch('mock-redis-test').should be_nil
+  it "returns 'OK'" do
+    @redises.watch('mock-redis-test').should == 'OK'
   end
 
   it 'EXECs its MULTI on successes' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mock_redis
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -161,6 +161,8 @@ files:
 - spec/commands/mset_spec.rb
 - spec/commands/msetnx_spec.rb
 - spec/commands/persist_spec.rb
+- spec/commands/pexpire_spec.rb
+- spec/commands/pexpireat_spec.rb
 - spec/commands/ping_spec.rb
 - spec/commands/pipelined_spec.rb
 - spec/commands/quit_spec.rb
@@ -315,6 +317,8 @@ test_files:
 - spec/commands/mset_spec.rb
 - spec/commands/msetnx_spec.rb
 - spec/commands/persist_spec.rb
+- spec/commands/pexpire_spec.rb
+- spec/commands/pexpireat_spec.rb
 - spec/commands/ping_spec.rb
 - spec/commands/pipelined_spec.rb
 - spec/commands/quit_spec.rb