redis 4.1.4 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83f1f7270db68603d63e86ec43e68348cb5ccb2b4e6759642d89898566bdbaf6
-  data.tar.gz: 45c5bcc92629ec7d85cdc2b913e7922cd5425f2e6691891efc379aeec73026b3
+  metadata.gz: 9796f6646b7d3aaeeb5ef37629fb1a43422285724d8d2901a219ef4f2882eff5
+  data.tar.gz: b89f4f1d6a3c9ee93202ce08cdcd3ed184694b5693f7461be7cf7e517139a278
 SHA512:
-  metadata.gz: 692dfc5c73c6410492589f38f279976a023f6a2ff13f7b1476806011eb387f41bed784bdeac746de5f4b990b6d22bf297b36dddc7b8e448a842241a389f50796
-  data.tar.gz: 55a9e305c7563f5dd7d38f50dc7b919967dbb0f6a131ebc5e1569f49f196ab458203b6594394fa9a33ea9e337b741113e781378113783683dd36b87196607b8f
+  metadata.gz: be709e1aad1acee8d7c3e121e946060ce9b693ac80e25af200e2a579988f3952d6522cb9855917dc76628ae2038365bb8754b49a7cc6e90395706ba30fc87a86
+  data.tar.gz: 00102b01b4b37daab76fc90990f980a4710bec0e797a70d65a7544ef304f01f9b9babbdcc680da71513dd8f79649bd5f529e6804e71297b26978625bea746367

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Unreleased
 
+# 4.2.0
+
+* Convert commands to accept keyword arguments rather than option hashes. This both help catching typos, and reduce needless allocations.
+* Deprecate the synchrony driver. It will be removed in 5.0 and hopefully maintained as a separate gem. See #915.
+* Make `Redis#exists` variadic, will return an Integer if called with multiple keys.
+* Add `Redis#exists?` to get a Boolean if any of the keys exists.
+* `Redis#exists` when called with a single key will warn that future versions will return an Integer.
+  Set `Redis.exists_returns_integer = true` to opt-in to the new behavior.
+* Support `keepttl` ooption in `set`. See #913.
+* Optimized initialization of Redis::Cluster. See #912.
+* Accept sentinel options even with string key. See #599.
+* Verify TLS connections by default. See #900.
+
 # 4.1.4
 
 * Alias `Redis#disconnect` as `#close`. See #901.
@@ -9,6 +22,7 @@
 * Increase buffer size in the ruby connector. See #880.
 * Fix thread safety of `Redis.queue`. See #878.
 * Deprecate `Redis::Future#==` as it's likely to be a mistake. See #876.
+* Support `KEEPTTL` option for SET command. See #913.
 
 # 4.1.3
 

data/README.md

@@ -3,6 +3,7 @@
 A Ruby client that tries to match [Redis][redis-home]' API one-to-one, while still
 providing an idiomatic interface.
 
+See [RubyDoc.info][rubydoc] for the API docs of the latest published gem.
 
 ## Getting started
 
@@ -34,6 +35,9 @@ You can also specify connection options as a [`redis://` URL][redis-url]:
 redis = Redis.new(url: "redis://:p4ssw0rd@10.0.1.1:6380/15")
 ```
 
+The client expects passwords with special chracters to be URL-encoded (i.e.
+`CGI.escape(password)`).
+
 By default, the client will try to read the `REDIS_URL` environment variable
 and use that as URL to connect to. The above statement is therefore equivalent
 to setting this environment variable and calling `Redis.new` without arguments.
@@ -147,8 +151,8 @@ redis.mget('{key}1', '{key}2')
 
 ## Storing objects
 
-Redis only stores strings as values. If you want to store an object, you
-can use a serialization mechanism such as JSON:
+Redis "string" types can be used to store serialized Ruby objects, for
+example with JSON:
 
 ```ruby
 require "json"
@@ -322,7 +326,7 @@ This library supports natively terminating client side SSL/TLS connections
 when talking to Redis via a server-side proxy such as [stunnel], [hitch],
 or [ghostunnel].
 
-To enable SSL support, pass the `:ssl => :true` option when configuring the
+To enable SSL support, pass the `:ssl => true` option when configuring the
 Redis client, or pass in `:url => "rediss://..."` (like HTTPS for Redis).
 You will also need to pass in an `:ssl_params => { ... }` hash used to
 configure the `OpenSSL::SSL::SSLContext` object used for the connection:
@@ -451,7 +455,7 @@ client and evangelized Redis in Rubyland. Thank you, Ezra.
 ## Contributing
 
 [Fork the project](https://github.com/redis/redis-rb) and send pull
-requests. You can also ask for help at `#redis-rb` on Freenode.
+requests.
 
 
 [inchpages-image]: https://inch-ci.org/github/redis/redis-rb.svg

data/lib/redis.rb

@@ -4,12 +4,13 @@ require "monitor"
 require_relative "redis/errors"
 
 class Redis
-  def self.current
-    @current ||= Redis.new
+  class << self
+    attr_accessor :exists_returns_integer
+    attr_writer :current
   end
 
-  def self.current=(redis)
-    @current = redis
+  def self.current
+    @current ||= Redis.new
   end
 
   include MonitorMixin
@@ -17,7 +18,9 @@ class Redis
   # Create a new client instance
   #
   # @param [Hash] options
-  # @option options [String] :url (value of the environment variable REDIS_URL) a Redis URL, for a TCP connection: `redis://:[password]@[hostname]:[port]/[db]` (password, port and database are optional), for a unix socket connection: `unix://[path to Redis socket]`. This overrides all other options.
+  # @option options [String] :url (value of the environment variable REDIS_URL) a Redis URL, for a TCP connection:
+  #   `redis://:[password]@[hostname]:[port]/[db]` (password, port and database are optional), for a unix socket
+  #    connection: `unix://[path to Redis socket]`. This overrides all other options.
   # @option options [String] :host ("127.0.0.1") server hostname
   # @option options [Integer] :port (6379) server port
   # @option options [String] :path path to server socket (overrides host and port)
@@ -26,8 +29,10 @@ class Redis
   # @option options [String] :password Password to authenticate against server
   # @option options [Integer] :db (0) Database to select after initial connect
   # @option options [Symbol] :driver Driver to use, currently supported: `:ruby`, `:hiredis`, `:synchrony`
-  # @option options [String] :id ID for the client connection, assigns name to current connection by sending `CLIENT SETNAME`
-  # @option options [Hash, Integer] :tcp_keepalive Keepalive values, if Integer `intvl` and `probe` are calculated based on the value, if Hash `time`, `intvl` and `probes` can be specified as a Integer
+  # @option options [String] :id ID for the client connection, assigns name to current connection by sending
+  #   `CLIENT SETNAME`
+  # @option options [Hash, Integer] :tcp_keepalive Keepalive values, if Integer `intvl` and `probe` are calculated
+  #   based on the value, if Hash `time`, `intvl` and `probes` can be specified as a Integer
   # @option options [Integer] :reconnect_attempts Number of attempts trying to connect
   # @option options [Boolean] :inherit_socket (false) Whether to use socket in forked process or not
   # @option options [Array] :sentinels List of sentinels to contact
@@ -52,7 +57,7 @@ class Redis
   end
 
   # Run code with the client reconnecting
-  def with_reconnect(val=true, &blk)
+  def with_reconnect(val = true, &blk)
     synchronize do |client|
       client.with_reconnect(val, &blk)
     end
@@ -205,7 +210,7 @@ class Redis
   def config(action, *args)
     synchronize do |client|
       client.call([:config, action] + args) do |reply|
-        if reply.kind_of?(Array) && action == :get
+        if reply.is_a?(Array) && action == :get
           Hashify.call(reply)
         else
           reply
@@ -256,7 +261,7 @@ class Redis
   def flushall(options = nil)
     synchronize do |client|
       if options && options[:async]
-        client.call([:flushall, :async])
+        client.call(%i[flushall async])
       else
         client.call([:flushall])
       end
@@ -271,7 +276,7 @@ class Redis
   def flushdb(options = nil)
     synchronize do |client|
       if options && options[:async]
-        client.call([:flushdb, :async])
+        client.call(%i[flushdb async])
       else
         client.call([:flushdb])
       end
@@ -285,7 +290,7 @@ class Redis
   def info(cmd = nil)
     synchronize do |client|
       client.call([:info, cmd].compact) do |reply|
-        if reply.kind_of?(String)
+        if reply.is_a?(String)
           reply = HashifyInfo.call(reply)
 
           if cmd && cmd.to_s == "commandstats"
@@ -358,7 +363,7 @@ class Redis
   # @param [String] subcommand e.g. `get`, `len`, `reset`
   # @param [Integer] length maximum number of entries to return
   # @return [Array<String>, Integer, String] depends on subcommand
-  def slowlog(subcommand, length=nil)
+  def slowlog(subcommand, length = nil)
     synchronize do |client|
       args = [:slowlog, subcommand]
       args << length if length
@@ -383,7 +388,7 @@ class Redis
   def time
     synchronize do |client|
       client.call([:time]) do |reply|
-        reply.map(&:to_i) if reply
+        reply&.map(&:to_i)
       end
     end
   end
@@ -496,9 +501,9 @@ class Redis
   #   - `:replace => Boolean`: if false, raises an error if key already exists
   # @raise [Redis::CommandError]
   # @return [String] `"OK"`
-  def restore(key, ttl, serialized_value, options = {})
+  def restore(key, ttl, serialized_value, replace: nil)
     args = [:restore, key, ttl, serialized_value]
-    args << 'REPLACE' if options[:replace]
+    args << 'REPLACE' if replace
 
     synchronize do |client|
       client.call(args)
@@ -550,13 +555,36 @@ class Redis
     end
   end
 
-  # Determine if a key exists.
+  # Determine how many of the keys exists.
   #
-  # @param [String] key
+  # @param [String, Array<String>] keys
+  # @return [Integer]
+  def exists(*keys)
+    if !Redis.exists_returns_integer && keys.size == 1
+      message = "`Redis#exists(key)` will return an Integer in redis-rb 4.3, if you want to keep the old behavior, " \
+        "use `exists?` instead. To opt-in to the new behavior now you can set Redis.exists_returns_integer = true. " \
+        "(#{::Kernel.caller(1, 1).first})\n"
+
+      ::Kernel.warn(message)
+      exists?(*keys)
+    else
+      _exists(*keys)
+    end
+  end
+
+  def _exists(*keys)
+    synchronize do |client|
+      client.call([:exists, *keys])
+    end
+  end
+
+  # Determine if any of the keys exists.
+  #
+  # @param [String, Array<String>] keys
   # @return [Boolean]
-  def exists(key)
+  def exists?(*keys)
     synchronize do |client|
-      client.call([:exists, key], &Boolify)
+      client.call([:exists, *keys], &Boolify)
     end
   end
 
@@ -567,7 +595,7 @@ class Redis
   def keys(pattern = "*")
     synchronize do |client|
       client.call([:keys, pattern]) do |reply|
-        if reply.kind_of?(String)
+        if reply.is_a?(String)
           reply.split(" ")
         else
           reply
@@ -663,30 +691,27 @@ class Redis
   #   elements where every element is an array with the result for every
   #   element specified in `:get`
   #   - when `:store` is specified, the number of elements in the stored result
-  def sort(key, options = {})
-    args = []
-
-    by = options[:by]
-    args.concat(["BY", by]) if by
+  def sort(key, by: nil, limit: nil, get: nil, order: nil, store: nil)
+    args = [:sort, key]
+    args << "BY" << by if by
 
-    limit = options[:limit]
-    args.concat(["LIMIT"] + limit) if limit
+    if limit
+      args << "LIMIT"
+      args.concat(limit)
+    end
 
-    get = Array(options[:get])
-    args.concat(["GET"].product(get).flatten) unless get.empty?
+    get = Array(get)
+    get.each do |item|
+      args << "GET" << item
+    end
 
-    order = options[:order]
     args.concat(order.split(" ")) if order
-
-    store = options[:store]
-    args.concat(["STORE", store]) if store
+    args << "STORE" << store if store
 
     synchronize do |client|
-      client.call([:sort, key] + args) do |reply|
+      client.call(args) do |reply|
         if get.size > 1 && !store
-          if reply
-            reply.each_slice(get.size).to_a
-          end
+          reply.each_slice(get.size).to_a if reply
         else
           reply
         end
@@ -786,27 +811,21 @@ class Redis
   #   - `:px => Integer`: Set the specified expire time, in milliseconds.
   #   - `:nx => true`: Only set the key if it does not already exist.
   #   - `:xx => true`: Only set the key if it already exist.
+  #   - `:keepttl => true`: Retain the time to live associated with the key.
   # @return [String, Boolean] `"OK"` or true, false if `:nx => true` or `:xx => true`
-  def set(key, value, options = {})
-    args = []
-
-    ex = options[:ex]
-    args.concat(["EX", ex]) if ex
-
-    px = options[:px]
-    args.concat(["PX", px]) if px
-
-    nx = options[:nx]
-    args.concat(["NX"]) if nx
-
-    xx = options[:xx]
-    args.concat(["XX"]) if xx
+  def set(key, value, ex: nil, px: nil, nx: nil, xx: nil, keepttl: nil)
+    args = [:set, key, value.to_s]
+    args << "EX" << ex if ex
+    args << "PX" << px if px
+    args << "NX" if nx
+    args << "XX" if xx
+    args << "KEEPTTL" if keepttl
 
     synchronize do |client|
       if nx || xx
-        client.call([:set, key, value.to_s] + args, &BoolifySet)
+        client.call(args, &BoolifySet)
       else
-        client.call([:set, key, value.to_s] + args)
+        client.call(args)
       end
     end
   end
@@ -888,7 +907,7 @@ class Redis
   # @see #mapped_msetnx
   def msetnx(*args)
     synchronize do |client|
-      client.call([:msetnx] + args, &Boolify)
+      client.call([:msetnx, *args], &Boolify)
     end
   end
 
@@ -928,7 +947,7 @@ class Redis
   # @see #mapped_mget
   def mget(*keys, &blk)
     synchronize do |client|
-      client.call([:mget] + keys, &blk)
+      client.call([:mget, *keys], &blk)
     end
   end
 
@@ -944,7 +963,7 @@ class Redis
   # @see #mget
   def mapped_mget(*keys)
     mget(*keys) do |reply|
-      if reply.kind_of?(Array)
+      if reply.is_a?(Array)
         Hash[keys.zip(reply)]
       else
         reply
@@ -1031,7 +1050,7 @@ class Redis
   # @return [Integer] the length of the string stored in `destkey`
   def bitop(operation, destkey, *keys)
     synchronize do |client|
-      client.call([:bitop, operation, destkey] + keys)
+      client.call([:bitop, operation, destkey, *keys])
     end
   end
 
@@ -1043,10 +1062,8 @@ class Redis
   # @param [Integer] stop stop index
   # @return [Integer] the position of the first 1/0 bit.
   #                  -1 if looking for 1 and it is not found or start and stop are given.
-  def bitpos(key, bit, start=nil, stop=nil)
-    if stop and not start
-      raise(ArgumentError, 'stop parameter specified without start parameter')
-    end
+  def bitpos(key, bit, start = nil, stop = nil)
+    raise(ArgumentError, 'stop parameter specified without start parameter') if stop && !start
 
     synchronize do |client|
       command = [:bitpos, key, bit]
@@ -1240,15 +1257,7 @@ class Redis
   # @return [nil, String]
   #   - `nil` when the operation timed out
   #   - the element was popped and pushed otherwise
-  def brpoplpush(source, destination, options = {})
-    case options
-    when Integer
-      # Issue deprecation notice in obnoxious mode...
-      options = { :timeout => options }
-    end
-
-    timeout = options[:timeout] || 0
-
+  def brpoplpush(source, destination, deprecated_timeout = 0, timeout: deprecated_timeout)
     synchronize do |client|
       command = [:brpoplpush, source, destination, timeout]
       timeout += client.timeout if timeout > 0
@@ -1455,7 +1464,7 @@ class Redis
   # @return [Array<String>] members in the difference
   def sdiff(*keys)
     synchronize do |client|
-      client.call([:sdiff] + keys)
+      client.call([:sdiff, *keys])
     end
   end
 
@@ -1466,7 +1475,7 @@ class Redis
   # @return [Integer] number of elements in the resulting set
   def sdiffstore(destination, *keys)
     synchronize do |client|
-      client.call([:sdiffstore, destination] + keys)
+      client.call([:sdiffstore, destination, *keys])
     end
   end
 
@@ -1476,7 +1485,7 @@ class Redis
   # @return [Array<String>] members in the intersection
   def sinter(*keys)
     synchronize do |client|
-      client.call([:sinter] + keys)
+      client.call([:sinter, *keys])
     end
   end
 
@@ -1487,7 +1496,7 @@ class Redis
   # @return [Integer] number of elements in the resulting set
   def sinterstore(destination, *keys)
     synchronize do |client|
-      client.call([:sinterstore, destination] + keys)
+      client.call([:sinterstore, destination, *keys])
     end
   end
 
@@ -1497,7 +1506,7 @@ class Redis
   # @return [Array<String>] members in the union
   def sunion(*keys)
     synchronize do |client|
-      client.call([:sunion] + keys)
+      client.call([:sunion, *keys])
     end
   end
 
@@ -1508,7 +1517,7 @@ class Redis
   # @return [Integer] number of elements in the resulting set
   def sunionstore(destination, *keys)
     synchronize do |client|
-      client.call([:sunionstore, destination] + keys)
+      client.call([:sunionstore, destination, *keys])
     end
   end
 
@@ -1557,31 +1566,20 @@ class Redis
   #   pairs that were **added** to the sorted set.
   #   - `Float` when option :incr is specified, holding the score of the member
   #   after incrementing it.
-  def zadd(key, *args) #, options
-    zadd_options = []
-    if args.last.is_a?(Hash)
-      options = args.pop
-
-      nx = options[:nx]
-      zadd_options << "NX" if nx
-
-      xx = options[:xx]
-      zadd_options << "XX" if xx
-
-      ch = options[:ch]
-      zadd_options << "CH" if ch
-
-      incr = options[:incr]
-      zadd_options << "INCR" if incr
-    end
+  def zadd(key, *args, nx: nil, xx: nil, ch: nil, incr: nil)
+    command = [:zadd, key]
+    command << "NX" if nx
+    command << "XX" if xx
+    command << "CH" if ch
+    command << "INCR" if incr
 
     synchronize do |client|
       if args.size == 1 && args[0].is_a?(Array)
         # Variadic: return float if INCR, integer if !INCR
-        client.call([:zadd, key] + zadd_options + args[0], &(incr ? Floatify : nil))
+        client.call(command + args[0], &(incr ? Floatify : nil))
       elsif args.size == 2
         # Single pair: return float if INCR, boolean if !INCR
-        client.call([:zadd, key] + zadd_options + args, &(incr ? Floatify : Boolify))
+        client.call(command + args, &(incr ? Floatify : Boolify))
       else
         raise ArgumentError, "wrong number of arguments"
       end
@@ -1752,10 +1750,8 @@ class Redis
   # @return [Array<String>, Array<[String, Float]>]
   #   - when `:with_scores` is not specified, an array of members
   #   - when `:with_scores` is specified, an array with `[member, score]` pairs
-  def zrange(key, start, stop, options = {})
-    args = []
-
-    with_scores = options[:with_scores] || options[:withscores]
+  def zrange(key, start, stop, withscores: false, with_scores: withscores)
+    args = [:zrange, key, start, stop]
 
     if with_scores
       args << "WITHSCORES"
@@ -1763,7 +1759,7 @@ class Redis
     end
 
     synchronize do |client|
-      client.call([:zrange, key, start, stop] + args, &block)
+      client.call(args, &block)
     end
   end
 
@@ -1778,10 +1774,8 @@ class Redis
   #     # => [["b", 64.0], ["a", 32.0]]
   #
   # @see #zrange
-  def zrevrange(key, start, stop, options = {})
-    args = []
-
-    with_scores = options[:with_scores] || options[:withscores]
+  def zrevrange(key, start, stop, withscores: false, with_scores: withscores)
+    args = [:zrevrange, key, start, stop]
 
     if with_scores
       args << "WITHSCORES"
@@ -1789,7 +1783,7 @@ class Redis
     end
 
     synchronize do |client|
-      client.call([:zrevrange, key, start, stop] + args, &block)
+      client.call(args, &block)
     end
   end
 
@@ -1880,14 +1874,16 @@ class Redis
   #   `count` members
   #
   # @return [Array<String>, Array<[String, Float]>]
-  def zrangebylex(key, min, max, options = {})
-    args = []
+  def zrangebylex(key, min, max, limit: nil)
+    args = [:zrangebylex, key, min, max]
 
-    limit = options[:limit]
-    args.concat(["LIMIT"] + limit) if limit
+    if limit
+      args << "LIMIT"
+      args.concat(limit)
+    end
 
     synchronize do |client|
-      client.call([:zrangebylex, key, min, max] + args)
+      client.call(args)
     end
   end
 
@@ -1902,14 +1898,16 @@ class Redis
   #     # => ["abbygail", "abby"]
   #
   # @see #zrangebylex
-  def zrevrangebylex(key, max, min, options = {})
-    args = []
+  def zrevrangebylex(key, max, min, limit: nil)
+    args = [:zrevrangebylex, key, max, min]
 
-    limit = options[:limit]
-    args.concat(["LIMIT"] + limit) if limit
+    if limit
+      args << "LIMIT"
+      args.concat(limit)
+    end
 
     synchronize do |client|
-      client.call([:zrevrangebylex, key, max, min] + args)
+      client.call(args)
     end
   end
 
@@ -1940,21 +1938,21 @@ class Redis
   # @return [Array<String>, Array<[String, Float]>]
   #   - when `:with_scores` is not specified, an array of members
   #   - when `:with_scores` is specified, an array with `[member, score]` pairs
-  def zrangebyscore(key, min, max, options = {})
-    args = []
-
-    with_scores = options[:with_scores] || options[:withscores]
+  def zrangebyscore(key, min, max, withscores: false, with_scores: withscores, limit: nil)
+    args = [:zrangebyscore, key, min, max]
 
     if with_scores
       args << "WITHSCORES"
       block = FloatifyPairs
     end
 
-    limit = options[:limit]
-    args.concat(["LIMIT"] + limit) if limit
+    if limit
+      args << "LIMIT"
+      args.concat(limit)
+    end
 
     synchronize do |client|
-      client.call([:zrangebyscore, key, min, max] + args, &block)
+      client.call(args, &block)
     end
   end
 
@@ -1972,21 +1970,21 @@ class Redis
   #     # => [["b", 64.0], ["a", 32.0]]
   #
   # @see #zrangebyscore
-  def zrevrangebyscore(key, max, min, options = {})
-    args = []
-
-    with_scores = options[:with_scores] || options[:withscores]
+  def zrevrangebyscore(key, max, min, withscores: false, with_scores: withscores, limit: nil)
+    args = [:zrevrangebyscore, key, max, min]
 
     if with_scores
-      args << ["WITHSCORES"]
+      args << "WITHSCORES"
       block = FloatifyPairs
     end
 
-    limit = options[:limit]
-    args.concat(["LIMIT"] + limit) if limit
+    if limit
+      args << "LIMIT"
+      args.concat(limit)
+    end
 
     synchronize do |client|
-      client.call([:zrevrangebyscore, key, max, min] + args, &block)
+      client.call(args, &block)
     end
   end
 
@@ -2050,17 +2048,18 @@ class Redis
   #   sorted sets
   #   - `:aggregate => String`: aggregate function to use (sum, min, max, ...)
   # @return [Integer] number of elements in the resulting sorted set
-  def zinterstore(destination, keys, options = {})
-    args = []
+  def zinterstore(destination, keys, weights: nil, aggregate: nil)
+    args = [:zinterstore, destination, keys.size, *keys]
 
-    weights = options[:weights]
-    args.concat(["WEIGHTS"] + weights) if weights
+    if weights
+      args << "WEIGHTS"
+      args.concat(weights)
+    end
 
-    aggregate = options[:aggregate]
-    args.concat(["AGGREGATE", aggregate]) if aggregate
+    args << "AGGREGATE" << aggregate if aggregate
 
     synchronize do |client|
-      client.call([:zinterstore, destination, keys.size] + keys + args)
+      client.call(args)
     end
   end
 
@@ -2077,17 +2076,18 @@ class Redis
   #   sorted sets
   #   - `:aggregate => String`: aggregate function to use (sum, min, max, ...)
   # @return [Integer] number of elements in the resulting sorted set
-  def zunionstore(destination, keys, options = {})
-    args = []
+  def zunionstore(destination, keys, weights: nil, aggregate: nil)
+    args = [:zunionstore, destination, keys.size, *keys]
 
-    weights = options[:weights]
-    args.concat(["WEIGHTS"] + weights) if weights
+    if weights
+      args << "WEIGHTS"
+      args.concat(weights)
+    end
 
-    aggregate = options[:aggregate]
-    args.concat(["AGGREGATE", aggregate]) if aggregate
+    args << "AGGREGATE" << aggregate if aggregate
 
     synchronize do |client|
-      client.call([:zunionstore, destination, keys.size] + keys + args)
+      client.call(args)
     end
   end
 
@@ -2101,15 +2101,20 @@ class Redis
     end
   end
 
-  # Set the string value of a hash field.
+  # Set one or more hash values.
+  #
+  # @example
+  #   redis.hset("hash", "f1", "v1", "f2", "v2") # => 2
+  #   redis.hset("hash", { "f1" => "v1", "f2" => "v2" }) # => 2
   #
   # @param [String] key
-  # @param [String] field
-  # @param [String] value
-  # @return [Boolean] whether or not the field was **added** to the hash
-  def hset(key, field, value)
+  # @param [Array<String> | Hash<String, String>] attrs array or hash of fields and values
+  # @return [Integer] The number of fields that were added to the hash
+  def hset(key, *attrs)
+    attrs = attrs.first.flatten if attrs.size == 1 && attrs.first.is_a?(Hash)
+
     synchronize do |client|
-      client.call([:hset, key, field, value], &Boolify)
+      client.call([:hset, key, *attrs])
     end
   end
 
@@ -2198,7 +2203,7 @@ class Redis
   # @see #hmget
   def mapped_hmget(key, *fields)
     hmget(key, *fields) do |reply|
-      if reply.kind_of?(Array)
+      if reply.is_a?(Array)
         Hash[fields.zip(reply)]
       else
         reply
@@ -2291,20 +2296,21 @@ class Redis
 
   def subscribed?
     synchronize do |client|
-      client.kind_of? SubscribedClient
+      client.is_a? SubscribedClient
     end
   end
 
   # Listen for messages published to the given channels.
   def subscribe(*channels, &block)
-    synchronize do |client|
+    synchronize do |_client|
       _subscription(:subscribe, 0, channels, block)
     end
   end
 
-  # Listen for messages published to the given channels. Throw a timeout error if there is no messages for a timeout period.
+  # Listen for messages published to the given channels. Throw a timeout error
+  # if there is no messages for a timeout period.
   def subscribe_with_timeout(timeout, *channels, &block)
-    synchronize do |client|
+    synchronize do |_client|
       _subscription(:subscribe_with_timeout, timeout, channels, block)
     end
   end
@@ -2312,21 +2318,23 @@ class Redis
   # Stop listening for messages posted to the given channels.
   def unsubscribe(*channels)
     synchronize do |client|
-      raise RuntimeError, "Can't unsubscribe if not subscribed." unless subscribed?
+      raise "Can't unsubscribe if not subscribed." unless subscribed?
+
       client.unsubscribe(*channels)
     end
   end
 
   # Listen for messages published to channels matching the given patterns.
   def psubscribe(*channels, &block)
-    synchronize do |client|
+    synchronize do |_client|
       _subscription(:psubscribe, 0, channels, block)
     end
   end
 
-  # Listen for messages published to channels matching the given patterns. Throw a timeout error if there is no messages for a timeout period.
+  # Listen for messages published to channels matching the given patterns.
+  # Throw a timeout error if there is no messages for a timeout period.
   def psubscribe_with_timeout(timeout, *channels, &block)
-    synchronize do |client|
+    synchronize do |_client|
       _subscription(:psubscribe_with_timeout, timeout, channels, block)
     end
   end
@@ -2334,7 +2342,8 @@ class Redis
   # Stop listening for messages posted to channels matching the given patterns.
   def punsubscribe(*channels)
     synchronize do |client|
-      raise RuntimeError, "Can't unsubscribe if not subscribed." unless subscribed?
+      raise "Can't unsubscribe if not subscribed." unless subscribed?
+
       client.punsubscribe(*channels)
     end
   end
@@ -2379,7 +2388,7 @@ class Redis
   # @see #multi
   def watch(*keys)
     synchronize do |client|
-      res = client.call([:watch] + keys)
+      res = client.call([:watch, *keys])
 
       if block_given?
         begin
@@ -2409,7 +2418,7 @@ class Redis
   end
 
   def pipelined
-    synchronize do |client|
+    synchronize do |_client|
       begin
         pipeline = Pipeline.new(@client)
         original, @client = @client, pipeline
@@ -2609,18 +2618,12 @@ class Redis
     _eval(:evalsha, args)
   end
 
-  def _scan(command, cursor, args, options = {}, &block)
+  def _scan(command, cursor, args, match: nil, count: nil, &block)
     # SSCAN/ZSCAN/HSCAN already prepend the key to +args+.
 
     args << cursor
-
-    if match = options[:match]
-      args.concat(["MATCH", match])
-    end
-
-    if count = options[:count]
-      args.concat(["COUNT", count])
-    end
+    args << "MATCH" << match if match
+    args << "COUNT" << count if count
 
     synchronize do |client|
       client.call([command] + args, &block)
@@ -2642,8 +2645,8 @@ class Redis
   #   - `:count => Integer`: return count keys at most per iteration
   #
   # @return [String, Array<String>] the next cursor and all found keys
-  def scan(cursor, options={})
-    _scan(:scan, cursor, [], options)
+  def scan(cursor, **options)
+    _scan(:scan, cursor, [], **options)
   end
 
   # Scan the keyspace
@@ -2661,11 +2664,12 @@ class Redis
   #   - `:count => Integer`: return count keys at most per iteration
   #
   # @return [Enumerator] an enumerator for all found keys
-  def scan_each(options={}, &block)
-    return to_enum(:scan_each, options) unless block_given?
+  def scan_each(**options, &block)
+    return to_enum(:scan_each, **options) unless block_given?
+
     cursor = 0
     loop do
-      cursor, keys = scan(cursor, options)
+      cursor, keys = scan(cursor, **options)
       keys.each(&block)
       break if cursor == "0"
     end
@@ -2682,8 +2686,8 @@ class Redis
   #   - `:count => Integer`: return count keys at most per iteration
   #
   # @return [String, Array<[String, String]>] the next cursor and all found keys
-  def hscan(key, cursor, options={})
-    _scan(:hscan, cursor, [key], options) do |reply|
+  def hscan(key, cursor, **options)
+    _scan(:hscan, cursor, [key], **options) do |reply|
       [reply[0], reply[1].each_slice(2).to_a]
     end
   end
@@ -2699,11 +2703,12 @@ class Redis
   #   - `:count => Integer`: return count keys at most per iteration
   #
   # @return [Enumerator] an enumerator for all found keys
-  def hscan_each(key, options={}, &block)
-    return to_enum(:hscan_each, key, options) unless block_given?
+  def hscan_each(key, **options, &block)
+    return to_enum(:hscan_each, key, **options) unless block_given?
+
     cursor = 0
     loop do
-      cursor, values = hscan(key, cursor, options)
+      cursor, values = hscan(key, cursor, **options)
       values.each(&block)
       break if cursor == "0"
     end
@@ -2721,8 +2726,8 @@ class Redis
   #
   # @return [String, Array<[String, Float]>] the next cursor and all found
   #   members and scores
-  def zscan(key, cursor, options={})
-    _scan(:zscan, cursor, [key], options) do |reply|
+  def zscan(key, cursor, **options)
+    _scan(:zscan, cursor, [key], **options) do |reply|
       [reply[0], FloatifyPairs.call(reply[1])]
     end
   end
@@ -2738,11 +2743,12 @@ class Redis
   #   - `:count => Integer`: return count keys at most per iteration
   #
   # @return [Enumerator] an enumerator for all found scores and members
-  def zscan_each(key, options={}, &block)
-    return to_enum(:zscan_each, key, options) unless block_given?
+  def zscan_each(key, **options, &block)
+    return to_enum(:zscan_each, key, **options) unless block_given?
+
     cursor = 0
     loop do
-      cursor, values = zscan(key, cursor, options)
+      cursor, values = zscan(key, cursor, **options)
       values.each(&block)
       break if cursor == "0"
     end
@@ -2759,8 +2765,8 @@ class Redis
   #   - `:count => Integer`: return count keys at most per iteration
   #
   # @return [String, Array<String>] the next cursor and all found members
-  def sscan(key, cursor, options={})
-    _scan(:sscan, cursor, [key], options)
+  def sscan(key, cursor, **options)
+    _scan(:sscan, cursor, [key], **options)
   end
 
   # Scan a set
@@ -2774,11 +2780,12 @@ class Redis
   #   - `:count => Integer`: return count keys at most per iteration
   #
   # @return [Enumerator] an enumerator for all keys in the set
-  def sscan_each(key, options={}, &block)
-    return to_enum(:sscan_each, key, options) unless block_given?
+  def sscan_each(key, **options, &block)
+    return to_enum(:sscan_each, key, **options) unless block_given?
+
     cursor = 0
     loop do
-      cursor, keys = sscan(key, cursor, options)
+      cursor, keys = sscan(key, cursor, **options)
       keys.each(&block)
       break if cursor == "0"
     end
@@ -2842,12 +2849,12 @@ class Redis
     end
   end
 
-
   # Query a sorted set representing a geospatial index to fetch members matching a
   # given maximum distance from a point
   #
   # @param [Array] args key, longitude, latitude, radius, unit(m|km|ft|mi)
-  # @param ['asc', 'desc'] sort sort returned items from the nearest to the farthest or the farthest to the nearest relative to the center
+  # @param ['asc', 'desc'] sort sort returned items from the nearest to the farthest
+  #   or the farthest to the nearest relative to the center
   # @param [Integer] count limit the results to the first N matching items
   # @param ['WITHDIST', 'WITHCOORD', 'WITHHASH'] options to return additional information
   # @return [Array<String>] may be changed with `options`
@@ -2864,7 +2871,8 @@ class Redis
   # given maximum distance from an already existing member
   #
   # @param [Array] args key, member, radius, unit(m|km|ft|mi)
-  # @param ['asc', 'desc'] sort sort returned items from the nearest to the farthest or the farthest to the nearest relative to the center
+  # @param ['asc', 'desc'] sort sort returned items from the nearest to the farthest or the farthest
+  #   to the nearest relative to the center
   # @param [Integer] count limit the results to the first N matching items
   # @param ['WITHDIST', 'WITHCOORD', 'WITHHASH'] options to return additional information
   # @return [Array<String>] may be changed with `options`
@@ -2881,7 +2889,8 @@ class Redis
   #
   # @param [String] key
   # @param [String, Array<String>] member one member or array of members
-  # @return [Array<Array<String>, nil>] returns array of elements, where each element is either array of longitude and latitude or nil
+  # @return [Array<Array<String>, nil>] returns array of elements, where each
+  #   element is either array of longitude and latitude or nil
   def geopos(key, member)
     synchronize do |client|
       client.call([:geopos, key, member])
@@ -2945,10 +2954,14 @@ class Redis
   # @option opts [Boolean] :approximate whether to add `~` modifier of maxlen or not
   #
   # @return [String] the entry id
-  def xadd(key, entry, opts = {})
+  def xadd(key, entry, approximate: nil, maxlen: nil, id: '*')
     args = [:xadd, key]
-    args.concat(['MAXLEN', (opts[:approximate] ? '~' : nil), opts[:maxlen]].compact) if opts[:maxlen]
-    args << (opts[:id] || '*')
+    if maxlen
+      args << "MAXLEN"
+      args << "~" if approximate
+      args << maxlen
+    end
+    args << id
     args.concat(entry.to_a.flatten)
     synchronize { |client| client.call(args) }
   end
@@ -3003,8 +3016,8 @@ class Redis
   # @param count [Integer] the number of entries as limit
   #
   # @return [Array<Array<String, Hash>>] the ids and entries pairs
-  def xrange(key, start = '-', _end = '+', count: nil)
-    args = [:xrange, key, start, _end]
+  def xrange(key, start = '-', range_end = '+', count: nil)
+    args = [:xrange, key, start, range_end]
     args.concat(['COUNT', count]) if count
     synchronize { |client| client.call(args, &HashifyStreamEntries) }
   end
@@ -3026,8 +3039,8 @@ class Redis
   # @params count [Integer] the number of entries as limit
   #
   # @return [Array<Array<String, Hash>>] the ids and entries pairs
-  def xrevrange(key, _end = '+', start = '-', count: nil)
-    args = [:xrevrange, key, _end, start]
+  def xrevrange(key, range_end = '+', start = '-', count: nil)
+    args = [:xrevrange, key, range_end, start]
     args.concat(['COUNT', count]) if count
     synchronize { |client| client.call(args, &HashifyStreamEntries) }
   end
@@ -3119,12 +3132,12 @@ class Redis
   # @option opts [Boolean] :noack whether message loss is acceptable or not
   #
   # @return [Hash{String => Hash{String => Hash}}] the entries
-  def xreadgroup(group, consumer, keys, ids, opts = {})
+  def xreadgroup(group, consumer, keys, ids, count: nil, block: nil, noack: nil)
     args = [:xreadgroup, 'GROUP', group, consumer]
-    args << 'COUNT' << opts[:count] if opts[:count]
-    args << 'BLOCK' << opts[:block].to_i if opts[:block]
-    args << 'NOACK' if opts[:noack]
-    _xread(args, keys, ids, opts[:block])
+    args << 'COUNT' << count if count
+    args << 'BLOCK' << block.to_i if block
+    args << 'NOACK' if noack
+    _xread(args, keys, ids, block)
   end
 
   # Removes one or multiple entries from the pending entries list of a stream consumer group.
@@ -3234,8 +3247,8 @@ class Redis
         when "get-master-addr-by-name"
           reply
         else
-          if reply.kind_of?(Array)
-            if reply[0].kind_of?(Array)
+          if reply.is_a?(Array)
+            if reply[0].is_a?(Array)
               reply.map(&Hashify)
             else
               Hashify.call(reply)
@@ -3259,12 +3272,17 @@ class Redis
   def cluster(subcommand, *args)
     subcommand = subcommand.to_s.downcase
     block = case subcommand
-            when 'slots'  then HashifyClusterSlots
-            when 'nodes'  then HashifyClusterNodes
-            when 'slaves' then HashifyClusterSlaves
-            when 'info'   then HashifyInfo
-            else Noop
-            end
+    when 'slots'
+      HashifyClusterSlots
+    when 'nodes'
+      HashifyClusterNodes
+    when 'slaves'
+      HashifyClusterSlaves
+    when 'info'
+      HashifyInfo
+    else
+      Noop
+    end
 
     # @see https://github.com/antirez/redis/blob/unstable/src/redis-trib.rb#L127 raw reply expected
     block = Noop unless @cluster_mode
@@ -3299,21 +3317,21 @@ class Redis
     return @original_client.connection_info if @cluster_mode
 
     {
-      host:     @original_client.host,
-      port:     @original_client.port,
-      db:       @original_client.db,
-      id:       @original_client.id,
+      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)
+  def method_missing(command, *args) # rubocop:disable Style/MissingRespondToMissing
     synchronize do |client|
       client.call([command] + args)
     end
   end
 
-private
+  private
 
   # Commands returning 1 for true and 0 for false may be executed in a pipeline
   # where the method call will return nil. Propagate the nil instead of falsely
@@ -3393,10 +3411,10 @@ private
 
   HashifyStreamPendings = lambda { |reply|
     {
-      'size'         => reply[0],
+      'size' => reply[0],
       'min_entry_id' => reply[1],
       'max_entry_id' => reply[2],
-      'consumers'    => reply[3].nil? ? {} : reply[3].to_h
+      'consumers' => reply[3].nil? ? {} : reply[3].to_h
     }
   }
 
@@ -3405,8 +3423,8 @@ private
       {
         'entry_id' => arr[0],
         'consumer' => arr[1],
-        'elapsed'  => arr[2],
-        'count'    => arr[3]
+        'elapsed' => arr[2],
+        'count' => arr[3]
       }
     end
   }
@@ -3414,15 +3432,15 @@ private
   HashifyClusterNodeInfo = lambda { |str|
     arr = str.split(' ')
     {
-      'node_id'        => arr[0],
-      'ip_port'        => arr[1],
-      'flags'          => arr[2].split(','),
+      'node_id' => arr[0],
+      'ip_port' => arr[1],
+      'flags' => arr[2].split(','),
       'master_node_id' => arr[3],
-      'ping_sent'      => arr[4],
-      'pong_recv'      => arr[5],
-      'config_epoch'   => arr[6],
-      'link_state'     => arr[7],
-      'slots'          => arr[8].nil? ? nil : Range.new(*arr[8].split('-'))
+      'ping_sent' => arr[4],
+      'pong_recv' => arr[5],
+      'config_epoch' => arr[6],
+      'link_state' => arr[7],
+      'slots' => arr[8].nil? ? nil : Range.new(*arr[8].split('-'))
     }
   }
 
@@ -3433,9 +3451,9 @@ private
       replicas = arr[3..-1].map { |r| { 'ip' => r[0], 'port' => r[1], 'node_id' => r[2] } }
       {
         'start_slot' => first_slot,
-        'end_slot'   => last_slot,
-        'master'     => master,
-        'replicas'   => replicas
+        'end_slot' => last_slot,
+        'master' => master,
+        'replicas' => replicas
       }
     end
   }