Passing the timeout as a positional argument is deprecated, it should be passed as a keyword argument

Author: guilleiguaran

lib/redis/connection/memory.rb

@@ -781,28 +781,28 @@ def persist(key)
       def hset(key, *fields)
         fields = fields.first if fields.size == 1 && fields.first.is_a?(Hash)
         raise_argument_error('hset') if fields.empty?
-    
+
         is_list_of_arrays = fields.all?{|field| field.instance_of?(Array)}
-    
+
         raise_argument_error('hmset') if fields.size.odd? and !is_list_of_arrays
         raise_argument_error('hmset') if is_list_of_arrays and !fields.all?{|field| field.length == 2}
-        
+
         data_type_check(key, Hash)
         insert_count = 0
         data[key] ||= {}
-    
+
         if fields.is_a?(Hash)
           insert_count = fields.keys.size - (data[key].keys & fields.keys).size
-    
+
           data[key].merge!(fields)
         else
           fields.each_slice(2) do |field|
             insert_count += 1 if data[key][field[0].to_s].nil?
-    
+
             data[key][field[0].to_s] = field[1].to_s
           end
         end
-    
+
         insert_count
       end
 
@@ -1156,12 +1156,12 @@ def zpopmin(key, count = nil)
         count.nil? ? results.first : results.flatten
       end
 
-      def bzpopmax(*args)
-        bzpop(:bzpopmax, args)
+      def bzpopmax(*args, timeout: 0)
+        bzpop(:bzpopmax, args, timeout)
       end
 
-      def bzpopmin(*args)
-        bzpop(:bzpopmin, args)
+      def bzpopmin(*args, timeout: 0)
+        bzpop(:bzpopmin, args, timeout)
       end
 
       def zcard(key)
@@ -1600,15 +1600,7 @@ def srandmember_multiple(key, number)
           end
         end
 
-        def bzpop(command, args)
-          timeout =
-            if args.last.is_a?(Hash)
-              args.pop[:timeout]
-            elsif args.last.respond_to?(:to_int)
-              args.pop.to_int
-            end
-
-          timeout ||= 0
+        def bzpop(command, args, timeout)
           single_pop_command = command.to_s[1..-1]
           keys = args.flatten
           keys.each do |key|

spec/sorted_sets_spec.rb

@@ -120,14 +120,14 @@ module FakeRedis
     it "should pop members with the highest score from first sorted set that is non-empty" do
       @client.zadd("key1", [1, "val1", 2, "val2"])
       @client.zadd("key2", [3, "val3"])
-      expect(@client.bzpopmax("nonexistent", "key1", "key2", 0)).to eq(["key1", "val2", 2.0])
+      expect(@client.bzpopmax("nonexistent", "key1", "key2", timeout: 0)).to eq(["key1", "val2", 2.0])
       expect(@client.bzpopmax("nonexistent")).to eq(nil)
     end
 
     it "should pop members with the lowest score from first sorted set that is non-empty" do
       @client.zadd("key1", [1, "val1", 2, "val2"])
       @client.zadd("key2", [3, "val3"])
-      expect(@client.bzpopmin("nonexistent", "key1", "key2", 0)).to eq(["key1", "val1", 1.0])
+      expect(@client.bzpopmin("nonexistent", "key1", "key2", timeout: 0)).to eq(["key1", "val1", 1.0])
       expect(@client.bzpopmin("nonexistent")).to eq(nil)
     end