mock_redis 0.4.1 → 0.5.0

data/lib/mock_redis.rb

@@ -2,20 +2,59 @@ require 'set'
 
 require 'mock_redis/assertions'
 require 'mock_redis/database'
-require 'mock_redis/distributed'
 require 'mock_redis/expire_wrapper'
 require 'mock_redis/multi_db_wrapper'
+require 'mock_redis/pipelined_wrapper'
 require 'mock_redis/transaction_wrapper'
 require 'mock_redis/undef_redis_methods'
 
 class MockRedis
   include UndefRedisMethods
 
+  attr_reader :options
+
+  DEFAULTS = {
+     :scheme => "redis",
+     :host => "127.0.0.1",
+     :port => 6379,
+     :path => nil,
+     :timeout => 5.0,
+     :password => nil,
+     :db => 0,
+  }
+
   def initialize(*args)
-    @db = TransactionWrapper.new(
-      ExpireWrapper.new(
-        MultiDbWrapper.new(
-          Database.new(*args))))
+    @options = _parse_options(args.first)
+
+    @db = PipelinedWrapper.new(
+      TransactionWrapper.new(
+        ExpireWrapper.new(
+          MultiDbWrapper.new(
+              Database.new(*args)))))
+  end
+
+  def id
+    "redis://#{self.host}:#{self.port}/#{self.db}"
+  end
+
+  def call(command, &block)
+     self.send(*command)
+  end
+
+  def host
+    self.options[:host]
+  end
+
+  def port
+    self.options[:port]
+  end
+
+  def db
+    self.options[:db]
+  end
+
+  def client
+    self
   end
 
   def respond_to?(method, include_private=false)
@@ -30,4 +69,52 @@ class MockRedis
     super
     @db = @db.clone
   end
+
+
+  protected
+
+  def _parse_options(options)
+    return {} if options.nil?
+
+    defaults = DEFAULTS.dup
+
+    url = options[:url] || ENV["REDIS_URL"]
+
+    # Override defaults from URL if given
+    if url
+      require "uri"
+
+      uri = URI(url)
+
+      if uri.scheme == "unix"
+        defaults[:path]   = uri.path
+      else
+        # Require the URL to have at least a host
+        raise ArgumentError, "invalid url" unless uri.host
+
+        defaults[:scheme]   = uri.scheme
+        defaults[:host]     = uri.host
+        defaults[:port]     = uri.port if uri.port
+        defaults[:password] = uri.password if uri.password
+        defaults[:db]       = uri.path[1..-1].to_i if uri.path
+      end
+    end
+
+    options = defaults.merge(options)
+
+    if options[:path]
+      options[:scheme] = "unix"
+      options.delete(:host)
+      options.delete(:port)
+    else
+      options[:host] = options[:host].to_s
+      options[:port] = options[:port].to_i
+    end
+
+    options[:timeout] = options[:timeout].to_f
+    options[:db] = options[:db].to_i
+
+    options
+  end
+
 end

data/mock_redis.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency "rake", "~> 0.9.2"
-  s.add_development_dependency "redis", "~> 2.2.1"
+  s.add_development_dependency "redis", "~> 3.0.0"
   s.add_development_dependency "rspec", "~> 2.6.0"
 end

data/spec/cloning_spec.rb

@@ -42,7 +42,7 @@ describe "MockRedis#clone" do
 
     it "performs a deep copy (zset values)" do
       @mock.zadd('foozset', 2, 'bar')
-      @clone.zscore('foozset', 'bar').should == "1"
+      @clone.zscore('foozset', 'bar').should == 1.0
     end
   end
 

data/spec/commands/blpop_spec.rb

@@ -27,16 +27,16 @@ describe '#blpop(key [, key, ...,], timeout)' do
       [@list1, 'one']
   end
 
-  it "raises an error on non-integer timeout" do
+  it "allows subsecond timeouts" do
     lambda do
       @redises.blpop(@list1, @list2, 0.5)
-    end.should raise_error(RuntimeError)
+    end.should_not raise_error(Redis::CommandError)
   end
 
   it "raises an error on negative timeout" do
     lambda do
       @redises.blpop(@list1, @list2, -1)
-    end.should raise_error(RuntimeError)
+    end.should raise_error(Redis::CommandError)
   end
 
   it_should_behave_like "a list-only command"

data/spec/commands/brpop_spec.rb

@@ -26,16 +26,16 @@ describe '#brpop(key [, key, ...,], timeout)' do
       [@list1, 'two']
   end
 
-  it "raises an error on non-integer timeout" do
+  it "allows subsecond timeouts" do
     lambda do
       @redises.brpop(@list1, @list2, 0.5)
-    end.should raise_error(RuntimeError)
+    end.should_not raise_error(Redis::CommandError)
   end
 
   it "raises an error on negative timeout" do
     lambda do
       @redises.brpop(@list1, @list2, -1)
-    end.should raise_error(RuntimeError)
+    end.should raise_error(Redis::CommandError)
   end
 
   it_should_behave_like "a list-only command"

data/spec/commands/brpoplpush_spec.rb

@@ -24,16 +24,16 @@ describe '#brpoplpush(source, destination, timeout)' do
     @redises.brpoplpush(@list1, @list2, 0).should == "B"
   end
 
-  it "raises an error on non-integer timeout" do
+  it "allows subsecond timeout" do
     lambda do
       @redises.brpoplpush(@list1, @list2, 0.5)
-    end.should raise_error(RuntimeError)
+    end.should_not raise_error(Redis::CommandError)
   end
 
   it "raises an error on negative timeout" do
     lambda do
       @redises.brpoplpush(@list1, @list2, -1)
-    end.should raise_error(RuntimeError)
+    end.should raise_error(Redis::CommandError)
   end
 
   it_should_behave_like "a list-only command"

data/spec/commands/hdel_spec.rb

@@ -38,5 +38,10 @@ describe "#hdel(key, field)" do
     @redises.get(@key).should be_nil
   end
 
+  it "supports a variable number of arguments" do
+    @redises.hdel(@key, ['k1', 'k2'])
+    @redises.get(@key).should be_nil
+  end
+
   it_should_behave_like "a hash-only command"
 end

data/spec/commands/lpush_spec.rb

@@ -26,5 +26,12 @@ describe "#lpush(key, value)" do
     @redises.lindex(@key, 0).should == "1"
   end
 
+  it "supports a variable number of arguments" do
+    @redises.lpush(@key, [1, 2, 3]).should == 3
+    @redises.lindex(@key, 0).should == "3"
+    @redises.lindex(@key, 1).should == "2"
+    @redises.lindex(@key, 2).should == "1"
+  end
+
   it_should_behave_like "a list-only command"
 end

data/spec/commands/mapped_hmset_spec.rb

@@ -33,9 +33,15 @@ describe "#mapped_hmset(key, hash={})" do
     end.should raise_error(ArgumentError)
   end
 
+  it "raises an error if given a an odd length array" do
+    lambda do
+      @redises.mapped_hmset(@key, [1])
+    end.should raise_error(Redis::CommandError)
+  end
+
   it "raises an error if given a non-hash value" do
     lambda do
       @redises.mapped_hmset(@key, 1)
-    end.should raise_error(RuntimeError)
+    end.should raise_error(NoMethodError)
   end
 end

data/spec/commands/move_spec.rb

@@ -122,7 +122,7 @@ describe '#move(key, db)' do
 
     it "copies key to destdb" do
       @redises.select(@destdb)
-      @redises.smembers(@key).should == %w[beer wine]
+      @redises.smembers(@key).should == %w[wine beer]
     end
   end
 
@@ -141,7 +141,7 @@ describe '#move(key, db)' do
     it "copies key to destdb" do
       @redises.select(@destdb)
       @redises.zrange(@key, 0, -1, :with_scores => true).should ==
-        %w[beer 1 wine 2]
+        [["beer", 1.0], ["wine", 2.0]]
     end
   end
 end

data/spec/commands/msetnx_spec.rb

@@ -7,7 +7,7 @@ describe '#msetnx(key, value [, key, value, ...])' do
   end
 
   it "responds with 1 if any keys were set" do
-    @redises.msetnx(@key1, 1).should == 1
+    @redises.msetnx(@key1, 1).should be_true
   end
 
   it "sets the values" do
@@ -23,7 +23,7 @@ describe '#msetnx(key, value [, key, value, ...])' do
 
   it "responds with 0 if any value is already set" do
     @redises.set(@key1, "old1")
-    @redises.msetnx(@key1, 'value1', @key2, 'value2').should == 0
+    @redises.msetnx(@key1, 'value1', @key2, 'value2').should be_false
   end
 
   it "raises an error if given an odd number of arguments" do

data/spec/commands/pipelined_spec.rb

@@ -8,4 +8,16 @@ describe '#pipelined' do
     end
     res.should == true
   end
+
+  it "returns results of pipelined operations" do
+    @redises.set "hello", "world"
+    @redises.set "foo", "bar"
+
+    results = @redises.pipelined do
+      @redises.get "hello"
+      @redises.get "foo"
+    end
+
+    results.should == ["world", "bar"]
+  end
 end

data/spec/commands/rename_spec.rb

@@ -17,6 +17,13 @@ describe '#rename(key, newkey)' do
     @redises.get(@newkey).should == "oof"
   end
 
+  it "raises an error when the source key is nonexistant" do
+    @redises.del(@key)
+    lambda do
+      @redises.rename(@key, @newkey)
+    end.should raise_error(Redis::CommandError)
+  end
+
   it "raises an error when key == newkey" do
     lambda do
       @redises.rename(@key, @key)

data/spec/commands/renamenx_spec.rb

@@ -22,6 +22,13 @@ describe '#renamenx(key, newkey)' do
     @redises.get(@newkey).should == "oof"
   end
 
+  it "raises an error when the source key is nonexistant" do
+    @redises.del(@key)
+    lambda do
+      @redises.rename(@key, @newkey)
+    end.should raise_error(Redis::CommandError)
+  end
+
   it "raises an error when key == newkey" do
     lambda do
       @redises.renamenx(@key, @key)

data/spec/commands/rpush_spec.rb

@@ -26,5 +26,12 @@ describe "#rpush(key)" do
     @redises.lindex(@key, 0).should == "1"
   end
 
+  it "supports a variable number of arguments" do
+    @redises.rpush(@key, [1, 2, 3]).should == 3
+    @redises.lindex(@key, 0).should == "1"
+    @redises.lindex(@key, 1).should == "2"
+    @redises.lindex(@key, 2).should == "3"
+  end
+
   it_should_behave_like "a list-only command"
 end

data/spec/commands/sadd_spec.rb

@@ -15,7 +15,7 @@ describe '#sadd(key, member)' do
   it "adds member to the set" do
     @redises.sadd(@key, 1)
     @redises.sadd(@key, 2)
-    @redises.smembers(@key).should == %w[1 2]
+    @redises.smembers(@key).should == %w[2 1]
   end
 
   it_should_behave_like "a set-only command"

data/spec/commands/sdiff_spec.rb

@@ -20,7 +20,7 @@ describe '#sdiff(key [, key, ...])' do
   end
 
   it "treats missing keys as empty sets" do
-    @redises.sdiff(@evens, 'mock-redis-test:nonesuch').should == %w[10 2 4 6 8]
+    @redises.sdiff(@evens, 'mock-redis-test:nonesuch').should == %w[2 4 6 8 10]
   end
 
   it "returns the first set when called with a single argument" do

data/spec/commands/sdiffstore_spec.rb

@@ -18,7 +18,7 @@ describe '#sdiffstore(destination, key [, key, ...])' do
 
   it "stores the resulting set" do
     @redises.sdiffstore(@destination, @numbers, @evens)
-    @redises.smembers(@destination).should == %w[1 3 5 7 9]
+    @redises.smembers(@destination).should == %w[9 7 5 3 1]
   end
 
   it "does not store empty sets" do
@@ -28,14 +28,14 @@ describe '#sdiffstore(destination, key [, key, ...])' do
 
   it "treats missing keys as empty sets" do
     @redises.sdiffstore(@destination, @evens, 'mock-redis-test:nonesuch')
-    @redises.smembers(@destination).should == %w[10 2 4 6 8]
+    @redises.smembers(@destination).should == %w[10 8 6 4 2]
   end
 
   it "removes existing elements in destination" do
     @redises.sadd(@destination, 42)
 
     @redises.sdiffstore(@destination, @primes)
-    @redises.smembers(@destination).should == %w[2 3 5 7]
+    @redises.smembers(@destination).should == %w[7 5 3 2]
   end
 
   it "raises an error if given 0 sets" do

data/spec/commands/sinterstore_spec.rb

@@ -18,7 +18,7 @@ describe '#sinterstore(destination, key [, key, ...])' do
 
   it "stores the resulting set" do
     @redises.sinterstore(@destination, @numbers, @evens)
-    @redises.smembers(@destination).should == %w[10 2 4 6 8]
+    @redises.smembers(@destination).should == %w[10 8 6 4 2]
   end
 
   it "does not store empty sets" do
@@ -30,7 +30,7 @@ describe '#sinterstore(destination, key [, key, ...])' do
     @redises.sadd(@destination, 42)
 
     @redises.sinterstore(@destination, @primes)
-    @redises.smembers(@destination).should == %w[2 3 5 7]
+    @redises.smembers(@destination).should == %w[7 5 3 2]
   end
 
   it "raises an error if given 0 sets" do

data/spec/commands/smembers_spec.rb

@@ -8,10 +8,10 @@ describe '#smembers(key)' do
   end
 
   it "returns the set's members" do
-    @redises.sadd(@key, 1)
-    @redises.sadd(@key, 2)
-    @redises.sadd(@key, 3)
-    @redises.smembers(@key).should == %w[1 2 3]
+    @redises.sadd(@key, "Hello")
+    @redises.sadd(@key, "World")
+    @redises.sadd(@key, "Test")
+    @redises.smembers(@key).should == %w[Test World Hello]
   end
 
   it_should_behave_like "a set-only command"

data/spec/commands/srem_spec.rb

@@ -31,5 +31,10 @@ describe '#srem(key, member)' do
     @redises.get(@key).should be_nil
   end
 
+  it "supports a variable number of arguments" do
+    @redises.srem(@key, ['bert', 'ernie']).should == 2
+    @redises.get(@key).should be_nil
+  end
+
   it_should_behave_like "a set-only command"
 end

data/spec/commands/sunion_spec.rb

@@ -10,7 +10,7 @@ describe '#sunion(key [, key, ...])' do
   end
 
   it "returns the elements in the resulting set" do
-    @redises.sunion(@evens, @primes).should == %w[10 2 3 4 5 6 7 8]
+    @redises.sunion(@evens, @primes).should == %w[2 4 6 8 10 3 5 7]
   end
 
   it "treats missing keys as empty sets" do
@@ -37,4 +37,4 @@ describe '#sunion(key [, key, ...])' do
   end
 end
 
-    
+

data/spec/commands/sunionstore_spec.rb

@@ -16,7 +16,7 @@ describe '#sunionstore(destination, key [, key, ...])' do
 
   it "stores the resulting set" do
     @redises.sunionstore(@destination, @primes, @evens)
-    @redises.smembers(@destination).should == %w[10 2 3 4 5 6 7 8]
+    @redises.smembers(@destination).should == %w[10 8 6 4 7 5 3 2]
   end
 
   it "does not store empty sets" do
@@ -30,13 +30,13 @@ describe '#sunionstore(destination, key [, key, ...])' do
     @redises.sadd(@destination, 42)
 
     @redises.sunionstore(@destination, @primes)
-    @redises.smembers(@destination).should == %w[2 3 5 7]
+    @redises.smembers(@destination).should == %w[7 5 3 2]
   end
 
   it "correctly unions and stores when the destination is empty and is one of the arguments" do
     @redises.sunionstore(@destination, @destination, @primes)
 
-    @redises.smembers(@destination).should == %w[2 3 5 7]
+    @redises.smembers(@destination).should == %w[7 5 3 2]
   end
 
   it "raises an error if given 0 sets" do

data/spec/commands/watch_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe '#watch(key)' do
-  it "responds with 'OK'" do
-    @redises.watch('mock-redis-test').should == 'OK'
+  it "responds with nil" do
+    @redises.watch('mock-redis-test').should be_nil
   end
 end

data/spec/commands/zadd_spec.rb

@@ -27,7 +27,12 @@ describe "#zadd(key, score, member)" do
     @redises.zadd(@key, 1, 'foo')
     @redises.zadd(@key, 2, 'foo')
 
-    @redises.zscore(@key, 'foo').should == "2"
+    @redises.zscore(@key, 'foo').should == 2.0
+  end
+
+  it "supports a variable number of arguments" do
+    @redises.zadd(@key, [[1, 'one'], [2, 'two']])
+    @redises.zrange(@key, 0, -1).should == ['one', 'two']
   end
 
   it_should_behave_like "arg 1 is a score"

data/spec/commands/zcount_spec.rb

@@ -17,6 +17,14 @@ describe "#zcount(key, min, max)" do
     @redises.zcount(@key, 100, 200).should == 0
   end
 
+  it "returns count of all elements when -inf to +inf" do
+    @redises.zcount(@key, "-inf", '+inf').should == 4
+  end
+
+  it "returns a proper count of elements using +inf upper bound" do
+    @redises.zcount(@key, 3, "+inf").should == 2
+  end
+
   it_should_behave_like "arg 1 is a score"
   it_should_behave_like "arg 2 is a score"
   it_should_behave_like "a zset-only command"

data/spec/commands/zincrby_spec.rb

@@ -7,23 +7,23 @@ describe "#zincrby(key, increment, member)" do
   end
 
   it "returns the new score as a string" do
-    @redises.zincrby(@key, 10, 'bert').should == "11"
+    @redises.zincrby(@key, 10, 'bert').should == 11.0
   end
 
   it "updates the item's score" do
     @redises.zincrby(@key, 10, 'bert')
-    @redises.zscore(@key, 'bert').should == "11"
+    @redises.zscore(@key, 'bert').should == 11.0
   end
 
   it "handles integer members correctly" do
     member = 11
     @redises.zadd(@key, 1, member)
     @redises.zincrby(@key, 1, member)
-    @redises.zscore(@key, member).should == "2"
+    @redises.zscore(@key, member).should == 2.0
   end
 
   it "adds missing members with score increment" do
-    @redises.zincrby(@key, 5.5, 'bigbird').should == "5.5"
+    @redises.zincrby(@key, 5.5, 'bigbird').should == 5.5
   end
 
   it_should_behave_like "arg 1 is a score"

data/spec/commands/zinterstore_spec.rb

@@ -25,7 +25,7 @@ describe "#zinterstore(destination, keys, [:weights => [w,w,], [:aggregate => :s
   it "sums the members' scores by default" do
     @redises.zinterstore(@dest, [@odds, @primes])
     @redises.zrange(@dest, 0, -1, :with_scores => true).should ==
-      %w[three 6 five 10 seven 14]
+      [["three", 6.0], ["five", 10.0], ["seven", 14.0]]
   end
 
   it "removes existing elements in destination" do
@@ -33,7 +33,7 @@ describe "#zinterstore(destination, keys, [:weights => [w,w,], [:aggregate => :s
 
     @redises.zinterstore(@dest, [@primes])
     @redises.zrange(@dest, 0, -1, :with_scores => true).should ==
-      %w[two 2 three 3 five 5 seven 7]
+      [["two", 2.0], ["three", 3.0], ["five", 5.0], ["seven", 7.0]]
   end
 
   it "raises an error if keys is empty" do
@@ -46,7 +46,7 @@ describe "#zinterstore(destination, keys, [:weights => [w,w,], [:aggregate => :s
     it "multiplies the scores by the weights while aggregating" do
       @redises.zinterstore(@dest, [@odds, @primes], :weights => [2, 3])
       @redises.zrange(@dest, 0, -1, :with_scores => true).should ==
-        %w[three 15 five 25 seven 35]
+        [["three", 15.0], ["five", 25.0], ["seven", 35.0]]
     end
 
     it "raises an error if the number of weights != the number of keys" do
@@ -70,21 +70,21 @@ describe "#zinterstore(destination, keys, [:weights => [w,w,], [:aggregate => :s
     it "aggregates scores with min when :aggregate => :min is specified" do
       @redises.zinterstore(@dest, [@bigs, @smalls], :aggregate => :min)
       @redises.zrange(@dest, 0, -1, :with_scores => true).should ==
-        %w[bert 1 ernie 2]
+        [["bert", 1.0], ["ernie", 2.0]]
     end
 
     it "aggregates scores with max when :aggregate => :max is specified" do
       @redises.zinterstore(@dest, [@bigs, @smalls], :aggregate => :max)
       @redises.zrange(@dest, 0, -1, :with_scores => true).should ==
-        %w[bert 100 ernie 200]
+        [["bert", 100.0], ["ernie", 200.0]]
     end
 
     it "allows 'min', 'MIN', etc. as aliases for :min" do
       @redises.zinterstore(@dest, [@bigs, @smalls], :aggregate => 'min')
-      @redises.zscore(@dest, 'bert').should == '1'
+      @redises.zscore(@dest, 'bert').should == 1.0
 
       @redises.zinterstore(@dest, [@bigs, @smalls], :aggregate => 'MIN')
-      @redises.zscore(@dest, 'bert').should == '1'
+      @redises.zscore(@dest, 'bert').should == 1.0
     end
 
     it "raises an error for unknown aggregation function" do

data/spec/commands/zrange_spec.rb

@@ -9,6 +9,10 @@ describe "#zrange(key, start, stop [, :with_scores => true])" do
     @redises.zadd(@key, 4, 'Madison')
   end
 
+  it "returns the elements when the range is given as strings" do
+    @redises.zrange(@key, "0", "1").should == ['Washington', 'Adams']
+  end
+
   it "returns the elements in order by score" do
     @redises.zrange(@key, 0, 1).should == ['Washington', 'Adams']
   end
@@ -23,12 +27,12 @@ describe "#zrange(key, start, stop [, :with_scores => true])" do
 
   it "returns the scores when :with_scores is specified" do
     @redises.zrange(@key, 0, 1, :with_scores => true).
-      should == ["Washington", "1", "Adams", "2"]
+      should == [["Washington", 1.0], ["Adams", 2.0]]
   end
 
   it "returns the scores when :withscores is specified" do
     @redises.zrange(@key, 0, 1, :withscores => true).
-      should == ["Washington", "1", "Adams", "2"]
+      should == [["Washington", 1.0], ["Adams", 2.0]]
   end
 
   it_should_behave_like "a zset-only command"

data/spec/commands/zrangebyscore_spec.rb

@@ -15,12 +15,12 @@ describe "#zrangebyscore(key, start, stop [:with_scores => true] [:limit => [off
 
   it "returns the scores when :with_scores is specified" do
     @redises.zrangebyscore(@key, 1, 2, :with_scores => true).
-      should == ["Washington", "1", "Adams", "2"]
+      should == [["Washington", 1.0], ["Adams", 2.0]]
   end
 
   it "returns the scores when :withscores is specified" do
     @redises.zrangebyscore(@key, 1, 2, :withscores => true).
-      should == ["Washington", "1", "Adams", "2"]
+      should == [["Washington", 1.0], ["Adams", 2.0]]
   end
 
   it "honors the :limit => [offset count] argument" do

data/spec/commands/zrem_spec.rb

@@ -28,5 +28,10 @@ describe "#zrem(key, member)" do
     @redises.zrange(@key, 0, -1).should == ['one', 'two']
   end
 
+  it "supports a variable number of arguments" do
+    @redises.zrem(@key, ['one', 'two'])
+    @redises.zrange(@key, 0, -1).should be_empty
+  end
+
   it_should_behave_like "a zset-only command"
 end