activerecord-cached_at 2.0.11 → 2.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5860c53030bc1c81930921e85181a18d967350a3
-  data.tar.gz: c4e1b6c432bd192b59f5dbe305f372e9c5f3f112
+  metadata.gz: 8176a13705e644ac3fa27b5690c68ec7c4d43f46
+  data.tar.gz: e022fb6d8d7c6da36aa819fb3809a05a86c2f06d
 SHA512:
-  metadata.gz: 19894074ae6826f70a9498ea336427f6f9473225a6be2e9980f259d1674e50e2cb8521ec978a5686f0959c235ce9fcfef0375ea1fc99dfe66cb409ef989f0461
-  data.tar.gz: 74dcc58f9a1181981e44a3bb75f4ed269bd9027ef08292d5614184c5155dea9a7139d173018d979f44e9e66b503acf94ba71b398d93ae7c91d1532b4205ce507
+  metadata.gz: 9b0cc35ece0124d0027967d615b1665f58ca15451aa148e87f154455e4c599bedbd71dbc951b174ae12271cc9aece81a390a9124765608d66af1782edbfcdde6
+  data.tar.gz: 9131194d596d3fb06f205068c4afdcb6731dbd5d83902c0f5980c4bb07d875bf378332b1bd2659ed010c08a8394040162d9aa31db7e73c23e211fb980f13ce62

data/README.md

@@ -26,3 +26,8 @@ aren't updating the models you can just require the helpers:
 ## TODO:
 
  Add a `cache_key` method to the Model class that gets `MAX(cached_at)`
+
+
+
+change option to cache: true
+add cache_association helper

data/lib/cached_at/association_extension.rb

@@ -2,7 +2,6 @@ module CachedAt
   module AssociationExtension
 
     def self.build(model, reflection)
-      return unless reflection.options[:cached_at]
     end
     
     def self.valid_options
@@ -12,4 +11,4 @@ module CachedAt
   end
 end
 
-ActiveRecord::Associations::Builder::Association.extensions << CachedAt::AssociationExtension
+ActiveRecord::Associations::Builder::Association.extensions << CachedAt::AssociationExtension

data/lib/cached_at/associations/association.rb

@@ -1,5 +1,9 @@
 module CachedAt
   module Association
+
+    def initialize(owner, reflection)
+      super
+    end
     
     def traverse_relationships(klass, relationships, query, cache_column, timestamp)
       if relationships.is_a?(Symbol)
@@ -35,8 +39,8 @@ module CachedAt
       end
     end
     
-    def touch_through_reflections(reflections, timestamp)
-      reflections.each do |r|
+    def touch_through_reflections(timestamp)
+      reflection.through_relationship_endpoints.each do |r|
         cache_column = "#{r.inverse_of.name}_cached_at"
         
         source_assoc = owner.association(r.source_reflection_name.to_sym)

data/lib/cached_at/base.rb

@@ -5,6 +5,8 @@ require File.expand_path(File.join(__FILE__, '../associations/belongs_to_associa
 require File.expand_path(File.join(__FILE__, '../associations/collection_association'))
 require File.expand_path(File.join(__FILE__, '../associations/has_many_through_association'))
 
+require File.expand_path(File.join(__FILE__, '../reflections/abstract_reflection'))
+
 module CachedAt
   module Base
     extend ActiveSupport::Concern
@@ -35,22 +37,13 @@ module CachedAt
       timestamp ||= current_time_from_proper_timezone
 
       self._reflections.each do |name, reflection|
-
-        through_connections = if reflection.polymorphic?
-          []
-        else
-          reflection.klass._reflections.values.select do |r|
-            r.options[:cached_at] && r.options[:through] && r.options[:through] == reflection.inverse_of&.name
-          end
-        end
-        
-        next unless reflection.options[:cached_at] || reflection&.parent_reflection&.class == ActiveRecord::Reflection::HasAndBelongsToManyReflection || !through_connections.empty?
+        next unless reflection.options[:cached_at] || reflection&.parent_reflection&.class == ActiveRecord::Reflection::HasAndBelongsToManyReflection || !reflection.through_relationship_endpoints.empty?
         next if instance_variable_defined?(:@relationships_cached_at_touched) && (!@relationships_cached_at_touched.nil? && @relationships_cached_at_touched[reflection.name])
         next if reflection.is_a?(ActiveRecord::Reflection::HasManyReflection) && method == :create
 
         assoc = association(name.to_sym)
         assoc.touch_cached_at(timestamp, method)
-        assoc.touch_through_reflections(through_connections, timestamp)
+        assoc.touch_through_reflections(timestamp)
       end
     end
 

data/lib/cached_at/reflections/abstract_reflection.rb

@@ -0,0 +1,30 @@
+module CachedAt
+  module AbstractReflection
+  
+    def through_relationship_endpoints
+      return @through_relationship_endpoints if instance_variable_defined?(:@through_relationship_endpoints)
+    
+      @through_relationship_endpoints = []
+      active_record.reflections.each do |name, r|
+        next if r == self
+        begin
+          if r.polymorphic?
+            # TODO
+          else
+            r.klass.reflections.each do |name2, r2|
+              if r2.options[:cached_at] && r2.options[:through] && r2.options[:through] == r.inverse_of&.name
+                @through_relationship_endpoints << r2
+              end
+            end
+          end
+        rescue NameError
+        end
+      end
+    
+      @through_relationship_endpoints
+    end
+  
+  end
+end
+
+ActiveRecord::Reflection::AbstractReflection.include(CachedAt::AbstractReflection)

data/lib/cached_at/version.rb

@@ -1,3 +1,3 @@
 module CachedAt
-  VERSION = '2.0.11'
+  VERSION = '2.0.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-cached_at
 version: !ruby/object:Gem::Version
-  version: 2.0.11
+  version: 2.0.12
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-10 00:00:00.000000000 Z
+date: 2017-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -145,6 +145,7 @@ files:
 - lib/cached_at/connection_adapters/abstract/schema_definitions.rb
 - lib/cached_at/connection_adapters/abstract/schema_statements.rb
 - lib/cached_at/helpers.rb
+- lib/cached_at/reflections/abstract_reflection.rb
 - lib/cached_at/timestamp.rb
 - lib/cached_at/version.rb
 homepage: https://github.com/malomalo/activerecord-cached_at
@@ -169,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Allows ActiveRecord and Rails to use a `cached_at` column for the `cache_key`