From 904abc27872e6d18f28cc6649311ca136c9379cc Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Tue, 28 Feb 2017 02:27:40 -0600
Subject: [PATCH] cache.rb: implement Cache in terms of Rails.cache.

---
 app/logical/cache.rb | 69 ++++++++++++--------------------------------
 1 file changed, 19 insertions(+), 50 deletions(-)

diff --git a/app/logical/cache.rb b/app/logical/cache.rb
index 4c681e655..be11a3eca 100644
--- a/app/logical/cache.rb
+++ b/app/logical/cache.rb
@@ -1,70 +1,39 @@
 class Cache
-  def self.get_multi(keys, prefix, expiry_in_seconds = nil)
-    key_to_sanitized_key_hash = keys.inject({}) do |hash, x|
-      hash[x] = "#{prefix}:#{Cache.sanitize(x)}"
-      hash
-    end
-    start_time = Time.now
-    sanitized_key_to_value_hash = MEMCACHE.get_multi(key_to_sanitized_key_hash.values)
-    elapsed = Time.now - start_time
-    {}.tap do |result_hash|
-      key_to_sanitized_key_hash.each do |key, sanitized_key|
-        if sanitized_key_to_value_hash.has_key?(sanitized_key)
-          result_hash[key] = sanitized_key_to_value_hash[sanitized_key]
-        else
-          result_hash[key] = yield(key)
-          Cache.put(sanitized_key, result_hash[key], expiry_in_seconds)
-        end
-      end
+  def self.get_multi(keys, prefix)
+    sanitized_key_to_key_hash = keys.map do |key|
+      ["#{prefix}:#{Cache.sanitize(key)}", key]
+    end.to_h
 
-      ActiveRecord::Base.logger.debug('MemCache Multi-Get (%0.6f)  %s' % [elapsed, keys.join(",")])
+    sanitized_keys = sanitized_key_to_key_hash.keys
+    sanitized_key_to_value_hash = Rails.cache.fetch_multi(*sanitized_keys) do |sanitized_key|
+      key = sanitized_key_to_key_hash[sanitized_key]
+      yield key
     end
+
+    keys_to_values_hash = sanitized_key_to_value_hash.transform_keys(&sanitized_key_to_key_hash)
+    keys_to_values_hash
   end
 
-  def self.get(key, expiry_in_seconds = nil)
-    start_time = Time.now
-    value = MEMCACHE.get key
-    elapsed = Time.now - start_time
-    if expiry_in_seconds
-      expiry = expiry_in_seconds
-    else
-      expiry = 0
-    end
-    ActiveRecord::Base.logger.debug('MemCache Get (%0.6f)  %s -> %s' % [elapsed, key, value])
-    if value.nil? and block_given? then
-      value = yield
-      MEMCACHE.set key, value, expiry
-    end
-    value
+  def self.get(key, expiry_in_seconds = nil, &block)
+    Rails.cache.fetch(key, expires_in: expiry_in_seconds, &block)
   rescue => err
-    ActiveRecord::Base.logger.debug "MemCache Error: #{err.message}"
+    Rails.logger.debug { "MemCache Error: #{err.message}" }
     nil
   end
 
   def self.put(key, value, expiry_in_seconds = nil)
-    start_time = Time.now
-    if expiry_in_seconds
-      expiry = expiry_in_seconds
-    else
-      expiry = 0
-    end      
-    MEMCACHE.set key, value, expiry
-    elapsed = Time.now - start_time
-    ActiveRecord::Base.logger.debug('MemCache Set (%0.6f)  %s -> %s' % [elapsed, key, value])
+    Rails.cache.write(key, value, expires_in: expiry_in_seconds)
     value
   rescue => err
-    ActiveRecord::Base.logger.debug "MemCache Error: #{err.message}"
+    Rails.logger.debug { "MemCache Error: #{err.message}" }
     nil
   end
 
-  def self.delete(key, delay = nil)
-    start_time = Time.now
-    MEMCACHE.delete key
-    elapsed = Time.now - start_time
-    ActiveRecord::Base.logger.debug('MemCache Delete (%0.6f)  %s' % [elapsed, key])
+  def self.delete(key)
+    Rails.cache.delete(key)
     nil
   rescue => err
-    ActiveRecord::Base.logger.debug "MemCache Error: #{err.message}"
+    Rails.logger.debug { "MemCache Error: #{err.message}" }
     nil
   end