activerecord-cached_at 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc1bd151e181ac5f23c935dac9ab23fbcddccbc5
-  data.tar.gz: 208b03130f07a7e15de10eecf04f4c7b63d791a6
+  metadata.gz: db52a9781aef2816fbd61977be020afad8e25a9b
+  data.tar.gz: 1b20acad3adacdb68b1920aaaa90b82b8166dc88
 SHA512:
-  metadata.gz: e7888c7177e10ad7dc44bc866f73b73ed046344ce365a347948cc0459e0d7267822741abe42585e24b30e55460bbe2e41240cb097d88b7b68ccc6c2078cca491
-  data.tar.gz: 55cbee3514f01d8c156e7379d6d1d59e8a512693e944d017afaedf31adf5c2dbacc3d02e9e58ed4b032dab79c5cf58a15a08933b41969b228d5dc2059629bc6d
+  metadata.gz: ecdd3baaf3d1c04e795468f8cf8b6517b22f777892ee9dcdec9299202a3f41d9e579d96494deb92a56def115d9aac802239e87a203b8fba79a50e64a3a63914b
+  data.tar.gz: 32a7e4324a8136d5d29831856dc5041a2c47f0ffb0d5c9c03f5caadc50f526d40948e6f36f9871b6f1bad496e83a70c7a96757d4bdc33d130a043efcd269eca6

data/lib/cached_at/associations/has_many_through_association.rb

@@ -3,34 +3,40 @@ module CachedAt
   
     def touch_cached_at(timestamp, method)
       using_reflection = reflection.parent_reflection || reflection
-      return unless using_reflection.options[:cached_at]
-
-      return if method == :create && !using_reflection.is_a?(ActiveRecord::Reflection::HasAndBelongsToManyReflection)
-
-      if using_reflection.inverse_of.nil?
-        puts "WARNING: cannot updated cached at for relationship: #{owner.class.name}.#{using_reflection.name}, inverse_of not set"
-        return
-      end
       
-      cache_column = "#{using_reflection.inverse_of.name}_cached_at"
+      if using_reflection.options[:cached_at]
+        return if method == :create && !using_reflection.is_a?(ActiveRecord::Reflection::HasAndBelongsToManyReflection)
+
+        if using_reflection.inverse_of.nil?
+          puts "WARNING: cannot updated cached at for relationship: #{owner.class.name}.#{using_reflection.name}, inverse_of not set"
+          return
+        end
+        cache_column = "#{using_reflection.inverse_of.name}_cached_at"
 
-      query = nil
-      if loaded?
-        target.each { |r| r.raw_write_attribute(cache_column, timestamp) }
-        query = klass.where(klass.primary_key => target.map(&:id))
-      else
-        ids = [owner.send(using_reflection.association_primary_key), owner.send("#{using_reflection.association_primary_key}_was")].compact.uniq
-        arel_table = klass._reflections[using_reflection.inverse_of.options[:through].to_s].klass.arel_table
-        query = klass.joins(using_reflection.inverse_of.options[:through])
-        query = if using_reflection.is_a?(ActiveRecord::Reflection::HasAndBelongsToManyReflection)
-          query.where(arel_table[using_reflection.foreign_key].in(ids))
+        query = nil
+        if loaded?
+          target.each { |r| r.raw_write_attribute(cache_column, timestamp) }
+          query = klass.where(klass.primary_key => target.map(&:id))
         else
-          query.where(arel_table[using_reflection.inverse_of.foreign_key].in(ids))
+          ids = [owner.send(using_reflection.association_primary_key), owner.send("#{using_reflection.association_primary_key}_was")].compact.uniq
+          arel_table = klass._reflections[using_reflection.inverse_of.options[:through].to_s].klass.arel_table
+          query = klass.joins(using_reflection.inverse_of.options[:through])
+          query = if using_reflection.is_a?(ActiveRecord::Reflection::HasAndBelongsToManyReflection)
+            query.where(arel_table[using_reflection.foreign_key].in(ids))
+          else
+            query.where(arel_table[using_reflection.inverse_of.foreign_key].in(ids))
+          end
         end
+        
+        query.update_all({ cache_column => timestamp })
+        traverse_relationships(klass, options[:cached_at], query, cache_column, timestamp)
       end
 
-      query.update_all({ cache_column => timestamp })
-      traverse_relationships(klass, options[:cached_at], query, cache_column, timestamp)
+      if using_reflection.inverse_of && using_reflection.inverse_of.options[:cached_at]
+        cache_column = "#{using_reflection.name}_cached_at"
+        owner.raw_write_attribute(cache_column, timestamp)
+        owner.update_columns(cache_column => timestamp)
+      end
     end
     
     def touch_records_cached_at(records, timestamp)

data/lib/cached_at/base.rb

@@ -43,7 +43,6 @@ module CachedAt
             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 if instance_variable_defined?(:@relationships_cached_at_touched) && (!@relationships_cached_at_touched.nil? && @relationships_cached_at_touched[reflection.name])

data/lib/cached_at/version.rb

@@ -1,3 +1,3 @@
 module CachedAt
-  VERSION = '2.0.7'
+  VERSION = '2.0.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-cached_at
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-09 00:00:00.000000000 Z
+date: 2017-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord