has_cache 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f097af5dce6e37cb73c4780e8cd16f278e374451
-  data.tar.gz: 8a62ceaa33422e9b19e1b27ee583a77275791451
+  metadata.gz: ac5c22719eef48c3a06388262ea7ea328d04ac45
+  data.tar.gz: 926edfbcf821edc0d478da42aa476ea270274503
 SHA512:
-  metadata.gz: 979c91b0b8f95f777b4542a481db3d71503e9e1f2d3bdbf034e178756ca7f5d9f639bcbd213ba65fc49765599b3e63d2fca59d296e59c5ddee5f5351f0f48488
-  data.tar.gz: fccff51b978e8ca8b580201b6f407c1041f1f384ddff0b7ca76181ed323eb11a425dd08f516e94aef25ef8707516176293d31b9203c3d2aceb3ff6f9738b68f1
+  metadata.gz: 47fde97d595b6dd09600e0899647db63a2d975b9f496321254c84b777d28d8d4b46232e6e8c699bf596220de18f603c839739877e11681b9a7cfe8585d3aa7f2
+  data.tar.gz: 0767fc57a5c1b61cdc1af62e30575c546cb042c72c83b96ba1142bf63485398b11c87edaf336c8ded934edda9ae12438e5dab49739d3f84cb6cdbc0a01167d47

data/lib/has_cache/cache.rb

@@ -1,13 +1,13 @@
 require 'sourcify'
 
 module HasCache
-  # The cache class proxies calls to the original target, caching the results,
-  # and returns the cached results if passed the same target and arguments
+  # The cache class proxies calls to the original cache_target, caching the results,
+  # and returns the cached results if passed the same cache_target and arguments
   class Cache
     extend HasCache::Utilities
     include HasCache::Utilities
 
-    attr_accessor :target, :cache_root, :cache_options
+    attr_accessor :cache_target, :cache_root, :cache_options
 
     def self.new(*args, &block)
       o = allocate
@@ -31,34 +31,34 @@ module HasCache
         Rails.cache.delete(key)
       else
         Rails.cache.fetch(key, o.cache_options) do
-          if o.target.is_a?(Class)
-            result = o.target.class_eval(&block)
+          if o.cache_target.is_a?(Class)
+            result = o.cache_target.class_eval(&block)
           else
-            result = o.target.instance_eval(&block)
+            result = o.cache_target.instance_eval(&block)
           end
           extract_result(result)
         end
       end
     end
 
-    def initialize(target, options = {})
-      @target = target
+    def initialize(cache_target, options = {})
+      @cache_target = cache_target
       @cache_root = []
-      @cache_options = merged_options(target, options)
-      if target.is_a?(Class)
-        @cache_root = [target.name, :class]
+      @cache_options = merged_options(cache_target, options)
+      if cache_target.is_a?(Class)
+        @cache_root = [cache_target.name, :class]
       else
-        @cache_root = [target.class.name, :instance]
-        unless target.respond_to?(:has_cache_key)
-          if target.class.respond_to?(:primary_key)
-            @cache_root << target.send(target.class.send(:primary_key).to_sym)
-          elsif target.respond_to?(:id)
-            @cache_root << target.send(:id)
-          elsif target.respond_to?(:name)
-            @cache_root << target.send(:name)
+        @cache_root = [cache_target.class.name, :instance]
+        unless cache_target.respond_to?(:has_cache_key)
+          if cache_target.class.respond_to?(:primary_key)
+            @cache_root << cache_target.send(cache_target.class.send(:primary_key).to_sym)
+          elsif cache_target.respond_to?(:id)
+            @cache_root << cache_target.send(:id)
+          elsif cache_target.respond_to?(:name)
+            @cache_root << cache_target.send(:name)
           else
             # rubocop:disable LineLength, StringLiterals
-            fail ArgumentError, "Could not find key for instance of `#{target.class.name}`, must call with `instance.cached(key: some_unique_key).method`"
+            fail ArgumentError, "Could not find key for instance of `#{cache_target.class.name}`, must call with `instance.cached(key: some_unique_key).method`"
             # rubocop:enable LineLength, StringLiterals
           end
         end
@@ -70,16 +70,16 @@ module HasCache
       if cache_options.key?(:key)
         options_key = cache_options.delete(:key)
         if options_key.is_a?(Proc)
-          if target.is_a?(Class)
-            key += Array.wrap(target.class_eval(&options_key))
+          if cache_target.is_a?(Class)
+            key += Array.wrap(cache_target.class_eval(&options_key))
           else
-            key += Array.wrap(target.instance_eval(&options_key))
+            key += Array.wrap(cache_target.instance_eval(&options_key))
           end
         else
           key += Array.wrap(options_key)
         end
-      elsif target.respond_to?(:has_cache_key)
-        key += target.send(:has_cache_key)
+      elsif cache_target.respond_to?(:has_cache_key)
+        key += cache_target.send(:has_cache_key)
       end
       key
     end
@@ -96,13 +96,13 @@ module HasCache
           Rails.cache.delete(key)
         else
           Rails.cache.fetch(key, cache_options) do
-            extract_result(target.send(method, *args))
+            extract_result(cache_target.send(method, *args))
           end
         end
       end
 
       def respond_to?(method)
-        target.respond_to?(method)
+        cache_target.respond_to?(method)
       end
   end
 end

data/lib/has_cache/version.rb

@@ -1,4 +1,4 @@
 # @private
 module HasCache
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_cache
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Peter Fern