refactor dupe code to method, account for string keys in options

Author: Shaun Carlson

lib/active_remote/cached.rb

@@ -25,7 +25,14 @@ def self.cache(cache_provider = nil)
     end
 
     def self.cache_options
-      ::ActiveRemote::Cached.default_options.slice(:expires_in, :namespace, :race_condition_ttl)
+      ::ActiveRemote::Cached.default_options.slice(
+        :expires_in,
+        "expires_in",
+        :namespace,
+        "namespace",
+        :race_condition_ttl,
+        "race_condition_ttl"
+      )
     end
 
     def self.default_options(options = nil)

lib/active_remote/cached/cache.rb

@@ -21,10 +21,7 @@ def delete(*args)
       nested_cache_provider.delete(*args)
       super
     rescue => e
-      raise e unless ::ActiveRemote::Cached.default_options[:handle_cache_error]
-      error_proc = ::ActiveRemote::Cached.default_options[:cache_error_proc]
-      error_proc.call(e) if error_proc.respond_to?(:call)
-
+      handle_or_reraise_cache_error(e)
       nil
     end
 
@@ -35,10 +32,7 @@ def enable_nested_caching!
     def exist?(*args)
       nested_cache_provider.exist?(*args) || super
     rescue => e
-      raise e unless ::ActiveRemote::Cached.default_options[:handle_cache_error]
-      error_proc = ::ActiveRemote::Cached.default_options[:cache_error_proc]
-      error_proc.call(e) if error_proc.respond_to?(:call)
-
+      handle_or_reraise_cache_error(e)
       false
     end
 
@@ -59,26 +53,26 @@ def fetch(name, options = {})
     def read(*args)
       nested_cache_provider.read(*args) || super
     rescue => e
-      raise e unless ::ActiveRemote::Cached.default_options[:handle_cache_error]
-      error_proc = ::ActiveRemote::Cached.default_options[:cache_error_proc]
-      error_proc.call(e) if error_proc.respond_to?(:call)
-
+      handle_or_reraise_cache_error(e)
       nil
     end
 
     def write(*args)
       nested_cache_provider.write(*args)
       super
     rescue => e
-      raise e unless ::ActiveRemote::Cached.default_options[:handle_cache_error]
-      error_proc = ::ActiveRemote::Cached.default_options[:cache_error_proc]
-      error_proc.call(e) if error_proc.respond_to?(:call)
-
+      handle_or_reraise_cache_error(e)
       nil
     end
 
   private
 
+    def handle_or_reraise_cache_error(e)
+      raise e unless ::ActiveRemote::Cached.default_options[:handle_cache_error]
+      error_proc = ::ActiveRemote::Cached.default_options[:cache_error_proc]
+      error_proc.call(e) if error_proc.respond_to?(:call)
+    end
+
     def nested_cache_provider
       @nested_cache_provider
     end