historiographer 4.1.9 → 4.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0a2f100a48aa0554022b2b53d7dd09cb296b298b6c6d92e6dae5b824cccd600
-  data.tar.gz: 6472d913b3d16ae9b5adc2414d1bbc0eaab9d62f632d497e475fd35291b90999
+  metadata.gz: e211bf451d7041d58702ebc28a4485eb3a073978aca72ef1933e9b5dcebc49fe
+  data.tar.gz: 20ab524186b29a4c3dd44553a62b8853cf46a82aae4f139d18d3178b045cb35a
 SHA512:
-  metadata.gz: c4dcc56d605f9c67ff7e00de652a9d180034e7c41c911d44e4c697a8843903a0da8669a7bf02a72877566835c5acc937f3a61c674dc206fc51e826720b9ff689
-  data.tar.gz: c16605025d81e61edd43476e8c8b0e85035aacd496b071ab13cec7eeabc5469297b1342df7b3e352dfc8eee4999ee871361aebf6e16e324b0020733f02bf5cbc
+  metadata.gz: 055c01abfa33ab141ef48644ea38fa2a4052a9471d68519f89a659bbf45f83e37f66bb1aa847ba7014de9a46435af3cdced42d45ea122d25b70c409fdc312777
+  data.tar.gz: d7df91b900b2ea61b4e366b67972242d2882feadf8cfebbd8cd0d67875782535d267e084ec9cf044c835b4da757a0602b1ca8e75f6f27310faf4fe7b7bf69931

data/lib/historiographer/history.rb

@@ -83,7 +83,6 @@ module Historiographer
 
       # Store the original class for method delegation
       class_variable_set(:@@original_class, foreign_class)
-      class_variable_set(:@@method_map, {})
 
       #
       # A History class will be linked to the user
@@ -123,8 +122,6 @@ module Historiographer
             # Skip if we've already defined this method in the history class
             return if foreign_class.history_class.method_defined?(method_name)
 
-            # Define the method in the history class
-            foreign_class.history_class.set_method_map(method_name, false)
             foreign_class.history_class.class_eval do
               define_method(method_name) do |*args, &block|
                 forward_method(method_name, *args, &block)
@@ -258,23 +255,6 @@ module Historiographer
         true
       end
 
-      def method_added(method_name)
-        set_method_map(method_name, true)
-      end
-
-      def set_method_map(method_name, is_overridden)
-        mm = method_map
-        mm[method_name.to_sym] = is_overridden
-        class_variable_set(:@@method_map, mm)
-      end
-
-      def method_map
-        unless class_variable_defined?(:@@method_map)
-          class_variable_set(:@@method_map, {})
-        end
-        class_variable_get(:@@method_map) || {}
-      end
-
       def original_class
         unless class_variable_defined?(:@@original_class)
           class_variable_set(:@@original_class, self.name.gsub(/History$/, '').constantize)
@@ -368,15 +348,19 @@ module Historiographer
         attrs[original_class.inheritance_column] = attrs[original_class.inheritance_column]&.gsub(/History$/, '')
       end
 
-      # Create instance with all attributes except history-specific ones
-      instance = original_class.instantiate(attrs.except(*cannot_keep_cols))
+      # Manually handle creating instance WITHOUT running find or initialize callbacks
+      # We will manually run callbacks below
+      # See: https://github.com/rails/rails/blob/95deab7b439abba23fdc4bd659116dab5dbe2606/activerecord/lib/active_record/core.rb#L487
+      #
+      attributes = original_class.attributes_builder.build_from_database(attrs.except(*cannot_keep_cols))
+      instance = original_class.allocate
 
-      if instance.valid?
-        if instance.send(original_class.primary_key).present?
-          instance.run_callbacks(:find)
-        end
-        instance.run_callbacks(:initialize)
-      end
+      # Set the internal attributes
+      instance.instance_variable_set(:@attributes, attributes)
+      instance.instance_variable_set(:@new_record, false)
+
+      # Initialize internal variables without triggering callbacks
+      instance.send(:init_internals)
 
       # Filter out any methods that are not overridden on the history class
       history_methods = self.class.instance_methods(false)
@@ -405,15 +389,13 @@ module Historiographer
         end
       end
 
-      # Override class method to return history class
-      instance.singleton_class.class_eval do
-        define_method(:class) do
-          history_instance = instance.instance_variable_get(:@_history_instance)
-          history_instance.class
-        end
+      instance.instance_variable_set(:@_history_instance, self)
+
+      if instance.send(original_class.primary_key).present?
+        instance.run_callbacks(:find)
       end
+      instance.run_callbacks(:initialize)
 
-      instance.instance_variable_set(:@_history_instance, self)
       @dummy_instance = instance
     end
 

data/lib/historiographer/version.rb

@@ -1,3 +1,3 @@
 module Historiographer
-  VERSION = "4.1.9"
+  VERSION = "4.1.10"
 end

data/lib/historiographer.rb

@@ -332,6 +332,10 @@ module Historiographer
       history_class = self.class.history_class
       foreign_key = history_class.history_foreign_key
 
+      attrs = attrs.stringify_keys
+      allowed_columns = self.class.columns.map(&:name)
+      attrs.select! { |k,v| allowed_columns.include?(k) }.to_h
+
       now ||= UTC.now
       attrs.merge!(foreign_key => attrs['id'], history_started_at: now, history_user_id: history_user_id)
       attrs.merge!(snapshot_id: snapshot_id) if snapshot_id.present?
@@ -343,6 +347,7 @@ module Historiographer
       end
 
       attrs = attrs.except('id')
+      attrs.stringify_keys!
 
       attrs
     end
@@ -361,6 +366,23 @@ module Historiographer
       raise HistoryUserIdMissingError, 'history_user_id must be passed in order to save record with histories! If you are in a context with no history_user_id, explicitly call #save_without_user'
     end
 
+    def list_callbacks(klass)
+      callbacks = {}
+
+      [:create, :update, :save, :destroy, :validation].each do |callback_type|
+        chain = klass.send("_#{callback_type}_callbacks")
+        callbacks[callback_type] = chain.map do |callback|
+          {
+            name: callback.filter,
+            kind: callback.kind,
+            options: callback.options
+          }
+        end
+      end
+
+      callbacks
+    end
+
     #
     # Save a record of the most recent changes, with the current
     # time as history_started_at, and the provided user as history_user_id.
@@ -375,9 +397,10 @@ module Historiographer
       current_history = histories.where(history_ended_at: nil).order('id desc').limit(1).last
 
       if history_class.history_foreign_key.present? && history_class.present?
-        instance = history_class.new(attrs)
-        instance.save(validate: false)
-        current_history.update!(history_ended_at: now) if current_history.present?
+        result = history_class.insert_all([attrs])
+        inserted_id = result.rows.first.first if history_class.primary_key == 'id'
+        instance = history_class.find(inserted_id)
+        current_history.update_columns(history_ended_at: now) if current_history.present?
         instance
       else
         raise 'Need foreign key and history class to save history!'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: historiographer
 version: !ruby/object:Gem::Version
-  version: 4.1.9
+  version: 4.1.10
 platform: ruby
 authors:
 - brettshollenberger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-03 00:00:00.000000000 Z
+date: 2024-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord