cache_crispies 1.1.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd2682e40adfbb9511562cc2b406cd5fa9731134977f1072c5e42684f88590b9
-  data.tar.gz: 12c00d8ddd71b23daf0834db565334e0a1d71a28e37809b82d52717e940f16ec
+  metadata.gz: 144a9a90f1bceced6d4197add1047b29352f7cba8b89c19dd92e57411672d7c4
+  data.tar.gz: d6ad1a658628441972010ff169f56fe779b0edc2a8990522b4f49ff765b6f4ee
 SHA512:
-  metadata.gz: 71ea2e90153a90ca9f1ae3d9d6b5e229a7f547f0fe271a6cbe8ec01bde10ec23e2736ef7a14898c7c9c48d2c17393b5ebe8bd7787b0123fd0bfc1868095007b1
-  data.tar.gz: c029d5cd5a5b35f22494eeeed2f4b9a3bcffd64989c36b6cd8be2c8731eb032e34926f79b3f3e8f69ab9a84c57170bfc22cc4c06f5757774d6b37eb7ffc5f329
+  metadata.gz: f35f5dd51753129083e2ea3c6664709d1977e0255bd60d0a316d275ca6197de1b43cad1fd79bff13ffa9b7183a445f5de4955c45d66ff93a5bd8e30f26f8d37c
+  data.tar.gz: f29c05d0fd636e7648b6d4f14bbdd597fc91519669eb841797a1934e667653fa8706b276e3b592ea66217d7bf0c93d8294a259003d060de1d4b15f15f090878a

data/lib/cache_crispies/configuration.rb

@@ -6,7 +6,8 @@ module CacheCrispies
   class Configuration
     SETTINGS = [
       :cache_store,
-      :etags
+      :etags,
+      :cache_key_method
     ].freeze
 
     SETTINGS.each do |setting|
@@ -18,11 +19,13 @@ module CacheCrispies
     end
 
     alias etags? etags
+    alias cache_key_method? cache_key_method
 
     # Resets all values to their defaults. Useful for testing.
     def reset!
       @cache_store = Rails.cache || ActiveSupport::Cache::NullStore.new
       @etags = false
+      @cache_key_method = :cache_key
     end
   end
 end

data/lib/cache_crispies/plan.rb

@@ -58,7 +58,7 @@ module CacheCrispies
           serializer.cache_key_base,
           serializer.dependency_key,
           addons_key,
-          cacheable.cache_key
+          cacheable_cache_key
         ].flatten.compact.join(CACHE_KEY_SEPARATOR)
     end
 
@@ -101,7 +101,11 @@ module CacheCrispies
     end
 
     def cache?
-      serializer.do_caching? && cacheable.respond_to?(:cache_key)
+      serializer.do_caching? && cacheable.respond_to?(CacheCrispies.config.cache_key_method)
+    end
+
+    def cacheable_cache_key
+      cacheable.public_send(CacheCrispies.config.cache_key_method)
     end
 
     def addons_key

data/lib/cache_crispies/version.rb

@@ -2,5 +2,5 @@
 
 module CacheCrispies
   # The version of the gem
-  VERSION = '1.1.4'
+  VERSION = '1.2.0'
 end

data/spec/cache_crispies/configuration_spec.rb

@@ -39,4 +39,16 @@ describe CacheCrispies::Configuration do
       }.to change { subject.etags }.to true
     end
   end
+
+  describe '#cache_key_method' do
+    it 'is cache_key by default' do
+      expect(subject.cache_key_method).to eq :cache_key
+    end
+
+    it 'can be changed' do
+      expect {
+        subject.cache_key_method = :other_cache_key
+      }.to change { subject.cache_key_method }.to eq :other_cache_key
+    end
+  end
 end

data/spec/cache_crispies/plan_spec.rb

@@ -125,6 +125,17 @@ describe CacheCrispies::Plan do
         )
       end
     end
+
+    context 'with a configured cache_key_method' do
+      let(:custom_cache_key) { 'custom-cache-key' }
+      let(:model) { OpenStruct.new(name: 'Sugar Smacks', custom_cache_key: custom_cache_key) }
+
+      it "includes the cacheable #custom_cache_key" do
+        expect(CacheCrispies.config).to receive(:cache_key_method).and_return :custom_cache_key
+
+        expect(subject.cache_key).to include custom_cache_key
+      end
+    end
   end
 
   describe '#cache' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cache_crispies
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
 platform: ruby
 authors:
 - Adam Crownoble
@@ -121,17 +121,31 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.8.0
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '0.17'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
       - !ruby/object:Gem::Version
         version: '0.17'
 description:
@@ -183,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.0
 signing_key:
 specification_version: 4
 summary: Fast Rails serializer with built-in caching