redis 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4744291b8bc26230044fc12c456951a60c5802c7
-  data.tar.gz: 6eabe9bb60b74aa2408007a72f9a44e831b71a5e
+  metadata.gz: d74bd71d0e30d7a582b6840b4aaa45790a4a2a05
+  data.tar.gz: 8652e243304b3fba9f041bb7ea6c85b46e54f6a1
 SHA512:
-  metadata.gz: 7fb460a3595ed430dbf4dab6f516dcbef029cf1c72350e4e50b7e425e8d94b8d47760d33f58db21bad95852ec97fa7fdba55cfb0858292c221c947516a291f97
-  data.tar.gz: 7cdf461c39d5eede9b295bf987391cd70461cd5adcee945ae243d509f67457ea14aa0ad08ca47efdab8bb8ca315d6bdff94460d6cecc6b981f459081cd93dfbd
+  metadata.gz: c82eb96fce806b42775e86655c4a7fdf8dc87a728ee3998c67c9f5fd45c32ac8f618f14f4c7700106e8258901288e53c9b5612e0ba8ab8e089f758cf053b1e7f
+  data.tar.gz: 1a85694ea7fced9e4c0521a1d9d081d96a02e63fe8c9455af9a5d4be7858de3576fddc869939974bac1b1143ec9592d03a60165e7d1b75a2af8ea8f060b55ef2

data/CHANGELOG.md

@@ -12,6 +12,12 @@
   security updates in June of 2013; continuing to support it would prevent
   the use of newer features of Ruby.
 
+# 3.3.2
+
+* Added support for SPOP with COUNT. See #628.
+
+* Fixed connection glitches when using SSL. See #644.
+
 # 3.3.1
 
 * Remove usage of Timeout::timeout, refactor into using low level non-blocking writes.

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
 

data/lib/redis/connection/ruby.rb

@@ -27,8 +27,12 @@ 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"
+      NBIO_READ_EXCEPTIONS = [Errno::EWOULDBLOCK, Errno::EAGAIN]
+      NBIO_WRITE_EXCEPTIONS = [Errno::EWOULDBLOCK, Errno::EAGAIN]
+      if RUBY_VERSION >= "1.9.3"
+        NBIO_READ_EXCEPTIONS << IO::WaitReadable
+        NBIO_WRITE_EXCEPTIONS << IO::WaitWritable
+      end
 
       def initialize(*args)
         super(*args)
@@ -78,12 +82,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,7 +104,13 @@ class Redis
         begin
           write_nonblock(data)
 
-        rescue *NBIO_EXCEPTIONS
+        rescue *NBIO_READ_EXCEPTIONS
+          if IO.select([self], nil, nil, @write_timeout)
+            retry
+          else
+            raise Redis::TimeoutError
+          end
+        rescue *NBIO_WRITE_EXCEPTIONS
           if IO.select(nil, [self], nil, @write_timeout)
             retry
           else

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.2"
 end

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/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.2
 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: 2016-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake