fakeredis 0.4.0 → 0.4.1

data/README.md

@@ -64,6 +64,7 @@ Or:
 * [obrie](https://github.com/obrie)
 * [jredville](https://github.com/jredville)
 * [redsquirrel](https://github.com/redsquirrel)
+* [dpick](https://github.com/dpick)
 * [Travis-CI](http://travis-ci.org/) (Travis-CI also uses Fakeredis in its tests!!!)
 
 

data/lib/fakeredis/rspec.rb

@@ -1,11 +1,11 @@
-# Require this either in your Gemfile or in RSpec's 
-# support scripts. Examples: 
+# Require this either in your Gemfile or in RSpec's
+# support scripts. Examples:
 #
 #   # Gemfile
 #   group :test do
 #     gem "rspec"
 #     gem "fakeredis", :require => "fakeredis/rspec"
-#   end 
+#   end
 #
 #   # spec/support/fakeredis.rb
 #   require 'fakeredis/rspec'
@@ -15,10 +15,9 @@ require 'rspec/core'
 require 'fakeredis'
 
 RSpec.configure do |c|
-  
+
   c.before do    
-    redis = Redis.current
-    redis.flushdb if redis.client.connection.is_a?(Redis::Connection::Memory)
+    Redis::Connection::Memory.instances.values.each &:flushdb
   end
-  
+
 end

data/lib/fakeredis/version.rb

@@ -1,3 +1,3 @@
 module FakeRedis
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/lib/redis/connection/memory.rb

@@ -76,8 +76,12 @@ class Redis
         @connected
       end
 
+      def self.instances
+        @instances ||= {}
+      end
+
       def self.connect(options = {})
-        self.new(true)
+        self.instances[options] ||= self.new(true)
       end
 
       def connect_unix(path, timeout)
@@ -181,7 +185,7 @@ class Redis
       end
 
       def mget(*keys)
-        raise ArgumentError, "wrong number of arguments for 'mget' command" if keys.empty?
+        raise Redis::CommandError, "wrong number of arguments for 'mget' command" if keys.empty?
         @data.values_at(*keys)
       end
 
@@ -254,7 +258,7 @@ class Redis
 
       def lrange(key, startidx, endidx)
         data_type_check(key, Array)
-        @data[key] && @data[key][startidx..endidx]
+        (@data[key] && @data[key][startidx..endidx]) || []
       end
 
       def ltrim(key, start, stop)
@@ -275,7 +279,7 @@ class Redis
         case where
           when :before then @data[key].insert(index, value)
           when :after  then @data[key].insert(index + 1, value)
-          else raise ArgumentError
+          else raise Redis::CommandError, "ERR syntax error"
         end
       end
 
@@ -307,7 +311,9 @@ class Redis
       def rpush(key, value)
         data_type_check(key, Array)
         @data[key] ||= []
-        @data[key].push(value)
+        [value].flatten.each do |val|
+          @data[key].push(val.to_s)
+        end
         @data[key].size
       end
 
@@ -320,7 +326,9 @@ class Redis
       def lpush(key, value)
         data_type_check(key, Array)
         @data[key] ||= []
-        @data[key].unshift(value)
+        [value].flatten.each do |val|
+          @data[key].unshift(val.to_s)
+        end
         @data[key].size
       end
 
@@ -362,12 +370,20 @@ class Redis
 
       def sadd(key, value)
         data_type_check(key, ::Set)
-        if @data[key]
-          !!@data[key].add?(value.to_s)
+        value = Array(value)
+
+        result = if @data[key]
+          old_set = @data[key].dup
+          @data[key].merge(value.map(&:to_s))
+          (@data[key] - old_set).size
         else
-          @data[key] = ::Set.new([value.to_s])
-          true
+          @data[key] = ::Set.new(value.map(&:to_s))
+          @data[key].size
         end
+
+        # 0 = false, 1 = true, 2+ untouched
+        return result == 1 if result < 2
+        result
       end
 
       def srem(key, value)
@@ -447,8 +463,10 @@ class Redis
       end
 
       def del(*keys)
+        keys = keys.flatten(1)
+        raise Redis::CommandError, "ERR wrong number of arguments for 'del' command" if keys.empty?
         old_count = @data.keys.size
-        keys.flatten.each do |key|
+        keys.each do |key|
           @data.delete(key)
         end
         deleted_count = old_count - @data.keys.size
@@ -523,7 +541,7 @@ class Redis
       end
 
       def hmset(key, *fields)
-        raise ArgumentError, "wrong number of arguments for 'hmset' command" if fields.empty? || fields.size.odd?
+        raise Redis::CommandError, "wrong number of arguments for 'hmset' command" if fields.empty? || fields.size.odd?
         data_type_check(key, Hash)
         @data[key] ||= {}
         fields.each_slice(2) do |field|
@@ -532,7 +550,7 @@ class Redis
       end
 
       def hmget(key, *fields)
-        raise ArgumentError, "wrong number of arguments for 'hmget' command" if fields.empty?
+        raise Redis::CommandError, "wrong number of arguments for 'hmget' command" if fields.empty?
         data_type_check(key, Hash)
         values = []
         fields.map do |field|
@@ -631,26 +649,22 @@ class Redis
       end
 
       def incr(key)
-        @data[key] = (@data[key] || "0")
-        @data[key] = (@data[key].to_i + 1).to_s
+        @data.merge!({ key => (@data[key].to_i + 1).to_s || "1"})
         @data[key].to_i
       end
 
       def incrby(key, by)
-        @data[key] = (@data[key] || "0")
-        @data[key] = (@data[key].to_i + by.to_i).to_s
+        @data.merge!({ key => (@data[key].to_i + by.to_i).to_s || by })
         @data[key].to_i
       end
 
       def decr(key)
-        @data[key] = (@data[key] || "0")
-        @data[key] = (@data[key].to_i - 1).to_s
+        @data.merge!({ key => (@data[key].to_i - 1).to_s || "-1"})
         @data[key].to_i
       end
 
       def decrby(key, by)
-        @data[key] = (@data[key] || "0")
-        @data[key] = (@data[key].to_i - by.to_i).to_s
+        @data.merge!({ key => ((@data[key].to_i - by.to_i) || (by.to_i * -1)).to_s })
         @data[key].to_i
       end
 
@@ -690,12 +704,34 @@ class Redis
         "OK"
       end
 
-      def zadd(key, score, value)
+      def zadd(key, *args)
+        if !args.first.is_a?(Array)
+          if args.size < 2
+            raise Redis::CommandError, "ERR wrong number of arguments for 'zadd' command"
+          elsif args.size.odd?
+            raise Redis::CommandError, "ERR syntax error"
+          end
+        else
+          unless args.all? {|pair| pair.size == 2 }
+            raise(Redis::CommandError, "ERR syntax error")
+          end
+        end
+
         data_type_check(key, ZSet)
         @data[key] ||= ZSet.new
-        exists = @data[key].key?(value.to_s)
-        @data[key][value.to_s] = score
-        !exists
+
+        if args.size == 2
+          score, value = args
+          exists = !@data[key].key?(value.to_s)
+          @data[key][value.to_s] = score
+        else
+          # Turn [1, 2, 3, 4] into [[1, 2], [3, 4]] unless it is already
+          args = args.each_slice(2).to_a unless args.first.is_a?(Array)
+          exists = args.map(&:last).map { |el| @data[key].key?(el.to_s) }.count(false)
+          args.each { |score, value| @data[key][value.to_s] = score }
+        end
+
+        exists
       end
 
       def zrem(key, value)
@@ -811,7 +847,8 @@ class Redis
         hashes = keys.map do |src|
           case @data[src]
           when ::Set
-            Hash[@data[src].zip([0] * @data[src].size)]
+            # Every value has a score of 1
+            Hash[@data[src].map {|k,v| [k, 1]}]
           when Hash
             @data[src]
           else
@@ -830,6 +867,7 @@ class Redis
 
       def zremrangebyrank(key, start, stop)
         sorted_elements = @data[key].sort { |(v_a, r_a), (v_b, r_b)| r_a <=> r_b }
+        start = sorted_elements.length if start > sorted_elements.length
         elements_to_delete = sorted_elements[start..stop]
         elements_to_delete.each { |elem, rank| @data[key].delete(elem) }
         elements_to_delete.size
@@ -838,7 +876,15 @@ class Redis
       private
 
         def zrange_select_by_score(key, min, max)
-          @data[key].reject {|_,v| v < min || v > max }
+          if min == '-inf' && max == '+inf'
+            @data[key]
+          elsif max == '+inf'
+            @data[key].reject { |_,v| v < min }
+          elsif min == '-inf'
+            @data[key].reject { |_,v| v > max }
+          else
+            @data[key].reject {|_,v| v < min || v > max }
+          end
         end
 
         def remove_key_for_empty_collection(key)

data/spec/connection_spec.rb

@@ -7,9 +7,11 @@ module FakeRedis
       @client = Redis.new
     end
 
+  if fakeredis?
     it "should authenticate to the server" do
       @client.auth("pass").should == "OK"
     end
+  end
 
     it "should echo the given string" do
       @client.echo("something").should == "something"

data/spec/hashes_spec.rb

@@ -95,17 +95,17 @@ module FakeRedis
     end
 
     it "throws an argument error when you don't ask for any keys" do
-      lambda { @client.hmget("key1") }.should raise_error(ArgumentError)
+      lambda { @client.hmget("key1") }.should raise_error(Redis::CommandError)
     end
 
     it "should reject an empty list of values" do
-      lambda { @client.hmset("key") }.should raise_error(ArgumentError)
+      lambda { @client.hmset("key") }.should raise_error(Redis::CommandError)
       @client.exists("key").should be_false
     end
 
     it 'rejects an insert with a key but no value' do
-      lambda { @client.hmset("key", 'foo') }.should raise_error(ArgumentError)
-      lambda { @client.hmset("key", 'foo', 3, 'bar') }.should raise_error(ArgumentError)
+      lambda { @client.hmset("key", 'foo') }.should raise_error(Redis::CommandError)
+      lambda { @client.hmset("key", 'foo', 3, 'bar') }.should raise_error(Redis::CommandError)
       @client.exists("key").should be_false
     end
 

data/spec/keys_spec.rb

@@ -15,6 +15,20 @@ module FakeRedis
       @client.get("key1").should == nil
     end
 
+    it "should delete multiple keys" do
+      @client.set("key1", "1")
+      @client.set("key2", "2")
+      @client.del(["key1", "key2"])
+
+      @client.get("key1").should be == nil
+      @client.get("key2").should be == nil
+    end
+
+    it "should error deleting no keys" do
+      lambda { @client.del }.should raise_error(Redis::CommandError, "ERR wrong number of arguments for 'del' command")
+      lambda { @client.del [] }.should raise_error(Redis::CommandError, "ERR wrong number of arguments for 'del' command")
+    end
+
     it "should determine if a key exists" do
       @client.set("key1", "1")
 
@@ -88,12 +102,12 @@ module FakeRedis
       @client.set("akeyd", "4")
       @client.set("key1", "5")
 
-      @client.keys("key:").should =~ ["key:a", "key:b", "key:c"]
+      @client.keys("key:*").should =~ ["key:a", "key:b", "key:c"]
     end
 
     it "should remove the expiration from a key" do
       @client.set("key1", "1")
-      @client.expireat("key1", Time.now.to_i)
+      @client.expireat("key1", Time.now.to_i + 1)
       @client.persist("key1").should == true
       @client.persist("key1").should == false
 

data/spec/lists_spec.rb

@@ -22,6 +22,22 @@ module FakeRedis
 
       @client.lrange("key1", 0, -1).should == ["v1", "v2", "v3"]
     end
+    
+    it 'should allow multiple values to be added to a list in a single rpush' do
+      @client.rpush('key1', [1, 2, 3])
+      @client.lrange('key1', 0, -1).should == ['1', '2', '3']
+    end
+    
+    it 'should allow multiple values to be added to a list in a single lpush' do
+      @client.lpush('key1', [1, 2, 3])
+      @client.lrange('key1', 0, -1).should == ['3', '2', '1']
+    end
+
+    it "should error if an invalid where argument is given" do
+      @client.rpush("key1", "v1")
+      @client.rpush("key1", "v3")
+      lambda { @client.linsert("key1", :invalid, "v3", "v2") }.should raise_error(Redis::CommandError, "ERR syntax error")
+    end
 
     it "should get the length of a list" do
       @client.rpush("key1", "v1")
@@ -137,7 +153,7 @@ module FakeRedis
       @client.rpushx("key2", "two")
 
       @client.lrange("key1", 0, -1).should == ["one", "two"]
-      @client.lrange("key2", 0, -1).should == nil
+      @client.lrange("key2", 0, -1).should == []
     end
   end
 end

data/spec/sets_spec.rb

@@ -13,6 +13,12 @@ module FakeRedis
       @client.smembers("key").should == ["value"]
     end
 
+    it "should add multiple members to a set" do
+      @client.sadd("key", %w(value other something more)).should == 4
+      @client.sadd("key", %w(and additional values)).should == 3
+      @client.smembers("key").should =~ ["value", "other", "something", "more", "and", "additional", "values"]
+    end
+
     it "should get the number of members in a set" do
       @client.sadd("key", "val1")
       @client.sadd("key", "val2")

data/spec/sorted_sets_spec.rb

@@ -14,6 +14,26 @@ module FakeRedis
       @client.zscore("key", "val").should == 2.0
     end
 
+    it "should add multiple members to a sorted set, or update its score if it already exists" do
+      @client.zadd("key", [1, "val", 2, "val2"]).should be == 2
+      @client.zscore("key", "val").should be == 1
+      @client.zscore("key", "val2").should be == 2
+
+      @client.zadd("key", [[5, "val"], [3, "val3"], [4, "val4"]]).should be == 2
+      @client.zscore("key", "val").should be == 5
+      @client.zscore("key", "val2").should be == 2
+      @client.zscore("key", "val3").should be == 3
+      @client.zscore("key", "val4").should be == 4
+    end
+
+    it "should error with wrong number of arguments when adding members" do
+      lambda { @client.zadd("key") }.should raise_error(ArgumentError, "wrong number of arguments")
+      lambda { @client.zadd("key", 1) }.should raise_error(ArgumentError, "wrong number of arguments")
+      lambda { @client.zadd("key", [1]) }.should raise_error(Redis::CommandError, "ERR wrong number of arguments for 'zadd' command")
+      lambda { @client.zadd("key", [1, "val", 2]) }.should raise_error(Redis::CommandError, "ERR syntax error")
+      lambda { @client.zadd("key", [[1, "val"], [2]]) }.should raise_error(Redis::CommandError, "ERR syntax error")
+    end
+
     it "should allow floats as scores when adding or updating" do
       @client.zadd("key", 4.321, "val").should be(true)
       @client.zscore("key", "val").should == 4.321
@@ -100,6 +120,9 @@ module FakeRedis
       @client.zrangebyscore("key", 0, 100, :limit => [0, 1]).should == ["one"]
       @client.zrangebyscore("key", 0, 100, :limit => [0, -1]).should == ["one", "two", "three"]
       @client.zrangebyscore("key", 0, 100, :limit => [1, -1], :with_scores => true).should == [["two", 2], ["three", 3]]
+      @client.zrangebyscore("key", '-inf', '+inf').should == ["one", "two", "three"]
+      @client.zrangebyscore("key", 2, '+inf').should == ["two", "three"]
+      @client.zrangebyscore("key", '-inf', 2).should == ['one', "two"]
     end
 
     it "should return a reversed range of members in a sorted set, by score" do
@@ -134,7 +157,7 @@ module FakeRedis
       @client.zrevrank("key", "four").should be_nil
     end
 
-    it "should create untersections between multiple (sorted) sets and store the resulting sorted set in a new key" do
+    it "should create intersections between multiple (sorted) sets and store the resulting sorted set in a new key" do
       @client.zadd("key1", 1, "one")
       @client.zadd("key1", 2, "two")
       @client.zadd("key1", 3, "three")
@@ -147,10 +170,10 @@ module FakeRedis
       @client.zrange("out", 0, 100, :with_scores => true).should == [['two', 7], ['three', 10]]
 
       @client.zinterstore("out", ["key1", "key3"]).should == 2
-      @client.zrange("out", 0, 100, :with_scores => true).should == [['one', 1], ['two', 2]]
+      @client.zrange("out", 0, 100, :with_scores => true).should == [['one', 2], ['two', 3]]
 
       @client.zinterstore("out", ["key1", "key2", "key3"]).should == 1
-      @client.zrange("out", 0, 100, :with_scores => true).should == [['two', 7]]
+      @client.zrange("out", 0, 100, :with_scores => true).should == [['two', 8]]
 
       @client.zinterstore("out", ["key1", "no_key"]).should == 0
       @client.zrange("out", 0, 100, :with_scores => true).should == []
@@ -180,6 +203,15 @@ module FakeRedis
         @client.zremrangebyrank("key", 0, 1).should == 2
         @client.zcard('key').should == 1
       end
+
+      it 'handles out of range requests' do
+        @client.zadd("key", 1, "one")
+        @client.zadd("key", 2, "two")
+        @client.zadd("key", 3, "three")
+
+        @client.zremrangebyrank("key", 25, -1).should == 0
+        @client.zcard('key').should == 3
+      end
     end
 
     #it "should remove all members in a sorted set within the given indexes"

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

@@ -75,6 +75,14 @@ module FakeRedis
       @client.get("counter").should == "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 == 600
+      @client.incr("counter").should == 2
+      @client.ttl("counter").should == 600
+    end
+
     it "should decrement the integer value of a key by one" do
       @client.set("counter", "1")
       @client.decr("counter").should == 0
@@ -82,6 +90,14 @@ module FakeRedis
       @client.get("counter").should == "0"
     end
 
+    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 == 600
+      @client.decr("counter").should == 1
+      @client.ttl("counter").should == 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
@@ -89,6 +105,14 @@ module FakeRedis
       @client.get("counter").should == "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 == 600
+      @client.incrby("counter", "5").should == 6
+      @client.ttl("counter").should == 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
@@ -96,6 +120,14 @@ module FakeRedis
       @client.get("counter").should == "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 == 600
+      @client.decrby("counter", "3").should == 5
+      @client.ttl("counter").should == 600
+    end
+
     it "should get the values of all the given keys" do
       @client.set("key1", "value1")
       @client.set("key2", "value2")
@@ -107,7 +139,7 @@ module FakeRedis
     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(Redis::CommandError)
     end
 
     it "should set multiple keys to multiple values" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fakeredis
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-02 00:00:00.000000000 Z
+date: 2012-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -72,6 +72,7 @@ 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
@@ -94,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fakeredis
-rubygems_version: 1.8.24
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: Fake (In-memory) driver for redis-rb.
@@ -108,6 +109,7 @@ 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: