to keep backwards compatibility, assume no REPLACE modifier by default

Author: Nicolas Pepin-Perreault

lib/redis.rb

@@ -460,12 +460,11 @@ def dump(key)
   # @param [String] serialized_value
   # @param [Hash] options
   #   - `:replace => Boolean`: if false, raises an error if key already exists
-  # @param [Hash] replace
   # @raise [Redis::CommandError]
   # @return [String] `"OK"`
   def restore(key, ttl, serialized_value, options = {})
     args = [:restore, key, ttl, serialized_value]
-    args << 'REPLACE' if options.fetch(:replace, true)
+    args << 'REPLACE' if options[:replace]
 
     synchronize do |client|
       client.call(args)

lib/redis/distributed.rb

@@ -145,7 +145,6 @@ def dump(key)
 
     # Create a key using the serialized value, previously obtained using DUMP.
     def restore(key, ttl, serialized_value, options = {})
-      options[:replace] = true unless options.key?(:replace)
       node_for(key).restore(key, ttl, serialized_value, options)
     end
 

test/lint/value_types.rb

@@ -95,8 +95,12 @@ def test_dump_and_restore
         assert [0, 1].include? r.ttl("bar")
 
         r.set("bar", "somethingelse")
+        assert_raises(Redis::CommandError) { r.restore("bar", 1000, w) } # ensure by default replace is false
         assert_raises(Redis::CommandError) { r.restore("bar", 1000, w, :replace => false) }
         assert_equal "somethingelse", r.get("bar")
+        assert r.restore("bar", 1000, w, :replace => true)
+        assert_equal ["b", "c", "d"], r.lrange("bar", 0, -1)
+        assert [0, 1].include? r.ttl("bar")
       end
     end