fakeredis 0.3.2 → 0.3.3

data/spec/spec_helper.rb

@@ -2,4 +2,8 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 require 'fakeredis'
+require "fakeredis/rspec"
 
+def fakeredis?
+  true
+end

data/spec/spec_helper_live_redis.rb

@@ -0,0 +1,14 @@
+require "spec_helper"
+
+# Remove memory so we test against actual redis
+Redis::Connection.drivers.pop
+
+RSpec.configure do |config|
+  config.before(:each) do
+    Redis.new.flushdb
+  end
+end
+
+def fakeredis?
+  false
+end

data/spec/strings_spec.rb

@@ -11,89 +11,121 @@ module FakeRedis
       @client.set("key1", "Hello")
       @client.append("key1", " World")
 
-      @client.get("key1").should == "Hello World"
+      @client.get("key1").should be == "Hello World"
     end
 
     it "should decrement the integer value of a key by one" do
       @client.set("counter", "1")
       @client.decr("counter")
 
-      @client.get("counter").should == "0"
+      @client.get("counter").should be == "0"
     end
 
     it "should decrement the integer value of a key by the given number" do
       @client.set("counter", "10")
       @client.decrby("counter", "5")
 
-      @client.get("counter").should == "5"
+      @client.get("counter").should be == "5"
     end
 
     it "should get the value of a key" do
-      @client.get("key2").should == nil
+      @client.get("key2").should be == nil
     end
 
     it "should returns the bit value at offset in the string value stored at key" do
       @client.set("key1", "a")
 
-      @client.getbit("key1", 1).should == 1
-      @client.getbit("key1", 2).should == 1
-      @client.getbit("key1", 3).should == 0
-      @client.getbit("key1", 4).should == 0
-      @client.getbit("key1", 5).should == 0
-      @client.getbit("key1", 6).should == 0
-      @client.getbit("key1", 7).should == 1
+      @client.getbit("key1", 1).should be == 1
+      @client.getbit("key1", 2).should be == 1
+      @client.getbit("key1", 3).should be == 0
+      @client.getbit("key1", 4).should be == 0
+      @client.getbit("key1", 5).should be == 0
+      @client.getbit("key1", 6).should be == 0
+      @client.getbit("key1", 7).should be == 1
     end
 
     it "should allow direct bit manipulation even if the string isn't set" do
       @client.setbit("key1", 10, 1)
-      @client.getbit("key1", 10).should == 1
+      @client.getbit("key1", 10).should be == 1
     end
 
     it "should get a substring of the string stored at a key" do
       @client.set("key1", "This a message")
 
-      @client.getrange("key1", 0, 3).should == "This"
-      @client.substr("key1", 0, 3).should == "This"
+      @client.getrange("key1", 0, 3).should be == "This"
+      @client.substr("key1", 0, 3).should be == "This"
     end
 
     it "should set the string value of a key and return its old value" do
       @client.set("key1","value1")
 
-      @client.getset("key1", "value2").should == "value1"
-      @client.get("key1").should == "value2"
+      @client.getset("key1", "value2").should be == "value1"
+      @client.get("key1").should be == "value2"
     end
 
     it "should return nil for #getset if the key does not exist when setting" do
-      @client.getset("key1", "value1").should == nil
-      @client.get("key1").should == "value1"
+      @client.getset("key1", "value1").should be_nil
+      @client.get("key1").should be == "value1"
     end
 
     it "should increment the integer value of a key by one" do
       @client.set("counter", "1")
-      @client.incr("counter").should == 2
+      @client.incr("counter").should be == 2
 
-      @client.get("counter").should == "2"
+      @client.get("counter").should be == "2"
+    end
+
+    it "should not change the expire value of the key during incr" do
+      @client.set("counter", "1")
+      @client.expire("counter", 600).should be_true
+      @client.ttl("counter").should be == 600
+      @client.incr("counter").should be == 2
+      @client.ttl("counter").should be == 600
     end
 
     it "should decrement the integer value of a key by one" do
       @client.set("counter", "1")
-      @client.decr("counter").should == 0
+      @client.decr("counter").should be == 0
+
+      @client.get("counter").should be == "0"
+    end
 
-      @client.get("counter").should == "0"
+    it "should not change the expire value of the key during decr" do
+      @client.set("counter", "2")
+      @client.expire("counter", 600).should be_true
+      @client.ttl("counter").should be == 600
+      @client.decr("counter").should be == 1
+      @client.ttl("counter").should be == 600
     end
 
     it "should increment the integer value of a key by the given number" do
       @client.set("counter", "10")
-      @client.incrby("counter", "5").should == 15
-      @client.incrby("counter", 2).should == 17
-      @client.get("counter").should == "17"
+      @client.incrby("counter", "5").should be == 15
+      @client.incrby("counter", 2).should be == 17
+      @client.get("counter").should be == "17"
+    end
+
+    it "should not change the expire value of the key during incrby" do
+      @client.set("counter", "1")
+      @client.expire("counter", 600).should be_true
+      @client.ttl("counter").should be == 600
+      @client.incrby("counter", "5").should be == 6
+      @client.ttl("counter").should be == 600
     end
 
     it "should decrement the integer value of a key by the given number" do
       @client.set("counter", "10")
-      @client.decrby("counter", "5").should == 5
-      @client.decrby("counter", 2).should == 3
-      @client.get("counter").should == "3"
+      @client.decrby("counter", "5").should be == 5
+      @client.decrby("counter", 2).should be == 3
+      @client.get("counter").should be == "3"
+    end
+
+    it "should not change the expire value of the key during decrby" do
+      @client.set("counter", "8")
+      @client.expire("counter", 600).should be_true
+      @client.ttl("counter").should be == 600
+      @client.decrby("counter", "3").should be == 5
+      @client.ttl("counter").should be == 600
     end
 
     it "should get the values of all the given keys" do
@@ -101,48 +133,63 @@ module FakeRedis
       @client.set("key2", "value2")
       @client.set("key3", "value3")
 
-      @client.mget("key1", "key2", "key3").should == ["value1", "value2", "value3"]
+      @client.mget("key1", "key2", "key3").should be == ["value1", "value2", "value3"]
     end
 
-    it 'raises an argument error when not passed any fields' do
+    it "raises an argument error when not passed any fields" do
       @client.set("key3", "value3")
 
-      lambda { @client.mget }.should raise_error(ArgumentError)
+      lambda { @client.mget }.should raise_error(RuntimeError, "ERR wrong number of arguments for 'mget' command")
     end
 
     it "should set multiple keys to multiple values" do
       @client.mset(:key1, "value1", :key2, "value2")
 
-      @client.get("key1").should == "value1"
-      @client.get("key2").should == "value2"
+      @client.get("key1").should be == "value1"
+      @client.get("key2").should be == "value2"
     end
 
     it "should set multiple keys to multiple values, only if none of the keys exist" do
-      @client.msetnx(:key1, "value1", :key2, "value2")
-      @client.msetnx(:key1, "value3", :key2, "value4")
+      @client.msetnx(:key1, "value1", :key2, "value2").should be == 1
+      @client.msetnx(:key1, "value3", :key2, "value4").should be == 0
+
+      @client.get("key1").should be == "value1"
+      @client.get("key2").should be == "value2"
+    end
+
+    it "should set multiple keys to multiple values with a hash" do
+      @client.mapped_mset(:key1 => "value1", :key2 => "value2")
+
+      @client.get("key1").should be == "value1"
+      @client.get("key2").should be == "value2"
+    end
+
+    it "should set multiple keys to multiple values with a hash, only if none of the keys exist" do
+      @client.mapped_msetnx(:key1 => "value1", :key2 => "value2").should be == 1
+      @client.mapped_msetnx(:key1 => "value3", :key2 => "value4").should be == 0
 
-      @client.get("key1").should == "value1"
-      @client.get("key2").should == "value2"
+      @client.get("key1").should be == "value1"
+      @client.get("key2").should be == "value2"
     end
 
     it "should set the string value of a key" do
       @client.set("key1", "1")
 
-      @client.get("key1").should == "1"
+      @client.get("key1").should be == "1"
     end
 
     it "should sets or clears the bit at offset in the string value stored at key" do
       @client.set("key1", "abc")
       @client.setbit("key1", 11, 1)
 
-      @client.get("key1").should == "arc"
+      @client.get("key1").should be == "arc"
     end
 
     it "should set the value and expiration of a key" do
       @client.setex("key1", 30, "value1")
 
-      @client.get("key1").should == "value1"
-      @client.ttl("key1").should == 30
+      @client.get("key1").should be == "value1"
+      @client.ttl("key1").should be == 30
     end
 
     it "should set the value of a key, only if the key does not exist" do
@@ -150,21 +197,21 @@ module FakeRedis
       @client.setnx("key1", "new value")
       @client.setnx("key2", "another value")
 
-      @client.get("key1").should == "test value"
-      @client.get("key2").should == "another value"
+      @client.get("key1").should be == "test value"
+      @client.get("key2").should be == "another value"
     end
 
     it "should overwrite part of a string at key starting at the specified offset" do
       @client.set("key1", "Hello World")
       @client.setrange("key1", 6, "Redis")
 
-      @client.get("key1").should == "Hello Redis"
+      @client.get("key1").should be == "Hello Redis"
     end
 
     it "should get the length of the value stored in a key" do
       @client.set("key1", "abc")
 
-      @client.strlen("key1").should == 3
+      @client.strlen("key1").should be == 3
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fakeredis
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-02 00:00:00.000000000 Z
+date: 2013-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -59,9 +59,14 @@ files:
 - README.md
 - Rakefile
 - fakeredis.gemspec
+- lib/fake_redis.rb
 - lib/fakeredis.rb
+- lib/fakeredis/expiring_hash.rb
 - lib/fakeredis/rspec.rb
+- lib/fakeredis/sorted_set_argument_handler.rb
+- lib/fakeredis/sorted_set_store.rb
 - lib/fakeredis/version.rb
+- lib/fakeredis/zset.rb
 - lib/redis/connection/memory.rb
 - spec/compatibility_spec.rb
 - spec/connection_spec.rb
@@ -72,10 +77,12 @@ files:
 - spec/sets_spec.rb
 - spec/sorted_sets_spec.rb
 - spec/spec_helper.rb
+- spec/spec_helper_live_redis.rb
 - spec/strings_spec.rb
 - spec/transactions_spec.rb
-homepage: https://github.com/guilleiguaran/fakeredis
-licenses: []
+homepage: https://guilleiguaran.github.com/fakeredis
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -93,8 +100,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: fakeredis
-rubygems_version: 1.8.24
+rubyforge_project: 
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Fake (In-memory) driver for redis-rb.
@@ -108,6 +115,6 @@ test_files:
 - spec/sets_spec.rb
 - spec/sorted_sets_spec.rb
 - spec/spec_helper.rb
+- spec/spec_helper_live_redis.rb
 - spec/strings_spec.rb
 - spec/transactions_spec.rb
-has_rdoc: