redis 2.1.1 → 2.2.0

data/test/remote_server_control_commands_test.rb

@@ -0,0 +1,63 @@
+# 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
+
+test "INFO" do |r|
+  %w(last_save_time redis_version total_connections_received connected_clients total_commands_processed connected_slaves uptime_in_seconds used_memory uptime_in_days changes_since_last_save).each do |x|
+    assert r.info.keys.include?(x)
+  end
+end
+
+test "MONITOR" do |r|
+  log = []
+
+  wire = Wire.new do
+    Redis.new(OPTIONS).monitor do |line|
+      log << line
+      break if log.size == 3
+    end
+  end
+
+  Wire.pass while log.empty? # Faster than sleep
+
+  r.set "foo", "s1"
+
+  wire.join
+
+  assert log[-1][%q{(db 15) "set" "foo" "s1"}]
+end
+
+test "MONITOR returns value for break" do |r|
+  result = r.monitor do |line|
+    break line
+  end
+
+  assert result == "OK"
+end
+
+test "ECHO" do |r|
+  assert "foo bar baz\n" == r.echo("foo bar baz\n")
+end
+
+test "DEBUG" do |r|
+  r.set "foo", "s1"
+
+  assert r.debug(:object, "foo").kind_of?(String)
+end
+
+test "SYNC" do |r|
+  replies = {:sync => lambda { "+OK" }}
+
+  redis_mock(replies) do
+    redis = Redis.new(OPTIONS.merge(:port => 6380))
+
+    assert "OK" == redis.sync
+  end
+end

data/test/sorting_test.rb

@@ -0,0 +1,44 @@
+# encoding: UTF-8
+
+require File.expand_path("./helper", File.dirname(__FILE__))
+
+setup do
+  init Redis.new(OPTIONS)
+end
+
+test "SORT" do |r|
+  r.set("foo:1", "s1")
+  r.set("foo:2", "s2")
+
+  r.rpush("bar", "1")
+  r.rpush("bar", "2")
+
+  assert ["s1"] == r.sort("bar", :get => "foo:*", :limit => [0, 1])
+  assert ["s2"] == r.sort("bar", :get => "foo:*", :limit => [0, 1], :order => "desc alpha")
+end
+
+test "SORT with an array of GETs" do |r|
+  r.set("foo:1:a", "s1a")
+  r.set("foo:1:b", "s1b")
+
+  r.set("foo:2:a", "s2a")
+  r.set("foo:2:b", "s2b")
+
+  r.rpush("bar", "1")
+  r.rpush("bar", "2")
+
+  assert ["s1a", "s1b"] == r.sort("bar", :get => ["foo:*:a", "foo:*:b"], :limit => [0, 1])
+  assert ["s2a", "s2b"] == r.sort("bar", :get => ["foo:*:a", "foo:*:b"], :limit => [0, 1], :order => "desc alpha")
+end
+
+test "SORT with STORE" do |r|
+  r.set("foo:1", "s1")
+  r.set("foo:2", "s2")
+
+  r.rpush("bar", "1")
+  r.rpush("bar", "2")
+
+  r.sort("bar", :get => "foo:*", :store => "baz")
+  assert ["s1", "s2"] == r.lrange("baz", 0, -1)
+end
+

data/test/synchrony_driver.rb

@@ -0,0 +1,57 @@
+# encoding: UTF-8
+
+require 'em-synchrony'
+
+require 'redis'
+require 'redis/connection/synchrony'
+
+require File.expand_path("./helper", File.dirname(__FILE__))
+
+#
+# if running under Eventmachine + Synchrony (Ruby 1.9+), then
+# we can simulate the blocking API while performing the network
+# IO via the EM reactor.
+#
+
+EM.synchrony do
+  r = Redis.new
+  r.flushdb
+
+  r.rpush "foo", "s1"
+  r.rpush "foo", "s2"
+
+  assert 2 == r.llen("foo")
+  assert "s2" == r.rpop("foo")
+
+  r.set("foo", "bar")
+
+  assert "bar" == r.getset("foo", "baz")
+  assert "baz" == r.get("foo")
+
+  r.set("foo", "a")
+
+  assert_equal 1, r.getbit("foo", 1)
+  assert_equal 1, r.getbit("foo", 2)
+  assert_equal 0, r.getbit("foo", 3)
+  assert_equal 0, r.getbit("foo", 4)
+  assert_equal 0, r.getbit("foo", 5)
+  assert_equal 0, r.getbit("foo", 6)
+  assert_equal 1, r.getbit("foo", 7)
+
+  r.flushdb
+
+  # command pipelining
+  r.pipelined do
+    r.lpush "foo", "s1"
+    r.lpush "foo", "s2"
+  end
+
+  assert 2 == r.llen("foo")
+  assert "s2" == r.lpop("foo")
+  assert "s1" == r.lpop("foo")
+
+  assert "OK" == r.client.call(:quit)
+  assert "PONG" == r.ping
+
+  EM.stop
+end

data/test/test.conf

@@ -0,0 +1,8 @@
+dir ./test/db
+pidfile ./redis.pid
+port 6379
+timeout 300
+loglevel debug
+logfile stdout
+databases 16
+daemonize yes

data/test/thread_safety_test.rb

@@ -0,0 +1,30 @@
+# encoding: UTF-8
+
+require File.expand_path("./helper", File.dirname(__FILE__))
+
+setup do
+  init Redis.new(OPTIONS)
+end
+
+test "thread safety" do
+  redis = Redis.connect(OPTIONS.merge(:thread_safe => true))
+
+  redis.set "foo", 1
+  redis.set "bar", 2
+
+  sample = 100
+
+  t1 = Thread.new do
+    $foos = Array.new(sample) { redis.get "foo" }
+  end
+
+  t2 = Thread.new do
+    $bars = Array.new(sample) { redis.get "bar" }
+  end
+
+  t1.join
+  t2.join
+
+  assert_equal ["1"], $foos.uniq
+  assert_equal ["2"], $bars.uniq
+end

data/test/transactions_test.rb

@@ -0,0 +1,100 @@
+# encoding: UTF-8
+
+require File.expand_path("./helper", File.dirname(__FILE__))
+
+setup do
+  init Redis.new(OPTIONS)
+end
+
+test "MULTI/DISCARD" do |r|
+  r.multi
+
+  assert "QUEUED" == r.set("foo", "1")
+  assert "QUEUED" == r.get("foo")
+
+  r.discard
+
+  assert nil == r.get("foo")
+end
+
+test "MULTI/EXEC with a block" do |r|
+  r.multi do |multi|
+    multi.set "foo", "s1"
+  end
+
+  assert "s1" == r.get("foo")
+
+  assert_raise(RuntimeError) do
+    r.multi do |multi|
+      multi.set "bar", "s2"
+      raise "Some error"
+      multi.set "baz", "s3"
+    end
+  end
+
+  assert nil == r.get("bar")
+  assert nil == r.get("baz")
+end
+
+test "Don't raise (and ignore) immediate error in MULTI/EXEC" do |r|
+  result = r.multi do |m|
+    m.set("foo", "s1")
+    m.unknown_command
+  end
+
+  assert 1 == result.size
+  assert "OK" == result.first
+  assert "s1" == r.get("foo")
+end
+
+test "Don't raise delayed error in MULTI/EXEC" do |r|
+  result = r.multi do |m|
+    m.set("foo", "s1")
+    m.incr("foo") # not an integer
+    m.lpush("foo", "value") # wrong kind of value
+  end
+
+  assert result[1].message =~ /not an integer/i
+  assert result[2].message =~ /wrong kind of value/i
+  assert "s1" == r.get("foo")
+end
+
+test "MULTI with a block yielding the client" do |r|
+  r.multi do |multi|
+    multi.set "foo", "s1"
+  end
+
+  assert "s1" == r.get("foo")
+end
+
+test "WATCH with an unmodified key" do |r|
+  r.watch "foo"
+  r.multi do |multi|
+    multi.set "foo", "s1"
+  end
+
+  assert "s1" == r.get("foo")
+end
+
+test "WATCH with a modified key" do |r|
+  r.watch "foo"
+  r.set "foo", "s1"
+  res = r.multi do |multi|
+    multi.set "foo", "s2"
+  end
+
+  assert nil == res
+  assert "s1" == r.get("foo")
+end
+
+test "UNWATCH with a modified key" do |r|
+  r.watch "foo"
+  r.set "foo", "s1"
+  r.unwatch
+  r.multi do |multi|
+    multi.set "foo", "s2"
+  end
+
+  assert "s2" == r.get("foo")
+end
+

data/test/unknown_commands_test.rb

@@ -0,0 +1,14 @@
+ # encoding: UTF-8
+
+require File.expand_path("./helper", File.dirname(__FILE__))
+
+setup do
+  init Redis.new(OPTIONS)
+end
+
+test "should try to work" do |r|
+  assert_raise RuntimeError do
+    r.not_yet_implemented_command
+  end
+end
+

data/test/url_param_test.rb

@@ -0,0 +1,60 @@
+# encoding: UTF-8
+
+require File.expand_path("./helper", File.dirname(__FILE__))
+
+test "URL defaults to 127.0.0.1:6379" do
+  redis = Redis.connect
+
+  assert "127.0.0.1" == redis.client.host
+  assert 6379 == redis.client.port
+  assert 0 == redis.client.db
+  assert nil == redis.client.password
+end
+
+test "allows to pass in a URL" do
+  redis = Redis.connect :url => "redis://:secr3t@foo.com:999/2"
+
+  assert "foo.com" == redis.client.host
+  assert 999 == redis.client.port
+  assert 2 == redis.client.db
+  assert "secr3t" == redis.client.password
+end
+
+test "override URL if path option is passed" do
+  redis = Redis.connect :url => "redis://:secr3t@foo.com/foo:999/2", :path => "/tmp/redis.sock"
+
+  assert "/tmp/redis.sock" == redis.client.path
+  assert nil == redis.client.host
+  assert nil == redis.client.port
+end
+
+test "overrides URL if another connection option is passed" do
+  redis = Redis.connect :url => "redis://:secr3t@foo.com:999/2", :port => 1000
+
+  assert "foo.com" == redis.client.host
+  assert 1000 == redis.client.port
+  assert 2 == redis.client.db
+  assert "secr3t" == redis.client.password
+end
+
+test "does not modify the passed options" do
+  options = { :url => "redis://:secr3t@foo.com:999/2" }
+
+  redis = Redis.connect(options)
+
+  assert({ :url => "redis://:secr3t@foo.com:999/2" } == options)
+end
+
+test "uses REDIS_URL over default if available" do
+  ENV["REDIS_URL"] = "redis://:secr3t@foo.com:999/2"
+
+  redis = Redis.connect
+
+  assert "foo.com" == redis.client.host
+  assert 999 == redis.client.port
+  assert 2 == redis.client.db
+  assert "secr3t" == redis.client.password
+
+  ENV.delete("REDIS_URL")
+end
+

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: redis
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 2
-  - 1
-  - 1
-  version: 2.1.1
+  prerelease: 
+  version: 2.2.0
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -17,11 +13,12 @@ authors:
 - Luca Guidi
 - Michel Martens
 - Damian Janowski
+- Pieter Noordhuis
 autorequire: redis
 bindir: bin
 cert_chain: []
 
-date: 2010-11-05 00:00:00 -03:00
+date: 2011-03-29 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
@@ -31,20 +28,90 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
+extra_rdoc_files: []
+
 files: 
+- .gitignore
+- CHANGELOG.md
 - LICENSE
-- README.markdown
+- README.md
 - Rakefile
+- benchmarking/logging.rb
+- benchmarking/pipeline.rb
+- benchmarking/speed.rb
+- benchmarking/suite.rb
+- benchmarking/thread_safety.rb
+- benchmarking/worker.rb
+- examples/basic.rb
+- examples/dist_redis.rb
+- examples/incr-decr.rb
+- examples/list.rb
+- examples/pubsub.rb
+- examples/sets.rb
+- examples/unicorn/config.ru
+- examples/unicorn/unicorn.rb
+- lib/redis.rb
 - lib/redis/client.rb
 - lib/redis/compat.rb
 - lib/redis/connection.rb
+- lib/redis/connection/command_helper.rb
+- lib/redis/connection/hiredis.rb
+- lib/redis/connection/registry.rb
+- lib/redis/connection/ruby.rb
+- lib/redis/connection/synchrony.rb
 - lib/redis/distributed.rb
 - lib/redis/hash_ring.rb
 - lib/redis/pipeline.rb
 - lib/redis/subscribe.rb
-- lib/redis.rb
+- lib/redis/version.rb
+- redis.gemspec
+- test/commands_on_hashes_test.rb
+- test/commands_on_lists_test.rb
+- test/commands_on_sets_test.rb
+- test/commands_on_sorted_sets_test.rb
+- test/commands_on_strings_test.rb
+- test/commands_on_value_types_test.rb
+- test/connection_handling_test.rb
+- test/db/.gitignore
+- test/distributed_blocking_commands_test.rb
+- test/distributed_commands_on_hashes_test.rb
+- test/distributed_commands_on_lists_test.rb
+- test/distributed_commands_on_sets_test.rb
+- test/distributed_commands_on_strings_test.rb
+- test/distributed_commands_on_value_types_test.rb
+- test/distributed_commands_requiring_clustering_test.rb
+- test/distributed_connection_handling_test.rb
+- test/distributed_internals_test.rb
+- test/distributed_key_tags_test.rb
+- test/distributed_persistence_control_commands_test.rb
+- test/distributed_publish_subscribe_test.rb
+- test/distributed_remote_server_control_commands_test.rb
+- test/distributed_sorting_test.rb
+- test/distributed_test.rb
+- test/distributed_transactions_test.rb
+- test/encoding_test.rb
+- test/error_replies_test.rb
+- test/helper.rb
+- test/internals_test.rb
+- test/lint/hashes.rb
+- test/lint/internals.rb
+- test/lint/lists.rb
+- test/lint/sets.rb
+- test/lint/sorted_sets.rb
+- test/lint/strings.rb
+- test/lint/value_types.rb
+- test/persistence_control_commands_test.rb
+- test/pipelining_commands_test.rb
+- test/publish_subscribe_test.rb
+- test/redis_mock.rb
+- test/remote_server_control_commands_test.rb
+- test/sorting_test.rb
+- test/synchrony_driver.rb
+- test/test.conf
+- test/thread_safety_test.rb
+- test/transactions_test.rb
+- test/unknown_commands_test.rb
+- test/url_param_test.rb
 has_rdoc: true
 homepage: http://github.com/ezmobius/redis-rb
 licenses: []
@@ -59,23 +126,65 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.7
+rubyforge_project: redis-rb
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Ruby client library for Redis, the key value storage server
-test_files: []
-
+test_files: 
+- test/commands_on_hashes_test.rb
+- test/commands_on_lists_test.rb
+- test/commands_on_sets_test.rb
+- test/commands_on_sorted_sets_test.rb
+- test/commands_on_strings_test.rb
+- test/commands_on_value_types_test.rb
+- test/connection_handling_test.rb
+- test/db/.gitignore
+- test/distributed_blocking_commands_test.rb
+- test/distributed_commands_on_hashes_test.rb
+- test/distributed_commands_on_lists_test.rb
+- test/distributed_commands_on_sets_test.rb
+- test/distributed_commands_on_strings_test.rb
+- test/distributed_commands_on_value_types_test.rb
+- test/distributed_commands_requiring_clustering_test.rb
+- test/distributed_connection_handling_test.rb
+- test/distributed_internals_test.rb
+- test/distributed_key_tags_test.rb
+- test/distributed_persistence_control_commands_test.rb
+- test/distributed_publish_subscribe_test.rb
+- test/distributed_remote_server_control_commands_test.rb
+- test/distributed_sorting_test.rb
+- test/distributed_test.rb
+- test/distributed_transactions_test.rb
+- test/encoding_test.rb
+- test/error_replies_test.rb
+- test/helper.rb
+- test/internals_test.rb
+- test/lint/hashes.rb
+- test/lint/internals.rb
+- test/lint/lists.rb
+- test/lint/sets.rb
+- test/lint/sorted_sets.rb
+- test/lint/strings.rb
+- test/lint/value_types.rb
+- test/persistence_control_commands_test.rb
+- test/pipelining_commands_test.rb
+- test/publish_subscribe_test.rb
+- test/redis_mock.rb
+- test/remote_server_control_commands_test.rb
+- test/sorting_test.rb
+- test/synchrony_driver.rb
+- test/test.conf
+- test/thread_safety_test.rb
+- test/transactions_test.rb
+- test/unknown_commands_test.rb
+- test/url_param_test.rb