redis 2.0.3 → 2.0.4

data/Rakefile

@@ -60,7 +60,8 @@ task :stop do
 end
 
 Rake::TestTask.new(:test) do |t|
-  t.pattern = 'test/**/*_test.rb'
+  t.pattern = "test/**/*_test.rb"
+  t.ruby_opts << "-r rubygems"
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

data/lib/redis.rb

@@ -1,7 +1,7 @@
 require 'socket'
 
 class Redis
-  VERSION = "2.0.3"
+  VERSION = "2.0.4"
 
   class ProtocolError < RuntimeError
     def initialize(reply_type)
@@ -284,6 +284,10 @@ class Redis
     @client.call(:zrangebyscore, key, min, max, *command.to_a)
   end
 
+  def zcount(key, start, stop)
+    @client.call(:zcount, key, start, stop)
+  end
+
   def zrevrange(key, start, stop, options = {})
     command = CommandOptions.new(options) do |c|
       c.bool :with_scores
@@ -617,18 +621,6 @@ private
 
 end
 
-begin
-  if RUBY_VERSION >= '1.9'
-    require 'timeout'
-    Redis::Timer = Timeout
-  else
-    require 'system_timer'
-    Redis::Timer = SystemTimer
-  end
-rescue LoadError
-  Redis::Timer = nil
-end
-
 require 'redis/client'
 require 'redis/pipeline'
 require 'redis/subscribe'

data/lib/redis/client.rb

@@ -84,7 +84,6 @@ class Redis
     end
 
     def read
-
       # We read the first byte using read() mainly because gets() is
       # immune to raw socket timeouts.
       begin
@@ -182,7 +181,7 @@ class Redis
     def format_bulk_reply(line)
       bulklen = line.to_i
       return if bulklen == -1
-      reply = @sock.read(bulklen)
+      reply = encode(@sock.read(bulklen))
       @sock.read(2) # Discard CRLF.
       reply
     end
@@ -191,9 +190,7 @@ class Redis
       n = line.to_i
       return if n == -1
 
-      reply = []
-      n.times { reply << read }
-      reply
+      Array.new(n) { read }
     end
 
     def logging(commands)
@@ -211,18 +208,9 @@ class Redis
       end
     end
 
-    if defined?(Timeout)
-      TimeoutError = Timeout::Error
-    else
-      TimeoutError = Exception
-    end
-
     def connect_to(host, port)
-      begin
+      with_timeout(@timeout) do
         @sock = TCPSocket.new(host, port)
-      rescue TimeoutError
-        @sock = nil
-        raise
       end
 
       @sock.setsockopt Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1
@@ -253,7 +241,7 @@ class Redis
 
       begin
         yield
-      rescue Errno::ECONNRESET, Errno::EPIPE, Errno::ECONNABORTED
+      rescue Errno::ECONNRESET, Errno::EPIPE, Errno::ECONNABORTED, Errno::EBADF
         if reconnect
           yield
         else
@@ -275,10 +263,40 @@ class Redis
       end
 
       def ensure_connected(&block)
-        super do
-          synchronize(&block)
+        synchronize { super }
+      end
+    end
+
+    if RUBY_VERSION >= "1.9"
+      require "timeout"
+
+      def with_timeout(seconds, &block)
+        Timeout.timeout(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."
+
+        def with_timeout(*args)
+          yield
         end
       end
     end
+
+    if defined?(Encoding)
+      def encode(string)
+        string.force_encoding(Encoding::default_external)
+      end
+    else
+      def encode(string)
+        string
+      end
+    end
   end
 end

data/lib/redis/url.rb

@@ -21,3 +21,49 @@ module URI
 
   @@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

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redis
 version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: false
   segments: 
   - 2
   - 0
-  - 3
-  version: 2.0.3
+  - 4
+  version: 2.0.4
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -21,7 +22,7 @@ autorequire: redis
 bindir: bin
 cert_chain: []
 
-date: 2010-06-22 00:00:00 -03:00
+date: 2010-07-22 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
@@ -59,6 +60,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -67,6 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"