redis 2.1.1 → 2.2.0

data/lib/redis/pipeline.rb

@@ -8,6 +8,12 @@ class Redis
 
     def call(*args)
       @commands << args
+      nil
+    end
+
+    def call_pipelined(commands, options = {})
+      @commands.concat commands
+      nil
     end
   end
 end

data/lib/redis/version.rb

@@ -0,0 +1,3 @@
+class Redis
+  VERSION = "2.2.0"
+end

data/redis.gemspec

@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+
+$:.unshift File.expand_path("../lib", __FILE__)
+require "redis/version"
+
+Gem::Specification.new do |s|
+  s.name = %q{redis}
+  s.version = Redis::VERSION
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Ezra Zygmuntowicz", "Taylor Weibley", "Matthew Clark", "Brian McKinney", "Salvatore Sanfilippo", "Luca Guidi", "Michel Martens", "Damian Janowski", "Pieter Noordhuis"]
+  s.autorequire = %q{redis}
+  s.description = %q{Ruby client library for Redis, the key value storage server}
+  s.summary = %q{Ruby client library for Redis, the key value storage server}
+  s.email = %q{ez@engineyard.com}
+  s.homepage = %q{http://github.com/ezmobius/redis-rb}
+  s.rubyforge_project = "redis-rb"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.5.0}
+end

data/test/commands_on_hashes_test.rb

@@ -0,0 +1,32 @@
+# encoding: UTF-8
+
+require File.expand_path("./helper", File.dirname(__FILE__))
+
+setup do
+  init Redis.new(OPTIONS)
+end
+
+load './test/lint/hashes.rb'
+
+test "HSETNX" do |r|
+  r.hset("foo", "f1", "s1")
+  r.hsetnx("foo", "f1", "s2")
+
+  assert "s1" == r.hget("foo", "f1")
+
+  r.del("foo")
+  r.hsetnx("foo", "f1", "s2")
+
+  assert "s2" == r.hget("foo", "f1")
+end
+
+test "Mapped HMGET in a pipeline returns plain array" do |r|
+  r.hset("foo", "f1", "s1")
+  r.hset("foo", "f2", "s2")
+
+  result = r.pipelined do
+    assert nil == r.mapped_hmget("foo", "f1", "f2")
+  end
+
+  assert result[0] == ["s1", "s2"]
+end

data/test/commands_on_lists_test.rb

@@ -0,0 +1,60 @@
+# encoding: UTF-8
+
+require File.expand_path("./helper", File.dirname(__FILE__))
+
+setup do
+  init Redis.new(OPTIONS)
+end
+
+load './test/lint/lists.rb'
+
+test "RPUSHX" do |r|
+  r.rpushx "foo", "s1"
+  r.rpush "foo", "s2"
+  r.rpushx "foo", "s3"
+
+  assert 2 == r.llen("foo")
+  assert ["s2", "s3"] == r.lrange("foo", 0, -1)
+end
+
+test "LPUSHX" do |r|
+  r.lpushx "foo", "s1"
+  r.lpush "foo", "s2"
+  r.lpushx "foo", "s3"
+
+  assert 2 == r.llen("foo")
+  assert ["s3", "s2"] == r.lrange("foo", 0, -1)
+end
+
+test "LINSERT" do |r|
+  r.rpush "foo", "s1"
+  r.rpush "foo", "s3"
+  r.linsert "foo", :before, "s3", "s2"
+
+  assert ["s1", "s2", "s3"] == r.lrange("foo", 0, -1)
+
+  assert_raise(RuntimeError) do
+    r.linsert "foo", :anywhere, "s3", "s2"
+  end
+end
+
+test "RPOPLPUSH" do |r|
+  r.rpush "foo", "s1"
+  r.rpush "foo", "s2"
+
+  assert "s2" == r.rpoplpush("foo", "bar")
+  assert ["s2"] == r.lrange("bar", 0, -1)
+  assert "s1" == r.rpoplpush("foo", "bar")
+  assert ["s1", "s2"] == r.lrange("bar", 0, -1)
+end
+
+test "BRPOPLPUSH" do |r|
+  r.rpush "foo", "s1"
+  r.rpush "foo", "s2"
+
+  assert_equal "s2", r.brpoplpush("foo", "bar", 1)
+
+  assert_equal nil, r.brpoplpush("baz", "qux", 1)
+
+  assert_equal ["s2"], r.lrange("bar", 0, -1)
+end

data/test/commands_on_sets_test.rb

@@ -0,0 +1,78 @@
+# encoding: UTF-8
+
+require File.expand_path("./helper", File.dirname(__FILE__))
+
+setup do
+  init Redis.new(OPTIONS)
+end
+
+load './test/lint/sets.rb'
+
+test "SMOVE" do |r|
+  r.sadd "foo", "s1"
+  r.sadd "bar", "s2"
+
+  assert r.smove("foo", "bar", "s1")
+  assert r.sismember("bar", "s1")
+end
+
+test "SINTER" do |r|
+  r.sadd "foo", "s1"
+  r.sadd "foo", "s2"
+  r.sadd "bar", "s2"
+
+  assert ["s2"] == r.sinter("foo", "bar")
+end
+
+test "SINTERSTORE" do |r|
+  r.sadd "foo", "s1"
+  r.sadd "foo", "s2"
+  r.sadd "bar", "s2"
+
+  r.sinterstore("baz", "foo", "bar")
+
+  assert ["s2"] == r.smembers("baz")
+end
+
+test "SUNION" do |r|
+  r.sadd "foo", "s1"
+  r.sadd "foo", "s2"
+  r.sadd "bar", "s2"
+  r.sadd "bar", "s3"
+
+  assert ["s1", "s2", "s3"] == r.sunion("foo", "bar").sort
+end
+
+test "SUNIONSTORE" do |r|
+  r.sadd "foo", "s1"
+  r.sadd "foo", "s2"
+  r.sadd "bar", "s2"
+  r.sadd "bar", "s3"
+
+  r.sunionstore("baz", "foo", "bar")
+
+  assert ["s1", "s2", "s3"] == r.smembers("baz").sort
+end
+
+test "SDIFF" do |r|
+  r.sadd "foo", "s1"
+  r.sadd "foo", "s2"
+  r.sadd "bar", "s2"
+  r.sadd "bar", "s3"
+
+  assert ["s1"] == r.sdiff("foo", "bar")
+  assert ["s3"] == r.sdiff("bar", "foo")
+end
+
+test "SDIFFSTORE" do |r|
+  r.sadd "foo", "s1"
+  r.sadd "foo", "s2"
+  r.sadd "bar", "s2"
+  r.sadd "bar", "s3"
+
+  r.sdiffstore("baz", "foo", "bar")
+
+  assert ["s1"] == r.smembers("baz")
+end
+
+

data/test/commands_on_sorted_sets_test.rb

@@ -0,0 +1,109 @@
+# encoding: UTF-8
+
+require File.expand_path("./helper", File.dirname(__FILE__))
+
+setup do
+  init Redis.new(OPTIONS)
+end
+
+load './test/lint/sorted_sets.rb'
+
+test "ZCOUNT" do |r|
+  r.zadd "foo", 1, "s1"
+  r.zadd "foo", 2, "s2"
+  r.zadd "foo", 3, "s3"
+
+  assert 2 == r.zcount("foo", 2, 3)
+end
+
+test "ZUNIONSTORE" do |r|
+  r.zadd "foo", 1, "s1"
+  r.zadd "bar", 2, "s2"
+  r.zadd "foo", 3, "s3"
+  r.zadd "bar", 4, "s4"
+
+  assert 4 == r.zunionstore("foobar", ["foo", "bar"])
+  assert ["s1", "s2", "s3", "s4"] == r.zrange("foobar", 0, -1)
+end
+
+test "ZUNIONSTORE with WEIGHTS" do |r|
+  r.zadd "foo", 1, "s1"
+  r.zadd "foo", 3, "s3"
+  r.zadd "bar", 20, "s2"
+  r.zadd "bar", 40, "s4"
+
+  assert 4 == r.zunionstore("foobar", ["foo", "bar"])
+  assert ["s1", "s3", "s2", "s4"] == r.zrange("foobar", 0, -1)
+
+  assert 4 == r.zunionstore("foobar", ["foo", "bar"], :weights => [10, 1])
+  assert ["s1", "s2", "s3", "s4"] == r.zrange("foobar", 0, -1)
+end
+
+test "ZUNIONSTORE with AGGREGATE" do |r|
+  r.zadd "foo", 1, "s1"
+  r.zadd "foo", 2, "s2"
+  r.zadd "bar", 4, "s2"
+  r.zadd "bar", 3, "s3"
+
+  assert 3 == r.zunionstore("foobar", ["foo", "bar"])
+  assert ["s1", "s3", "s2"] == r.zrange("foobar", 0, -1)
+
+  assert 3 == r.zunionstore("foobar", ["foo", "bar"], :aggregate => :min)
+  assert ["s1", "s2", "s3"] == r.zrange("foobar", 0, -1)
+
+  assert 3 == r.zunionstore("foobar", ["foo", "bar"], :aggregate => :max)
+  assert ["s1", "s3", "s2"] == r.zrange("foobar", 0, -1)
+end
+
+test "ZINTERSTORE" do |r|
+  r.zadd "foo", 1, "s1"
+  r.zadd "bar", 2, "s1"
+  r.zadd "foo", 3, "s3"
+  r.zadd "bar", 4, "s4"
+
+  assert 1 == r.zinterstore("foobar", ["foo", "bar"])
+  assert ["s1"] == r.zrange("foobar", 0, -1)
+end
+
+test "ZINTERSTORE with WEIGHTS" do |r|
+  r.zadd "foo", 1, "s1"
+  r.zadd "foo", 2, "s2"
+  r.zadd "foo", 3, "s3"
+  r.zadd "bar", 20, "s2"
+  r.zadd "bar", 30, "s3"
+  r.zadd "bar", 40, "s4"
+
+  assert 2 == r.zinterstore("foobar", ["foo", "bar"])
+  assert ["s2", "s3"] == r.zrange("foobar", 0, -1)
+
+  assert 2 == r.zinterstore("foobar", ["foo", "bar"], :weights => [10, 1])
+  assert ["s2", "s3"] == r.zrange("foobar", 0, -1)
+
+  assert "40" == r.zscore("foobar", "s2")
+  assert "60" == r.zscore("foobar", "s3")
+end
+
+test "ZINTERSTORE with AGGREGATE" do |r|
+  r.zadd "foo", 1, "s1"
+  r.zadd "foo", 2, "s2"
+  r.zadd "foo", 3, "s3"
+  r.zadd "bar", 20, "s2"
+  r.zadd "bar", 30, "s3"
+  r.zadd "bar", 40, "s4"
+
+  assert 2 == r.zinterstore("foobar", ["foo", "bar"])
+  assert ["s2", "s3"] == r.zrange("foobar", 0, -1)
+  assert "22" == r.zscore("foobar", "s2")
+  assert "33" == r.zscore("foobar", "s3")
+
+  assert 2 == r.zinterstore("foobar", ["foo", "bar"], :aggregate => :min)
+  assert ["s2", "s3"] == r.zrange("foobar", 0, -1)
+  assert "2" == r.zscore("foobar", "s2")
+  assert "3" == r.zscore("foobar", "s3")
+
+  assert 2 == r.zinterstore("foobar", ["foo", "bar"], :aggregate => :max)
+  assert ["s2", "s3"] == r.zrange("foobar", 0, -1)
+  assert "20" == r.zscore("foobar", "s2")
+  assert "30" == r.zscore("foobar", "s3")
+end
+

data/test/commands_on_strings_test.rb

@@ -0,0 +1,80 @@
+# encoding: UTF-8
+
+require File.expand_path("./helper", File.dirname(__FILE__))
+
+setup do
+  init Redis.new(OPTIONS)
+end
+
+load './test/lint/strings.rb'
+
+test "MGET" do |r|
+  r.set("foo", "s1")
+  r.set("bar", "s2")
+
+  assert ["s1", "s2"]      == r.mget("foo", "bar")
+  assert ["s1", "s2", nil] == r.mget("foo", "bar", "baz")
+end
+
+test "MGET mapped" do |r|
+  r.set("foo", "s1")
+  r.set("bar", "s2")
+
+  response = r.mapped_mget("foo", "bar")
+
+  assert "s1" == response["foo"]
+  assert "s2" == response["bar"]
+
+  response = r.mapped_mget("foo", "bar", "baz")
+
+  assert "s1" == response["foo"]
+  assert "s2" == response["bar"]
+  assert nil  == response["baz"]
+end
+
+test "Mapped MGET in a pipeline returns plain array" do |r|
+  r.set("foo", "s1")
+  r.set("bar", "s2")
+
+  result = r.pipelined do
+    assert nil == r.mapped_mget("foo", "bar")
+  end
+
+  assert result[0] == ["s1", "s2"]
+end
+
+test "MSET" do |r|
+  r.mset(:foo, "s1", :bar, "s2")
+
+  assert "s1" == r.get("foo")
+  assert "s2" == r.get("bar")
+end
+
+test "MSET mapped" do |r|
+  r.mapped_mset(:foo => "s1", :bar => "s2")
+
+  assert "s1" == r.get("foo")
+  assert "s2" == r.get("bar")
+end
+
+test "MSETNX" do |r|
+  r.set("foo", "s1")
+  r.msetnx(:foo, "s2", :bar, "s3")
+
+  assert "s1" == r.get("foo")
+  assert nil == r.get("bar")
+end
+
+test "MSETNX mapped" do |r|
+  r.set("foo", "s1")
+  r.mapped_msetnx(:foo => "s2", :bar => "s3")
+
+  assert "s1" == r.get("foo")
+  assert nil == r.get("bar")
+end
+
+test "STRLEN" do |r|
+  r.set "foo", "lorem"
+
+  assert 5 == r.strlen("foo")
+end

data/test/commands_on_value_types_test.rb

@@ -0,0 +1,88 @@
+# encoding: UTF-8
+
+require File.expand_path("./helper", File.dirname(__FILE__))
+require File.expand_path("./redis_mock", File.dirname(__FILE__))
+
+include RedisMock::Helper
+
+setup do
+  init Redis.new(OPTIONS)
+end
+
+load "./test/lint/value_types.rb"
+
+test "DEL" do |r|
+  r.set "foo", "s1"
+  r.set "bar", "s2"
+  r.set "baz", "s3"
+
+  assert ["bar", "baz", "foo"] == r.keys("*").sort
+
+  assert 1 == r.del("foo")
+
+  assert ["bar", "baz"] == r.keys("*").sort
+
+  assert 2 == r.del("bar", "baz")
+
+  assert [] == r.keys("*").sort
+end
+
+test "RANDOMKEY" do |r|
+  assert r.randomkey.to_s.empty?
+
+  r.set("foo", "s1")
+
+  assert "foo" == r.randomkey
+
+  r.set("bar", "s2")
+
+  4.times do
+    assert ["foo", "bar"].include?(r.randomkey)
+  end
+end
+
+test "RENAME" do |r|
+  r.set("foo", "s1")
+  r.rename "foo", "bar"
+
+  assert "s1" == r.get("bar")
+  assert nil == r.get("foo")
+end
+
+test "RENAMENX" do |r|
+  r.set("foo", "s1")
+  r.set("bar", "s2")
+
+  assert false == r.renamenx("foo", "bar")
+
+  assert "s1" == r.get("foo")
+  assert "s2" == r.get("bar")
+end
+
+test "DBSIZE" do |r|
+  assert 0 == r.dbsize
+
+  r.set("foo", "s1")
+
+  assert 1 == r.dbsize
+end
+
+test "FLUSHDB" do |r|
+  r.set("foo", "s1")
+  r.set("bar", "s2")
+
+  assert 2 == r.dbsize
+
+  r.flushdb
+
+  assert 0 == r.dbsize
+end
+
+test "FLUSHALL" do
+  redis_mock(:flushall => lambda { "+FLUSHALL" }) do
+    redis = Redis.new(OPTIONS.merge(:port => 6380))
+
+    assert "FLUSHALL" == redis.flushall
+  end
+end
+