Support recylcable cache keys

This reverts commit 5797f2d, which
reverted the original commit caa99fc
that added this into master prematurely. Future 5.0 changes will be
contained in branch 'v5.0', and changes for 5.1 will be made here in
'master'.

Author: Tom Scott

lib/active_support/cache/redis_store.rb

@@ -71,10 +71,10 @@ def initialize(*addresses)
       def write(name, value, options = nil)
         options = merged_options(options)
         instrument(:write, name, options) do |payload|
-          entry = options[:raw].present? ? value : Entry.new(value, options)
           if options[:expires_in].present? && options[:race_condition_ttl].present? && options[:raw].blank?
             options[:expires_in] = options[:expires_in].to_f + options[:race_condition_ttl].to_f
           end
+          entry = options[:raw].present? ? value : Entry.new(value, options)
           write_entry(normalize_key(name, options), entry, options)
         end
       end
@@ -305,7 +305,6 @@ def key_matcher(pattern, options)
         end
 
       private
-
         if ActiveSupport::VERSION::MAJOR < 5
           def normalize_key(*args)
             namespaced_key(*args)

test/active_support/cache/redis_store_test.rb

@@ -377,20 +377,20 @@ def setup
 
   describe "race_condition_ttl on fetch" do
     it "persist entry for longer than given ttl" do
-      options = { force: true, expires_in: 1.second, race_condition_ttl: 2.seconds }
+      options = { force: true, expires_in: 1.second, race_condition_ttl: 2.seconds, version: Time.now.to_i }
       @store.fetch("rabbit", options) { @rabbit }
       sleep 1.1
       @store.delete("rabbit").must_equal(1)
     end
 
     it "limits stampede time to read-write duration" do
       first_rabbit = second_rabbit = nil
-      options = { force: true, expires_in: 1.second, race_condition_ttl: 2.seconds }
+      options = { force: true, expires_in: 1.second, race_condition_ttl: 2.seconds, version: Time.now.to_i }
       @store.fetch("rabbit", options) { @rabbit }
       sleep 1
 
       th1 = Thread.new do
-        first_rabbit = @store.fetch("rabbit", race_condition_ttl: 2) do
+        first_rabbit = @store.fetch("rabbit", options) do
           sleep 1
           @white_rabbit
         end