redis 2.0.4 → 2.0.5

data/lib/redis.rb

@@ -1,7 +1,7 @@
 require 'socket'
 
 class Redis
-  VERSION = "2.0.4"
+  VERSION = "2.0.5"
 
   class ProtocolError < RuntimeError
     def initialize(reply_type)
@@ -16,6 +16,8 @@ class Redis
   attr :client
 
   def self.connect(options = {})
+    options = options.dup
+
     require "uri"
 
     url = URI(options.delete(:url) || ENV["REDIS_URL"] || "redis://127.0.0.1:6379/0")

data/lib/redis/client.rb

@@ -267,25 +267,20 @@ class Redis
       end
     end
 
-    if RUBY_VERSION >= "1.9"
-      require "timeout"
+    begin
+      require "system_timer"
 
       def with_timeout(seconds, &block)
-        Timeout.timeout(seconds, &block)
+        SystemTimer.timeout_after(seconds, &block)
       end
-    else
-      begin
-        require "system_timer"
 
-        def with_timeout(seconds, &block)
-          SystemTimer.timeout_after(seconds, &block)
-        end
-      rescue LoadError
-        $stderr.puts "WARNING: Could not find a good alternative for performing time outs -- connecting to Redis will not time out. Try installing the SystemTimer gem."
+    rescue LoadError
+      warn "WARNING: using the built-in Timeout class which is known to have issues when used for opening connections. Install the SystemTimer gem if you want to make sure the Redis client will not hang." unless RUBY_VERSION >= "1.9" || RUBY_PLATFORM =~ /java/
 
-        def with_timeout(*args)
-          yield
-        end
+      require "timeout"
+
+      def with_timeout(seconds, &block)
+        Timeout.timeout(seconds, &block)
       end
     end
 

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: redis
 version: !ruby/object:Gem::Version 
-  hash: 7
   prerelease: false
   segments: 
   - 2
   - 0
-  - 4
-  version: 2.0.4
+  - 5
+  version: 2.0.5
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -22,7 +21,7 @@ autorequire: redis
 bindir: bin
 cert_chain: []
 
-date: 2010-07-22 00:00:00 -03:00
+date: 2010-07-30 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
@@ -44,7 +43,6 @@ 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
@@ -60,7 +58,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -69,7 +66,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"

data/lib/redis/url.rb

@@ -1,69 +0,0 @@
-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