activerecord-cached_at 2.0.12 → 2.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8176a13705e644ac3fa27b5690c68ec7c4d43f46
-  data.tar.gz: e022fb6d8d7c6da36aa819fb3809a05a86c2f06d
+  metadata.gz: c744adeef1d92b25ca053e9553e23d107317b0db
+  data.tar.gz: 07d579d29d299964580a6025509c756d01fddb3f
 SHA512:
-  metadata.gz: 9b0cc35ece0124d0027967d615b1665f58ca15451aa148e87f154455e4c599bedbd71dbc951b174ae12271cc9aece81a390a9124765608d66af1782edbfcdde6
-  data.tar.gz: 9131194d596d3fb06f205068c4afdcb6731dbd5d83902c0f5980c4bb07d875bf378332b1bd2659ed010c08a8394040162d9aa31db7e73c23e211fb980f13ce62
+  metadata.gz: 8b32156ffebc82c9fc2a75e1244edfafe76b51bee868eb8126de844220e4afe75c11415cd8d169b28c6138fb2b6aef4f87ee9d05e25a8f94936464756f3511cc
+  data.tar.gz: '0706495432358f4a0b816e93b0d9fd1b5bf284acd36cdd4fe71f9c9969fbec238a1ae69e92a07ae3db3c975ba53e9b6c3fc0596f9a0c6628d3d67e5495893d62'

data/lib/cached_at/association_extension.rb

@@ -2,6 +2,7 @@ module CachedAt
   module AssociationExtension
 
     def self.build(model, reflection)
+      return unless reflection.options[:cached_at]
     end
     
     def self.valid_options
@@ -11,4 +12,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,9 +1,5 @@
 module CachedAt
   module Association
-
-    def initialize(owner, reflection)
-      super
-    end
     
     def traverse_relationships(klass, relationships, query, cache_column, timestamp)
       if relationships.is_a?(Symbol)

data/lib/cached_at/reflections/abstract_reflection.rb

@@ -1,30 +1,42 @@
 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
+    def cache_through_relationship_endpoints
+      if defined?(Rails)
+        Rails.application.config.cache_classes
+      else
+        true
       end
+    end
     
+    def through_relationship_endpoints
+      return @through_relationship_endpoints if instance_variable_defined?(:@through_relationship_endpoints) && cache_through_relationship_endpoints
+
+      @through_relationship_endpoints = if defined?(Rails)
+        Rails.application.reloader.wrap { calculate_through_relationship_endpoints }
+      else
+        calculate_through_relationship_endpoints
+      end
+
       @through_relationship_endpoints
     end
   
+    def calculate_through_relationship_endpoints
+      endpoints = []
+      
+      if self.polymorphic?
+      else
+        self.klass._reflections.each do |name, r|
+          if r.options[:cached_at] && r.options[:through] && r.options[:through] == self.inverse_of&.name
+            endpoints << r
+          end
+        end
+      end
+
+      endpoints
+    end
+    
   end
 end
 
-ActiveRecord::Reflection::AbstractReflection.include(CachedAt::AbstractReflection)
+ActiveRecord::Reflection::AbstractReflection.include(CachedAt::AbstractReflection)

data/lib/cached_at/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-cached_at
 version: !ruby/object:Gem::Version
-  version: 2.0.12
+  version: 2.0.13
 platform: ruby
 authors:
 - Jon Bracy
@@ -170,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Allows ActiveRecord and Rails to use a `cached_at` column for the `cache_key`