redis 3.3.1 → 3.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4744291b8bc26230044fc12c456951a60c5802c7
-  data.tar.gz: 6eabe9bb60b74aa2408007a72f9a44e831b71a5e
+  metadata.gz: 729f56810aa501065e2fc203050363713c80ee37
+  data.tar.gz: e7e13fb75618f794a2c742d73d6c8a72699d5e92
 SHA512:
-  metadata.gz: 7fb460a3595ed430dbf4dab6f516dcbef029cf1c72350e4e50b7e425e8d94b8d47760d33f58db21bad95852ec97fa7fdba55cfb0858292c221c947516a291f97
-  data.tar.gz: 7cdf461c39d5eede9b295bf987391cd70461cd5adcee945ae243d509f67457ea14aa0ad08ca47efdab8bb8ca315d6bdff94460d6cecc6b981f459081cd93dfbd
+  metadata.gz: f87e76c751760b7f1feb7c859ea373c41ebf805c104c27e85177cb20a60d42b11c50db2d5a916fb7bfc78b82b13141770a851568aea922ccc1970f4e30ba1dea
+  data.tar.gz: ac4cb236c9c9897d73ead9421e161cf1c7aac2a3c1f77c088b5c52c324cddccda6ab749441093cbcc94ea812e70232f9f9ac1c160a96fd1fbd46d87586d1d7fb

data/CHANGELOG.md

@@ -1,16 +1,21 @@
-# 4.x (unreleased)
-
-## Planned breaking changes:
-* `Redis#client` will no longer expose the underlying `Redis::Client`;
-  it has not yet been determined how 4.0 will expose the underlying
-  functionality, but we will make every attempt to provide a final minor
-  release of 3.x that provides the new interfaces in order to facilitate
-  a smooth transition.
-
-* Ruby 1.8.7 (and the 1.8 modes of JRuby and Rubinius) will no longer be
-  supported; 1.8.x entered end-of-life in June of 2012 and stopped receiving
-  security updates in June of 2013; continuing to support it would prevent
-  the use of newer features of Ruby.
+# 3.3.5
+
+* Fixed Ruby 1.8 compatibility after backporting `Redis#connection`. See #719.
+
+# 3.3.4
+
+* `Redis#connection` returns a hash with connection information.
+  You shouldn't need to call `Redis#_client`, ever.
+
+# 3.3.3
+
+* Improved timeout handling after dropping Timeout module.
+
+# 3.3.2
+
+* Added support for SPOP with COUNT. See #628.
+
+* Fixed connection glitches when using SSL. See #644.
 
 # 3.3.1
 

data/lib/redis.rb

@@ -1336,13 +1336,18 @@ class Redis
     end
   end
 
-  # Remove and return a random member from a set.
+  # Remove and return one or more random member from a set.
   #
   # @param [String] key
   # @return [String]
-  def spop(key)
+  # @param [Fixnum] count
+  def spop(key, count = nil)
     synchronize do |client|
-      client.call([:spop, key])
+      if count.nil?
+        client.call([:spop, key])
+      else
+        client.call([:spop, key, count])
+      end
     end
   end
 
@@ -2695,6 +2700,16 @@ class Redis
     self.class.new(@options)
   end
 
+  def connection
+    {
+      :host     => @original_client.host,
+      :port     => @original_client.port,
+      :db       => @original_client.db,
+      :id       => @original_client.id,
+      :location => @original_client.location
+    }
+  end
+
   def method_missing(command, *args)
     synchronize do |client|
       client.call([command] + args)

data/lib/redis/client.rb

@@ -451,12 +451,12 @@ class Redis
       case options[:tcp_keepalive]
       when Hash
         [:time, :intvl, :probes].each do |key|
-          unless options[:tcp_keepalive][key].is_a?(Fixnum)
-            raise "Expected the #{key.inspect} key in :tcp_keepalive to be a Fixnum"
+          unless options[:tcp_keepalive][key].is_a?(Integer)
+            raise "Expected the #{key.inspect} key in :tcp_keepalive to be an Integer"
           end
         end
 
-      when Fixnum
+      when Integer
         if options[:tcp_keepalive] >= 60
           options[:tcp_keepalive] = {:time => options[:tcp_keepalive] - 20, :intvl => 10, :probes => 2}
 

data/lib/redis/connection/ruby.rb

@@ -27,8 +27,13 @@ class Redis
       CRLF = "\r\n".freeze
 
       # Exceptions raised during non-blocking I/O ops that require retrying the op
-      NBIO_EXCEPTIONS = [Errno::EWOULDBLOCK, Errno::EAGAIN]
-      NBIO_EXCEPTIONS << IO::WaitReadable if RUBY_VERSION >= "1.9.3"
+      if RUBY_VERSION >= "1.9.3"
+        NBIO_READ_EXCEPTIONS = [IO::WaitReadable]
+        NBIO_WRITE_EXCEPTIONS = [IO::WaitWritable]
+      else
+        NBIO_READ_EXCEPTIONS = [Errno::EWOULDBLOCK, Errno::EAGAIN]
+        NBIO_WRITE_EXCEPTIONS = [Errno::EWOULDBLOCK, Errno::EAGAIN]
+      end
 
       def initialize(*args)
         super(*args)
@@ -78,12 +83,18 @@ class Redis
         begin
           read_nonblock(nbytes)
 
-        rescue *NBIO_EXCEPTIONS
+        rescue *NBIO_READ_EXCEPTIONS
           if IO.select([self], nil, nil, @timeout)
             retry
           else
             raise Redis::TimeoutError
           end
+        rescue *NBIO_WRITE_EXCEPTIONS
+          if IO.select(nil, [self], nil, @timeout)
+            retry
+          else
+            raise Redis::TimeoutError
+          end
         end
 
       rescue EOFError
@@ -94,12 +105,18 @@ class Redis
         begin
           write_nonblock(data)
 
-        rescue *NBIO_EXCEPTIONS
+        rescue *NBIO_WRITE_EXCEPTIONS
           if IO.select(nil, [self], nil, @write_timeout)
             retry
           else
             raise Redis::TimeoutError
           end
+        rescue *NBIO_READ_EXCEPTIONS
+          if IO.select([self], nil, nil, @write_timeout)
+            retry
+          else
+            raise Redis::TimeoutError
+          end
         end
 
       rescue EOFError
@@ -290,6 +307,7 @@ class Redis
           raise ArgumentError, "SSL incompatible with unix sockets" if config[:ssl]
           sock = UNIXSocket.connect(config[:path], config[:connect_timeout])
         elsif config[:scheme] == "rediss" || config[:ssl]
+          raise ArgumentError, "This library does not support SSL on Ruby < 1.9" if RUBY_VERSION < "1.9.3"
           sock = SSLSocket.connect(config[:host], config[:port], config[:connect_timeout], config[:ssl_params])
         else
           sock = TCPSocket.connect(config[:host], config[:port], config[:connect_timeout])

data/lib/redis/distributed.rb

@@ -483,8 +483,8 @@ class Redis
     end
 
     # Remove and return a random member from a set.
-    def spop(key)
-      node_for(key).spop(key)
+    def spop(key, count = nil)
+      node_for(key).spop(key, count)
     end
 
     # Get a random member from a set.

data/lib/redis/version.rb

@@ -1,3 +1,3 @@
 class Redis
-  VERSION = "3.3.1"
+  VERSION = "3.3.5"
 end

data/test/connection_test.rb

@@ -0,0 +1,57 @@
+require_relative "helper"
+
+class TestConnection < Test::Unit::TestCase
+
+  include Helper::Client
+
+  def test_provides_a_meaningful_inspect
+    assert_equal "#<Redis client v#{Redis::VERSION} for redis://127.0.0.1:#{PORT}/15>", r.inspect
+  end
+
+  def test_connection_information
+    assert_equal "127.0.0.1",                 r.connection.fetch(:host)
+    assert_equal 6381,                        r.connection.fetch(:port)
+    assert_equal 15,                          r.connection.fetch(:db)
+    assert_equal "127.0.0.1:6381",            r.connection.fetch(:location)
+    assert_equal "redis://127.0.0.1:6381/15", r.connection.fetch(:id)
+  end
+
+  def test_default_id_with_host_and_port
+    redis = Redis.new(OPTIONS.merge(:host => "host", :port => "1234", :db => 0))
+    assert_equal "redis://host:1234/0", redis.connection.fetch(:id)
+  end
+
+  def test_default_id_with_host_and_port_and_explicit_scheme
+    redis = Redis.new(OPTIONS.merge(:host => "host", :port => "1234", :db => 0, :scheme => "foo"))
+    assert_equal "redis://host:1234/0", redis.connection.fetch(:id)
+  end
+
+  def test_default_id_with_path
+    redis = Redis.new(OPTIONS.merge(:path => "/tmp/redis.sock", :db => 0))
+    assert_equal "redis:///tmp/redis.sock/0", redis.connection.fetch(:id)
+  end
+
+  def test_default_id_with_path_and_explicit_scheme
+    redis = Redis.new(OPTIONS.merge(:path => "/tmp/redis.sock", :db => 0, :scheme => "foo"))
+    assert_equal "redis:///tmp/redis.sock/0", redis.connection.fetch(:id)
+  end
+
+  def test_override_id
+    redis = Redis.new(OPTIONS.merge(:id => "test"))
+    assert_equal "test", redis.connection.fetch(:id)
+  end
+
+  def test_id_inside_multi
+    redis         = Redis.new(OPTIONS)
+    id            = nil
+    connection_id = nil
+
+    redis.multi do
+      id            = redis.id
+      connection_id = redis.connection.fetch(:id)
+    end
+
+    assert_equal "redis://127.0.0.1:6381/15", id
+    assert_equal "redis://127.0.0.1:6381/15", connection_id
+  end
+end

data/test/internals_test.rb

@@ -44,10 +44,6 @@ class TestInternals < Test::Unit::TestCase
     end
   end
 
-  def test_provides_a_meaningful_inspect
-    assert_equal "#<Redis client v#{Redis::VERSION} for redis://127.0.0.1:#{PORT}/15>", r.inspect
-  end
-
   def test_redis_current
     assert_equal "127.0.0.1", Redis.current.client.host
     assert_equal 6379, Redis.current.client.port
@@ -79,48 +75,12 @@ class TestInternals < Test::Unit::TestCase
     assert !fresh_client.connected?
   end
 
-  def test_default_id_with_host_and_port
-    redis = Redis.new(OPTIONS.merge(:host => "host", :port => "1234", :db => 0))
-    assert_equal "redis://host:1234/0", redis.client.id
-  end
-
-  def test_default_id_with_host_and_port_and_explicit_scheme
-    redis = Redis.new(OPTIONS.merge(:host => "host", :port => "1234", :db => 0, :scheme => "foo"))
-    assert_equal "redis://host:1234/0", redis.client.id
-  end
-
-  def test_default_id_with_path
-    redis = Redis.new(OPTIONS.merge(:path => "/tmp/redis.sock", :db => 0))
-    assert_equal "redis:///tmp/redis.sock/0", redis.client.id
-  end
-
-  def test_default_id_with_path_and_explicit_scheme
-    redis = Redis.new(OPTIONS.merge(:path => "/tmp/redis.sock", :db => 0, :scheme => "foo"))
-    assert_equal "redis:///tmp/redis.sock/0", redis.client.id
-  end
-
-  def test_override_id
-    redis = Redis.new(OPTIONS.merge(:id => "test"))
-    assert_equal redis.client.id, "test"
-  end
-
   def test_timeout
     assert_nothing_raised do
       Redis.new(OPTIONS.merge(:timeout => 0))
     end
   end
 
-  def test_id_inside_multi
-    redis = Redis.new(OPTIONS)
-    id = nil
-
-    redis.multi do
-      id = redis.id
-    end
-
-    assert_equal id, "redis://127.0.0.1:6381/15"
-  end
-
   driver(:ruby) do
     def test_tcp_keepalive
       keepalive = {:time => 20, :intvl => 10, :probes => 5}

data/test/lint/sets.rb

@@ -52,6 +52,21 @@ module Lint
       assert_equal nil, r.spop("foo")
     end
 
+    def test_spop_with_positive_count
+      target_version "3.2.0" do
+        r.sadd "foo", "s1"
+        r.sadd "foo", "s2"
+        r.sadd "foo", "s3"
+        r.sadd "foo", "s4"
+
+        pops = r.spop("foo", 3)
+
+        assert !(["s1", "s2", "s3", "s4"] & pops).empty?
+        assert_equal 3, pops.size
+        assert_equal 1, r.scard("foo")
+      end
+    end
+
     def test_scard
       assert_equal 0, r.scard("foo")
 

data/test/remote_server_control_commands_test.rb

@@ -101,7 +101,7 @@ class TestRemoteServerControlCommands < Test::Unit::TestCase
     assert_equal 1, r.object(:refcount, "list")
     encoding = r.object(:encoding, "list")
     assert "ziplist" == encoding || "quicklist" == encoding, "Wrong encoding for list"
-    assert r.object(:idletime, "list").kind_of?(Fixnum)
+    assert r.object(:idletime, "list").kind_of?(Integer)
   end
 
   def test_sync

data/test/ssl_test.rb

@@ -25,6 +25,13 @@ if RUBY_VERSION >= "1.9.3"
         end
       end
 
+      def test_ssl_blocking
+        RedisMock.start({}, ssl_server_opts("trusted")) do |port|
+          redis = Redis.new(:port => port, :ssl => true, :ssl_params => { :ca_file => ssl_ca_file })
+          assert_equal redis.set("boom", "a" * 10_000_000), "OK"
+        end
+      end
+
     end
 
     driver(:hiredis, :synchrony) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.5
 platform: ruby
 authors:
 - Ezra Zygmuntowicz
@@ -16,7 +16,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-18 00:00:00.000000000 Z
+date: 2017-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -109,6 +109,7 @@ files:
 - test/commands_on_strings_test.rb
 - test/commands_on_value_types_test.rb
 - test/connection_handling_test.rb
+- test/connection_test.rb
 - test/db/.gitkeep
 - test/distributed_blocking_commands_test.rb
 - test/distributed_commands_on_hashes_test.rb
@@ -211,6 +212,7 @@ test_files:
 - test/commands_on_strings_test.rb
 - test/commands_on_value_types_test.rb
 - test/connection_handling_test.rb
+- test/connection_test.rb
 - test/db/.gitkeep
 - test/distributed_blocking_commands_test.rb
 - test/distributed_commands_on_hashes_test.rb