support_table_cache 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c7814572a411ad62d5077cf255ff24059d2ab9292be81ded041de7ecff8a6ac
-  data.tar.gz: 015ea25fb5083ce1a80579a143486bf44a091fa375bf0d122b0889763321852c
+  metadata.gz: f7874d2e1669bb98537be4230846cc44862ebce2df16201d319926607a478c4b
+  data.tar.gz: 6f9c7bd2737b23689f487bbee803a0ce7aa592a3bde8357dab98bcd8fafa5612
 SHA512:
-  metadata.gz: c4a1f00fa0873f0e28501119c5b588a6df166f5f9bcee84fcaf3dc4ffe0985251a6d6e6ee24f00d2ee740bd02b1dfe74db425a7a8170d8d5ddd98fbed0c8ecde
-  data.tar.gz: 81de8cda7452731a341e82752f3a25ab793c1b15e518c41c78118348841b41f5f8c56af13304e2565e9bfeffc00210764bf0351e4920d56af0e4e49704fdfde7
+  metadata.gz: f322815aac9b0074d75a148c9d6b05ddb2ecb044fdae5d80b80bfca1bc409b70820b754fbecc83ddfe368da7f01872fde0b2eec724c328d1077759b2587aec70
+  data.tar.gz: 14733e659226be252601d4705e92248ac8377b21b0e301b6cb4b621f56731aad173c2ad01febb64a51f7051690de31b83ecc36fe69cfa4545806aebe94b38c52

data/CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 1.0.1
+
+### Added
+- Preserve scope on relations terminated with a `find_by`.
+
 ## 1.0.0
 
 ### Added

data/README.md

@@ -36,6 +36,9 @@ To use the gem, you need to include it in you models and then specify which attr
   # Uses cache on a composite key
   MyModel.find_by(group: "first", name: "One")
 
+  # Uses cache on a composite key with scoping
+  MyModel.where(group: "first").find_by(name: "One")
+
   # Does not use cache since value is not defined as a cacheable key
   MyModel.find_by(value: 1)
 

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/lib/support_table_cache.rb

@@ -10,6 +10,10 @@ module SupportTableCache
     class_attribute :support_table_cache_by_attributes, instance_accessor: false
     class_attribute :support_table_cache_ttl, instance_accessor: false
 
+    unless ActiveRecord::Relation.include?(RelationOverride)
+      ActiveRecord::Relation.prepend(RelationOverride)
+    end
+
     class << self
       prepend FindByOverride unless include?(FindByOverride)
       private :support_table_cache_by_attributes=
@@ -105,7 +109,12 @@ module SupportTableCache
 
       cache_key = nil
       attributes = args.first if args.size == 1 && args.first.is_a?(Hash)
-      if attributes
+
+      if respond_to?(:scope_attributes) && scope_attributes.present?
+        attributes = scope_attributes.merge(attributes || {})
+      end
+
+      if attributes.present?
         support_table_cache_by_attributes.each do |attribute_names, case_sensitive|
           cache_key = SupportTableCache.cache_key(self, attributes, attribute_names, case_sensitive)
           break if cache_key
@@ -120,6 +129,35 @@ module SupportTableCache
     end
   end
 
+  module RelationOverride
+    # Override for the find_by method that looks in the cache first.
+    def find_by(*args)
+      return super unless klass.include?(SupportTableCache)
+      return super if SupportTableCache.cache.nil? || SupportTableCache.disabled?
+
+      cache_key = nil
+      attributes = args.first if args.size == 1 && args.first.is_a?(Hash)
+
+      # Apply any attributes from the current relation chain
+      if scope_attributes.present?
+        attributes = scope_attributes.merge(attributes || {})
+      end
+
+      if attributes.present?
+        support_table_cache_by_attributes.each do |attribute_names, case_sensitive|
+          cache_key = SupportTableCache.cache_key(klass, attributes, attribute_names, case_sensitive)
+          break if cache_key
+        end
+      end
+
+      if cache_key
+        SupportTableCache.cache.fetch(cache_key, expires_in: support_table_cache_ttl) { super }
+      else
+        super
+      end
+    end
+  end
+
   # Remove the cache entry for this record.
   # @return [void]
   def uncache

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: support_table_cache
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Brian Durand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-16 00:00:00.000000000 Z
+date: 2022-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord