activerecord-cached_at 6.1.0.rc1 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffaa40afe11c877610e9ca9ba1072e47521c6b188522cf5bba065767129f9ced
-  data.tar.gz: 06403fdc5c4303fc80105c5381771db103058bf0f762bd92fc0826c6afa46431
+  metadata.gz: 79e3b29684f0a17923d328876ac4cfa8e839a4f8ce8d5c11f8cb57961a737b1a
+  data.tar.gz: 0a9a34b66da4bc0019b9cebaa5a35befb1a442711fe2660553d0362f9ac5936a
 SHA512:
-  metadata.gz: 328f5606ca71e467cfab60b136bfe7429010f2adff5227c495916089feb03d6a98be86740fe488d833a510e7239467f192d91530d749b5fb9f67eb6a52e90e2d
-  data.tar.gz: ca67eddf6423cb2930860dfd00943a7ea649fd5104b03c94c0b894f087d469ad0ef88f7e7b18cccadbf6c7410d07d92074f1bf137a6bd28dba58b1692ec6e7cf
+  metadata.gz: c5f8b1069214be9721b925c4e41fab372a04c0dadcea5bff50caffd1f87a00342453ea318ffc3f64851532c281530b7929f9d5d9cddf93f31786139a450a56aa
+  data.tar.gz: cb5fe100c8103e71378fdfb78762e74723ca8822dbf8387148fcdf568371e918780eb95faa201b50f82b63d798039cf175b00c27e9b4e5ff81fb7e374a3f29f4

data/README.md

@@ -1,4 +1,4 @@
-# ActiveRecord - CachedAt [![Travis CI](https://travis-ci.org/malomalo/activerecord-cached_at.svg?branch=master)](https://travis-ci.org/malomalo/activerecord-cached_at)
+# ActiveRecord - CachedAt
 
 This gem causes ActiveRecord to update a `cached_at` column if present, like the
 `updated_at` column.

data/ext/active_record/connection_adapters/abstract/schema_definitions.rb

@@ -2,14 +2,21 @@ module ActiveRecord
   module ConnectionAdapters #:nodoc:
 
     class TableDefinition
-      def timestamps(*args)
-        options = args.extract_options!
 
+      def internal_table?
+        @name == "#{ActiveRecord::Base.table_name_prefix}#{ActiveRecord::Base.internal_metadata_table_name}#{ActiveRecord::Base.table_name_suffix}"
+      end
+      
+      def timestamps(**options)
         options[:null] = false if options[:null].nil?
 
-        column(:created_at, :datetime, options)
-        column(:updated_at, :datetime, options)
-        column(:cached_at, :datetime, options)
+        if !options.key?(:precision) && @conn.supports_datetime_with_precision?
+          options[:precision] = 6
+        end
+
+        column(:created_at, :datetime, **options)
+        column(:updated_at, :datetime, **options)
+        column(:cached_at, :datetime,  **options) if !internal_table?
       end
     end
 

data/ext/active_record/connection_adapters/abstract/schema_statements.rb

@@ -2,19 +2,42 @@ module ActiveRecord
   module ConnectionAdapters #:nodoc:
 
     module SchemaStatements
-      def add_timestamps(table_name, options = {})
+      def add_timestamps(table_name, **options)
         options[:null] = false if options[:null].nil?
 
-        add_column table_name, :created_at, :datetime, options
-        add_column table_name, :updated_at, :datetime, options
-        add_column table_name, :cached_at, :datetime, options
+        if !options.key?(:precision) && supports_datetime_with_precision?
+          options[:precision] = 6
+        end
+
+        add_column table_name, :created_at, :datetime, **options
+        add_column table_name, :updated_at, :datetime, **options
+        add_column table_name, :cached_at, :datetime,  **options
       end
 
-      def remove_timestamps(table_name, options = {})
+      def remove_timestamps(table_name, **options)
         remove_column table_name, :updated_at
         remove_column table_name, :created_at
         remove_column table_name, :cached_at
       end
+
+      def add_timestamps_for_alter(table_name, **options)
+        options[:null] = false if options[:null].nil?
+
+        if !options.key?(:precision) && supports_datetime_with_precision?
+          options[:precision] = 6
+        end
+
+        [
+          add_column_for_alter(table_name, :created_at, :datetime, **options),
+          add_column_for_alter(table_name, :updated_at, :datetime, **options),
+          add_column_for_alter(table_name, :cached_at, :datetime, **options)
+        ]
+      end
+
+      def remove_timestamps_for_alter(table_name, **options)
+        remove_columns_for_alter(table_name, :updated_at, :created_at, :cached_at)
+      end
+
     end
 
   end

data/lib/cached_at/associations/association.rb

@@ -41,7 +41,8 @@ module CachedAt
         
         source_assoc = owner.association(r.source_reflection_name.to_sym)
         if source_assoc.loaded?
-          source_assoc.target.send(:write_attribute_without_type_cast, cache_column, timestamp)
+          source_assoc.target.instance_variable_get(:@attributes).write_cast_value(cache_column, timestamp)
+          source_assoc.target.send(:clear_attribute_change, cache_column)
         end
         query = r.klass.where(r.association_primary_key => owner.send(r.foreign_key))
         query.update_all({ cache_column => timestamp })

data/lib/cached_at/associations/belongs_to_association.rb

@@ -45,7 +45,8 @@ module CachedAt
       end
       
       if loaded? && target
-        target.send(:write_attribute_without_type_cast, cache_column, timestamp)
+        target.instance_variable_get(:@attributes).write_cast_value(cache_column, timestamp)
+        target.send(:clear_attribute_change, cache_column)
       end
     end
     
@@ -54,7 +55,8 @@ module CachedAt
         timestamp = Time.now
         cache_column = "#{options[:inverse_of]}_cached_at"
         if loaded? && target
-          target.send(:write_attribute_without_type_cast, cache_column, timestamp)
+          target.instance_variable_get(:@attributes).write_cast_value(cache_column, timestamp)
+          target.send(:clear_attribute_change, cache_column)
         end
       end
       

data/lib/cached_at/associations/collection_association.rb

@@ -15,7 +15,8 @@ module CachedAt
       
       if loaded?
         target.each do |record|
-          record.send(:write_attribute_without_type_cast, cache_column, timestamp)
+          record.instance_variable_get(:@attributes).write_cast_value(cache_column, timestamp)
+          record.send(:clear_attribute_change, cache_column)
         end
       end
       
@@ -42,7 +43,12 @@ module CachedAt
 
       cache_column = "#{reflection.inverse_of.name}_cached_at"
 
-      records.each { |r| r.send(:write_attribute_without_type_cast, cache_column, timestamp) unless r.destroyed? }
+      records.each do |record|
+        next if record.destroyed?
+        
+        record.instance_variable_get(:@attributes).write_cast_value(cache_column, timestamp)
+        record.send(:clear_attribute_change, cache_column)
+      end
 
       query = klass.where({ klass.primary_key => records.map(&:id) })
       query.update_all({ cache_column => timestamp })

data/lib/cached_at/associations/has_many_through_association.rb

@@ -15,7 +15,10 @@ module CachedAt
 
         query = nil
         if loaded?
-          target.each { |r| r.send(:write_attribute_without_type_cast, cache_column, timestamp) }
+          target.each do |record|
+            record.instance_variable_get(:@attributes).write_cast_value(cache_column, timestamp)
+            record.send(:clear_attribute_change, cache_column)
+          end
           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}_before_last_save")].compact.uniq
@@ -35,7 +38,8 @@ module CachedAt
       #TODO: test with new record (fails in mls)
       if !owner.new_record? && using_reflection.inverse_of && using_reflection.inverse_of.options[:cached_at]
         cache_column = "#{using_reflection.name}_cached_at"
-        owner.send(:write_attribute_without_type_cast, cache_column, timestamp)
+        owner.instance_variable_get(:@attributes).write_cast_value(cache_column, timestamp)
+        owner.send(:clear_attribute_change, cache_column)
         owner.update_columns(cache_column => timestamp)
       end
     end
@@ -50,7 +54,10 @@ module CachedAt
         end
 
         cache_column = "#{using_reflection.inverse_of.name}_cached_at"
-        records.each { |r| r.send(:write_attribute_without_type_cast, cache_column, timestamp) }
+        records.each do |record|
+          record.instance_variable_get(:@attributes).write_cast_value(cache_column, timestamp)
+          record.send(:clear_attribute_change, cache_column)
+        end
         query = klass.where(klass.primary_key => records.map(&:id))
         query.update_all({ cache_column => timestamp })
         traverse_relationships(klass, using_reflection.options[:cached_at], query, cache_column, timestamp)

data/lib/cached_at/associations/has_one_association.rb

@@ -24,7 +24,8 @@ module CachedAt
       end
       
       if loaded? && target
-        target.send(:write_attribute_without_type_cast, cache_column, timestamp)
+        target.instance_variable_get(:@attributes).write_cast_value(cache_column, timestamp)
+        target.send(:clear_attribute_change, cache_column)
       end
     end
     

data/lib/cached_at/timestamp.rb

@@ -7,11 +7,13 @@ module ActiveRecord
         private
     
         def timestamp_attributes_for_update
-          ['updated_at']
+          ["updated_at", "updated_on"].map! { |name| attribute_aliases[name] || name }
         end
 
         def timestamp_attributes_for_create
-          ['created_at', 'udpated_at', 'cached_at'] + column_names.select{|c| c.end_with?('_cached_at') }
+          (['created_at', 'udpated_at', 'cached_at'] + column_names.select{|c| c.end_with?('_cached_at') }).map! do |name|
+            attribute_aliases[name] || name
+          end
         end
 
       end

data/lib/cached_at/version.rb

@@ -1,3 +1,3 @@
 module CachedAt
-  VERSION = '6.1.0.rc1'
+  VERSION = '7.0.0'
 end

data/lib/cached_at.rb

@@ -3,5 +3,5 @@ require 'active_record'
 require File.expand_path(File.join(__FILE__, '../cached_at/base'))
 require File.expand_path(File.join(__FILE__, '../cached_at/helpers'))
 require File.expand_path(File.join(__FILE__, '../cached_at/timestamp'))
-require File.expand_path(File.join(__FILE__, '../cached_at/connection_adapters/abstract/schema_definitions'))
-require File.expand_path(File.join(__FILE__, '../cached_at/connection_adapters/abstract/schema_statements'))
+require File.expand_path(File.join(__FILE__, '../../ext/active_record/connection_adapters/abstract/schema_definitions'))
+require File.expand_path(File.join(__FILE__, '../../ext/active_record/connection_adapters/abstract/schema_statements'))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-cached_at
 version: !ruby/object:Gem::Version
-  version: 6.1.0.rc1
+  version: 7.0.0
 platform: ruby
 authors:
 - Jon Bracy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-28 00:00:00.000000000 Z
+date: 2023-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -143,8 +143,6 @@ files:
 - lib/cached_at/associations/has_many_through_association.rb
 - lib/cached_at/associations/has_one_association.rb
 - lib/cached_at/base.rb
-- 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
@@ -166,11 +164,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
 summary: Allows ActiveRecord and Rails to use a `cached_at` column for the `cache_key`

data/lib/cached_at/connection_adapters/abstract/schema_definitions.rb

@@ -1,15 +0,0 @@
-module ActiveRecord
-  module ConnectionAdapters #:nodoc:
-    
-    class TableDefinition
-      def timestamps(**options)
-        options[:null] = false if options[:null].nil?
-        
-        column(:created_at, :datetime, options)
-        column(:updated_at, :datetime, options)
-        column(:cached_at,  :datetime, options)
-      end
-    end
-    
-  end
-end

data/lib/cached_at/connection_adapters/abstract/schema_statements.rb

@@ -1,21 +0,0 @@
-module ActiveRecord
-  module ConnectionAdapters #:nodoc:
-
-    module SchemaStatements
-      def add_timestamps(table_name, options = {})
-        options[:null] = false if options[:null].nil?
-        
-        add_column table_name, :created_at, :datetime, options
-        add_column table_name, :updated_at, :datetime, options
-        add_column table_name, :cached_at,  :datetime, options
-      end
-      
-      def remove_timestamps(table_name, options = {})
-        remove_column table_name, :updated_at
-        remove_column table_name, :created_at
-        remove_column table_name, :cached_at
-      end
-    end
-
-  end
-end