redis 2.0.11 → 2.0.12

data/lib/redis.rb

@@ -1,7 +1,7 @@
 require 'socket'
 
 class Redis
-  VERSION = "2.0.11"
+  VERSION = "2.0.12"
 
   class ProtocolError < RuntimeError
     def initialize(reply_type)
@@ -36,6 +36,14 @@ class Redis
     new(options)
   end
 
+  def self.current
+    Thread.current[:redis] ||= Redis.connect
+  end
+
+  def self.current=(redis)
+    Thread.current[:redis] = redis
+  end
+
   def initialize(options = {})
     if options[:thread_safe]
       @client = Client::ThreadSafe.new(options)

data/lib/redis/client.rb

@@ -37,8 +37,10 @@ class Redis
     end
 
     def call_loop(*args)
-      process(args) do
-        loop { yield(read) }
+      without_socket_timeout do
+        process(args) do
+          loop { yield(read) }
+        end
       end
     end
 

data/lib/redis/url.rb

@@ -0,0 +1,69 @@
+require "uri/generic"
+
+module URI
+  class Redis < Generic
+    DEFAULT_PORT = 6379
+
+    COMPONENT = [:scheme, :password, :host, :port, :db].freeze
+
+    def db
+      path[1..-1].to_i
+    end
+
+    alias password user
+
+  protected
+    def check_path(value)
+      if super(value)
+      end
+    end
+  end
+
+  @@schemes["REDIS"] = Redis
+end
+require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
+require "redis/url"
+
+class RedisURLTest < Test::Unit::TestCase
+  test "default values" do
+    uri = URI.parse("redis://localhost")
+
+    assert_equal "localhost", uri.host
+    assert_equal 6379, uri.port
+    assert_equal 0, uri.db
+    assert_equal nil, uri.password
+  end
+
+  test "password" do
+    uri = URI.parse("redis://secret@localhost")
+
+    assert_equal "localhost", uri.host
+    assert_equal 6379, uri.port
+    assert_equal 0, uri.db
+    assert_equal "secret", uri.password
+  end
+
+  test "db number" do
+    uri = URI.parse("redis://secret@localhost/15")
+
+    assert_equal "localhost", uri.host
+    assert_equal 6379, uri.port
+    assert_equal 15, uri.db
+    assert_equal "secret", uri.password
+  end
+
+  test "port" do
+    uri = URI.parse("redis://localhost:6380")
+
+    assert_equal "localhost", uri.host
+    assert_equal 6380, uri.port
+    assert_equal 0, uri.db
+    assert_equal nil, uri.password
+  end
+
+  test "to_s" do
+    uri = URI.parse("redis://secret@localhost:6380/15")
+
+    assert_equal "redis://secret@localhost:6380/15", uri.to_s
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 0
-  - 11
-  version: 2.0.11
+  - 12
+  version: 2.0.12
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -21,7 +21,7 @@ autorequire: redis
 bindir: bin
 cert_chain: []
 
-date: 2010-10-14 00:00:00 -03:00
+date: 2010-10-27 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
@@ -43,6 +43,7 @@ files:
 - lib/redis/hash_ring.rb
 - lib/redis/pipeline.rb
 - lib/redis/subscribe.rb
+- lib/redis/url.rb
 - lib/redis.rb
 has_rdoc: true
 homepage: http://github.com/ezmobius/redis-rb