has_cache 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea1ef981395474d7babad8f7d6eb83ffef1e88d2
-  data.tar.gz: fac756b188a047e5d7fc48167e7afc77a69d4ec5
+  metadata.gz: f826a005438e6e2239208a8dd6e7e320a8f00d12
+  data.tar.gz: 257aabcfca729a031f47cd32dfa598c43fa12a52
 SHA512:
-  metadata.gz: ffbdadbdd6f99015823e5d4e474d61db7a70c80c89420e0259764032092d5179d2a7083fbed2aea70fdb39e13c367a5b3bc542e72fa58bb0dfbed2ba22db7787
-  data.tar.gz: bbc3e9abff9d05fd1f39339a9d7c83bcd911c2b966e7f0e9510c6a21870a103773b383034d711a224e31d7f42cb2211b29b4cbaf32428adba25af0bd17444f8b
+  metadata.gz: ad0e0a76f1797361e988e6b4601da3690c21dd157550237c022c0d05528ec98c3847c90f5fc4e6651857af89601e1272afa968a86e2a4e583f54281bb1e59e0d
+  data.tar.gz: f2d655273163d28ef458592eade0cc6d047e5f1adb91ae6efcd5243a0e012645b6f1a8243f67e382c4d797d2e1d4a6a3e0be801977eeccfba72f9268185188bf

data/lib/has_cache/cache.rb

@@ -1,8 +1,9 @@
 require 'sourcify'
 
 module HasCache
-  # 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
+  # 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
@@ -32,11 +33,10 @@ module HasCache
       else
         Rails.cache.fetch(key, o.cache_options) do
           if o.cache_target.is_a?(Class)
-            result = o.cache_target.class_eval(&block)
+            extract_result(o.cache_target.class_eval(&block))
           else
-            result = o.cache_target.instance_eval(&block)
+            extract_result(o.cache_target.instance_eval(&block))
           end
-          extract_result(result)
         end
       end
     end
@@ -49,18 +49,30 @@ module HasCache
         @cache_root = [cache_target.name, :class]
       else
         @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)
+
+        return if cache_target.respond_to?(:has_cache_key)
+
+        if cache_target.class.respond_to?(:primary_key)
+          primary_key = cache_target.class.send(:primary_key)
+
+          # Support composite primary keys
+          # TODO: spec this
+          case primary_key
+          when String
+            @cache_root << cache_target.send(primary_key.to_sym)
+          when Array
+            @cache_root << primary_key.map { |k| cache_target.send(k.to_sym) }
           else
-            # rubocop:disable LineLength, StringLiterals
-            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
+            fail "Unknown primary key type: #{primary_key.class}"
           end
+        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 `#{cache_target.class.name}`, must call with `instance.cached(key: some_unique_key).method`"
+          # rubocop:enable LineLength, StringLiterals
         end
       end
     end

data/lib/has_cache/mixin.rb

@@ -24,7 +24,7 @@ module HasCache
       end
 
       def delete_cached(*args, &block)
-        args.push :delete => true
+        args.push(delete: true)
         HasCache::Cache.new(self, *args, &block)
       end
     end

data/lib/has_cache/version.rb

@@ -1,4 +1,4 @@
 # @private
 module HasCache
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

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