historiographer 4.4.1 → 4.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9299cb62bdfd77ef8cec2c614a592166c67d489a1c36a77d83d78eb3dca48d1
-  data.tar.gz: 9e03988f85e756bbbc2789c86dc4df255df837aef07bdc718ee2774f5a5956cb
+  metadata.gz: 66fb9c7d713df84dd4ad5470c6ace5730e5a762d378d0d1fc523a00767b94a2b
+  data.tar.gz: e9b1cfaa4911d4e596aaa8808d1e4cf69b7e57a40101bae4cf826ec48832d3c9
 SHA512:
-  metadata.gz: 70e7054198d9010c9d7cc01986e9d8d92b64f4f6a65d4ba2c96d66b7d903d07dd21ac2690407ff40d8bfd685c174e1f9c65b0c659e7d915d1398a637808435bb
-  data.tar.gz: b2ccf22179ec57e5cf045628eadd76b7e755ac3d9951b838030d72f132461f524752774e5d5baeefcb01bfdb6a47a430c8eaa08ed6382fa54dddb84ec5b1ec6d
+  metadata.gz: a6291260e457cc89940cbdd622e1e2075e05ad7682005f4bd4dab9e63d302e2cd1dd3d55d494f336b442fe36827b5934251f3fb155480ab46e1bf7e84cb77414
+  data.tar.gz: e1a2afe3202d4c3949424afda77a5c9b307baa50c1e43bde0c488ecff3bd85aff08b5ce57c6664dba058b188603e35c845e508487769848fa811003174b751e0

data/VERSION

@@ -1 +1 @@
-4.4.1
+4.4.2

data/historiographer.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: historiographer 4.4.1 ruby lib
+# stub: historiographer 4.4.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "historiographer".freeze
-  s.version = "4.4.1"
+  s.version = "4.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["brettshollenberger".freeze]
-  s.date = "2025-08-21"
+  s.date = "2025-08-22"
   s.description = "Creates separate tables for each history table".freeze
   s.email = "brett.shollenberger@gmail.com".freeze
   s.extra_rdoc_files = [
@@ -67,6 +67,10 @@ Gem::Specification.new do |s|
     "spec/db/migrate/20241119000000_create_datasets.rb",
     "spec/db/migrate/2025082100000_create_projects.rb",
     "spec/db/migrate/2025082100001_create_project_files.rb",
+    "spec/db/migrate/20250823000000_create_easy_ml_columns.rb",
+    "spec/db/migrate/20250824000000_create_test_articles.rb",
+    "spec/db/migrate/20250824000001_create_test_categories.rb",
+    "spec/db/migrate/20250825000000_create_bylines.rb",
     "spec/db/schema.rb",
     "spec/factories/post.rb",
     "spec/foreign_key_spec.rb",
@@ -74,6 +78,7 @@ Gem::Specification.new do |s|
     "spec/models/application_record.rb",
     "spec/models/author.rb",
     "spec/models/author_history.rb",
+    "spec/models/byline.rb",
     "spec/models/comment.rb",
     "spec/models/comment_history.rb",
     "spec/models/easy_ml/column.rb",
@@ -88,6 +93,10 @@ Gem::Specification.new do |s|
     "spec/models/safe_post_history.rb",
     "spec/models/silent_post.rb",
     "spec/models/silent_post_history.rb",
+    "spec/models/test_article.rb",
+    "spec/models/test_article_history.rb",
+    "spec/models/test_category.rb",
+    "spec/models/test_category_history.rb",
     "spec/models/thing_with_compound_index.rb",
     "spec/models/thing_with_compound_index_history.rb",
     "spec/models/thing_without_history.rb",

data/lib/historiographer/history.rb

@@ -133,10 +133,14 @@ module Historiographer
         end
       end
 
-      (foreign_class.columns.map(&:name) - ["id"]).each do |method_name|
-        define_method(method_name) do |*args, **kwargs, &block|
-          forward_method(method_name, *args, **kwargs, &block)
+      begin
+        (foreign_class.columns.map(&:name) - ["id"]).each do |method_name|
+          define_method(method_name) do |*args, **kwargs, &block|
+            forward_method(method_name, *args, **kwargs, &block)
+          end
         end
+      rescue ActiveRecord::StatementInvalid, ActiveRecord::ConnectionNotEstablished
+        # Table might not exist yet during setup
       end
 
       # Add method_missing for any methods we might have missed
@@ -233,9 +237,52 @@ module Historiographer
       # Track custom association methods
       base.class_variable_set(:@@history_association_methods, [])
       
-      # Dynamically define associations on the history class
-      foreign_class.reflect_on_all_associations.each do |association|
-        define_history_association(association)
+      # Register this history class to have its associations set up after initialization
+      history_classes = Thread.current[:historiographer_history_classes] ||= []
+      history_classes << base
+      
+      # Set up the after_initialize hook if we're in a Rails app
+      if defined?(Rails) && Rails.respond_to?(:application) && Rails.application && Rails.application.config.respond_to?(:after_initialize)
+        Rails.application.config.after_initialize do
+          history_classes.each do |history_class|
+            history_class.setup_history_associations
+          end
+        end
+      else
+        # For non-Rails environments (like our test suite), set up associations immediately
+        # but defer if models aren't loaded yet
+        base.define_singleton_method :setup_history_associations do |force = false|
+          return if !force && class_variable_defined?(:@@associations_set_up) && class_variable_get(:@@associations_set_up)
+          class_variable_set(:@@associations_set_up, true)
+          
+          foreign_class.reflect_on_all_associations.each do |association|
+            begin
+              define_history_association(association)
+            rescue => e
+              # Log but don't fail
+              puts "Warning: Could not define history association #{association.name}: #{e.message}" if ENV['DEBUG']
+            end
+          end
+        end
+        
+        # Try to set up now if possible
+        begin
+          base.setup_history_associations
+        rescue => e
+          # Will retry later
+        end
+        
+        # Override reflect_on_association to ensure associations are defined
+        base.define_singleton_method :reflect_on_association do |name|
+          setup_history_associations rescue nil
+          super(name)
+        end
+        
+        # Override reflect_on_all_associations to ensure associations are defined
+        base.define_singleton_method :reflect_on_all_associations do |*args|
+          setup_history_associations rescue nil
+          super(*args)
+        end
       end
 
       def snapshot
@@ -264,83 +311,133 @@ module Historiographer
       def define_history_association(association)
         if association.is_a?(Symbol) || association.is_a?(String)
           association = original_class.reflect_on_association(association)
+          # If the association doesn't exist on the original class, skip it
+          return unless association
         end
+        
         assoc_name = association.name
-        assoc_module = association.active_record.module_parent
-        assoc_history_class_name = "#{association.class_name}History"
-
-        begin
-          assoc_module.const_get(assoc_history_class_name)
-          assoc_history_class_name = "#{assoc_module}::#{assoc_history_class_name}" unless assoc_history_class_name.match?(Regexp.new("#{assoc_module}::"))
-        rescue
-        end
-
         assoc_foreign_key = association.foreign_key
 
         # Skip through associations to history classes to avoid infinite loops
         return if association.class_name.end_with?('History')
 
-        # Always use the history class if it exists
-        assoc_class = assoc_history_class_name.safe_constantize || OpenStruct.new(name: association.class_name)
-        assoc_class_name = assoc_class.name
+        # Get the associated model's table name
+        original_assoc_class = association.class_name.safe_constantize
+        return unless original_assoc_class  # Can't proceed without the class
+        
+        assoc_table_name = original_assoc_class.table_name
+        history_table_name = "#{assoc_table_name.singularize}_histories"
+        
+        # Check if a history table exists for this association
+        has_history_table = ActiveRecord::Base.connection.tables.include?(history_table_name)
+        
+        if has_history_table
+          # This model has history tracking, use the history class
+          assoc_history_class_name = "#{association.class_name}History"
+          assoc_module = association.active_record.module_parent
+          
+          begin
+            assoc_module.const_get(assoc_history_class_name)
+            assoc_history_class_name = "#{assoc_module}::#{assoc_history_class_name}" unless assoc_history_class_name.match?(Regexp.new("#{assoc_module}::"))
+          rescue
+          end
+          
+          assoc_class = assoc_history_class_name.safe_constantize || OpenStruct.new(name: assoc_history_class_name)
+          assoc_class_name = assoc_class.name
+        else
+          # No history table, use the original model
+          assoc_class_name = association.class_name
+        end
 
         case association.macro
         when :belongs_to
-          # For belongs_to associations, if the target is a history class, we need special handling
+          # Start with all original association options
+          options = association.options.dup
+          
+          # Override the class name and foreign key
+          options[:class_name] = assoc_class_name
+          options[:foreign_key] = assoc_foreign_key
+          
+          # For history associations, we need to handle snapshot filtering differently
+          # We'll create the association but override the accessor method
           if assoc_class_name.match?(/History/)
-            # Override the association method to filter by snapshot_id
-            # The history class uses <model>_id as the foreign key (e.g., author_id for AuthorHistory)
-            history_fk = association.class_name.gsub(/History$/, '').underscore + '_id'
+            # Create the Rails association first
+            belongs_to assoc_name, **options
             
-            # Track this custom method
-            methods_list = class_variable_get(:@@history_association_methods) rescue []
-            methods_list << assoc_name
-            class_variable_set(:@@history_association_methods, methods_list)
+            # Then override the accessor to filter by snapshot_id
+            history_fk = association.class_name.gsub(/History$/, '').underscore + '_id'
             
-            define_method(assoc_name) do
+            define_method("#{assoc_name}_with_snapshot") do
               return nil unless self[assoc_foreign_key]
               assoc_class.where(
                 history_fk => self[assoc_foreign_key],
                 snapshot_id: self.snapshot_id
               ).first
             end
+            
+            # Alias the original method and replace it
+            alias_method "#{assoc_name}_without_snapshot", assoc_name
+            alias_method assoc_name, "#{assoc_name}_with_snapshot"
           else
-            belongs_to assoc_name, class_name: assoc_class_name, foreign_key: assoc_foreign_key
+            belongs_to assoc_name, **options
           end
         when :has_one
+          # Start with all original association options
+          options = association.options.dup
+          
+          # Override the class name and keys
+          options[:class_name] = assoc_class_name
+          options[:foreign_key] = assoc_foreign_key
+          options[:primary_key] = history_foreign_key
+          
           if assoc_class_name.match?(/History/)
-            hfk = history_foreign_key
+            # Create the Rails association first
+            has_one assoc_name, **options
             
-            # Track this custom method
-            methods_list = class_variable_get(:@@history_association_methods) rescue []
-            methods_list << assoc_name
-            class_variable_set(:@@history_association_methods, methods_list)
+            # Then override the accessor to filter by snapshot_id
+            hfk = history_foreign_key
             
-            define_method(assoc_name) do
+            define_method("#{assoc_name}_with_snapshot") do
               assoc_class.where(
                 assoc_foreign_key => self[hfk],
                 snapshot_id: self.snapshot_id
               ).first
             end
+            
+            # Alias the original method and replace it
+            alias_method "#{assoc_name}_without_snapshot", assoc_name
+            alias_method assoc_name, "#{assoc_name}_with_snapshot"
           else
-            has_one assoc_name, class_name: assoc_class_name, foreign_key: assoc_foreign_key, primary_key: history_foreign_key
+            has_one assoc_name, **options
           end
         when :has_many
+          # Start with all original association options
+          options = association.options.dup
+          
+          # Override the class name and keys
+          options[:class_name] = assoc_class_name
+          options[:foreign_key] = assoc_foreign_key
+          options[:primary_key] = history_foreign_key
+          
           if assoc_class_name.match?(/History/)
+            # Create the Rails association first
+            has_many assoc_name, **options
+            
+            # Then override the accessor to filter by snapshot_id
             hfk = history_foreign_key
-            # Track this custom method
-            methods_list = class_variable_get(:@@history_association_methods) rescue []
-            methods_list << assoc_name
-            class_variable_set(:@@history_association_methods, methods_list)
             
-            define_method(assoc_name) do
+            define_method("#{assoc_name}_with_snapshot") do
               assoc_class.where(
                 assoc_foreign_key => self[hfk],
                 snapshot_id: self.snapshot_id
               )
             end
+            
+            # Alias the original method and replace it
+            alias_method "#{assoc_name}_without_snapshot", assoc_name
+            alias_method assoc_name, "#{assoc_name}_with_snapshot"
           else
-            has_many assoc_name, class_name: assoc_class_name, foreign_key: assoc_foreign_key, primary_key: history_foreign_key
+            has_many assoc_name, **options
           end
         end
       end
@@ -353,8 +450,9 @@ module Historiographer
       def history_foreign_key
         return @history_foreign_key if @history_foreign_key
 
-        # CAN THIS BE TABLE OR MODEL?
-        @history_foreign_key = original_class.base_class.name.singularize.foreign_key
+        # Use the table name to generate the foreign key to properly handle namespaced models
+        # E.g. EasyML::Column -> easy_ml_columns -> easy_ml_column_id
+        @history_foreign_key = original_class.base_class.table_name.singularize.foreign_key
       end
 
     end

data/spec/db/migrate/20250823000000_create_easy_ml_columns.rb

@@ -0,0 +1,26 @@
+class CreateEasyMlColumns < ActiveRecord::Migration[7.0]
+  def change
+    create_table :easy_ml_columns do |t|
+      t.string :name
+      t.string :data_type
+      t.timestamps
+    end
+    
+    create_table :easy_ml_column_histories do |t|
+      t.integer :easy_ml_column_id, null: false
+      t.string :name
+      t.string :data_type
+      t.timestamps
+      
+      t.datetime :history_started_at, null: false
+      t.datetime :history_ended_at
+      t.integer :history_user_id
+      t.string :snapshot_id
+      
+      t.index :easy_ml_column_id
+      t.index :history_started_at
+      t.index :history_ended_at
+      t.index :snapshot_id
+    end
+  end
+end

data/spec/db/migrate/20250824000000_create_test_articles.rb

@@ -0,0 +1,26 @@
+class CreateTestArticles < ActiveRecord::Migration[7.0]
+  def change
+    create_table :test_articles do |t|
+      t.string :title
+      t.integer :test_category_id
+      t.timestamps
+    end
+    
+    create_table :test_article_histories do |t|
+      t.integer :test_article_id, null: false
+      t.string :title
+      t.integer :test_category_id
+      t.timestamps
+      
+      t.datetime :history_started_at, null: false
+      t.datetime :history_ended_at
+      t.integer :history_user_id
+      t.string :snapshot_id
+      
+      t.index :test_article_id
+      t.index :history_started_at
+      t.index :history_ended_at
+      t.index :snapshot_id
+    end
+  end
+end

data/spec/db/migrate/20250824000001_create_test_categories.rb

@@ -0,0 +1,26 @@
+class CreateTestCategories < ActiveRecord::Migration[7.0]
+  def change
+    create_table :test_categories do |t|
+      t.string :name
+      t.integer :test_articles_count, default: 0
+      t.timestamps
+    end
+    
+    create_table :test_category_histories do |t|
+      t.integer :test_category_id, null: false
+      t.string :name
+      t.integer :test_articles_count, default: 0
+      t.timestamps
+      
+      t.datetime :history_started_at, null: false
+      t.datetime :history_ended_at
+      t.integer :history_user_id
+      t.string :snapshot_id
+      
+      t.index :test_category_id
+      t.index :history_started_at
+      t.index :history_ended_at
+      t.index :snapshot_id
+    end
+  end
+end

data/spec/db/migrate/20250825000000_create_bylines.rb

@@ -0,0 +1,11 @@
+class CreateBylines < ActiveRecord::Migration[7.1]
+  def change
+    create_table :bylines do |t|
+      t.string :name, null: false
+      t.integer :author_id
+      t.timestamps
+    end
+    
+    add_index :bylines, :author_id
+  end
+end

data/spec/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2024_11_19_000000) do
+ActiveRecord::Schema[7.1].define(version: 2025_08_25_000000) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -42,6 +42,14 @@ ActiveRecord::Schema[7.1].define(version: 2024_11_19_000000) do
     t.index ["deleted_at"], name: "index_authors_on_deleted_at"
   end
 
+  create_table "bylines", force: :cascade do |t|
+    t.string "name", null: false
+    t.integer "author_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["author_id"], name: "index_bylines_on_author_id"
+  end
+
   create_table "comment_histories", force: :cascade do |t|
     t.integer "comment_id", null: false
     t.integer "post_id"
@@ -99,57 +107,26 @@ ActiveRecord::Schema[7.1].define(version: 2024_11_19_000000) do
   end
 
   create_table "easy_ml_column_histories", force: :cascade do |t|
-    t.integer "column_id", null: false
-    t.string "name", null: false
-    t.string "data_type", null: false
-    t.string "column_type"
+    t.integer "easy_ml_column_id", null: false
+    t.string "name"
+    t.string "data_type"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.datetime "history_started_at", null: false
     t.datetime "history_ended_at"
     t.integer "history_user_id"
     t.string "snapshot_id"
-    t.index ["column_id"], name: "index_easy_ml_column_histories_on_column_id"
+    t.index ["easy_ml_column_id"], name: "index_easy_ml_column_histories_on_easy_ml_column_id"
     t.index ["history_ended_at"], name: "index_easy_ml_column_histories_on_history_ended_at"
     t.index ["history_started_at"], name: "index_easy_ml_column_histories_on_history_started_at"
-    t.index ["history_user_id"], name: "index_easy_ml_column_histories_on_history_user_id"
     t.index ["snapshot_id"], name: "index_easy_ml_column_histories_on_snapshot_id"
   end
 
   create_table "easy_ml_columns", force: :cascade do |t|
-    t.string "name", null: false
-    t.string "data_type", null: false
-    t.string "column_type"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-  end
-
-  create_table "ml_model_histories", force: :cascade do |t|
-    t.integer "ml_model_id", null: false
-    t.string "name"
-    t.string "model_type"
-    t.jsonb "parameters"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.datetime "history_started_at", null: false
-    t.datetime "history_ended_at"
-    t.integer "history_user_id"
-    t.string "snapshot_id"
-    t.index ["history_ended_at"], name: "index_ml_model_histories_on_history_ended_at"
-    t.index ["history_started_at"], name: "index_ml_model_histories_on_history_started_at"
-    t.index ["history_user_id"], name: "index_ml_model_histories_on_history_user_id"
-    t.index ["ml_model_id"], name: "index_ml_model_histories_on_ml_model_id"
-    t.index ["model_type"], name: "index_ml_model_histories_on_model_type"
-    t.index ["snapshot_id"], name: "index_ml_model_histories_on_snapshot_id"
-  end
-
-  create_table "ml_models", force: :cascade do |t|
     t.string "name"
-    t.string "model_type"
-    t.jsonb "parameters"
+    t.string "data_type"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index ["model_type"], name: "index_ml_models_on_model_type"
   end
 
   create_table "post_histories", force: :cascade do |t|
@@ -166,7 +143,6 @@ ActiveRecord::Schema[7.1].define(version: 2024_11_19_000000) do
     t.datetime "history_ended_at", precision: nil
     t.integer "history_user_id"
     t.string "snapshot_id"
-    t.string "type"
     t.index ["author_id"], name: "index_post_histories_on_author_id"
     t.index ["deleted_at"], name: "index_post_histories_on_deleted_at"
     t.index ["enabled"], name: "index_post_histories_on_enabled"
@@ -187,17 +163,17 @@ ActiveRecord::Schema[7.1].define(version: 2024_11_19_000000) do
     t.datetime "deleted_at", precision: nil
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
-    t.string "type"
     t.index ["author_id"], name: "index_posts_on_author_id"
     t.index ["deleted_at"], name: "index_posts_on_deleted_at"
     t.index ["enabled"], name: "index_posts_on_enabled"
     t.index ["live_at"], name: "index_posts_on_live_at"
-    t.index ["type"], name: "index_posts_on_type"
   end
 
   create_table "project_file_histories", force: :cascade do |t|
     t.integer "project_file_id", null: false
+    t.integer "project_id"
     t.string "name", null: false
+    t.string "content"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.datetime "history_started_at", null: false
@@ -208,13 +184,17 @@ ActiveRecord::Schema[7.1].define(version: 2024_11_19_000000) do
     t.index ["history_started_at"], name: "index_project_file_histories_on_history_started_at"
     t.index ["history_user_id"], name: "index_project_file_histories_on_history_user_id"
     t.index ["project_file_id"], name: "index_project_file_histories_on_project_file_id"
+    t.index ["project_id"], name: "index_project_file_histories_on_project_id"
     t.index ["snapshot_id"], name: "index_project_file_histories_on_snapshot_id"
   end
 
   create_table "project_files", force: :cascade do |t|
+    t.bigint "project_id"
     t.string "name", null: false
+    t.string "content"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.index ["project_id"], name: "index_project_files_on_project_id"
   end
 
   create_table "project_histories", force: :cascade do |t|
@@ -319,6 +299,52 @@ ActiveRecord::Schema[7.1].define(version: 2024_11_19_000000) do
     t.index ["live_at"], name: "index_silent_posts_on_live_at"
   end
 
+  create_table "test_article_histories", force: :cascade do |t|
+    t.integer "test_article_id", null: false
+    t.string "title"
+    t.integer "test_category_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.datetime "history_started_at", null: false
+    t.datetime "history_ended_at"
+    t.integer "history_user_id"
+    t.string "snapshot_id"
+    t.index ["history_ended_at"], name: "index_test_article_histories_on_history_ended_at"
+    t.index ["history_started_at"], name: "index_test_article_histories_on_history_started_at"
+    t.index ["snapshot_id"], name: "index_test_article_histories_on_snapshot_id"
+    t.index ["test_article_id"], name: "index_test_article_histories_on_test_article_id"
+  end
+
+  create_table "test_articles", force: :cascade do |t|
+    t.string "title"
+    t.integer "test_category_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  create_table "test_categories", force: :cascade do |t|
+    t.string "name"
+    t.integer "test_articles_count", default: 0
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  create_table "test_category_histories", force: :cascade do |t|
+    t.integer "test_category_id", null: false
+    t.string "name"
+    t.integer "test_articles_count", default: 0
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.datetime "history_started_at", null: false
+    t.datetime "history_ended_at"
+    t.integer "history_user_id"
+    t.string "snapshot_id"
+    t.index ["history_ended_at"], name: "index_test_category_histories_on_history_ended_at"
+    t.index ["history_started_at"], name: "index_test_category_histories_on_history_started_at"
+    t.index ["snapshot_id"], name: "index_test_category_histories_on_snapshot_id"
+    t.index ["test_category_id"], name: "index_test_category_histories_on_test_category_id"
+  end
+
   create_table "thing_with_compound_index_histories", force: :cascade do |t|
     t.integer "thing_with_compound_index_id", null: false
     t.string "key"

data/spec/historiographer_spec.rb

@@ -898,7 +898,7 @@ describe Historiographer do
 
     it 'establishes correct foreign key for history association' do
       col_history = column.histories.first
-      expect(col_history.class.history_foreign_key).to eq('column_id')
+      expect(col_history.class.history_foreign_key).to eq('easy_ml_column_id')
       expect(col_history).to be_a(EasyML::ColumnHistory)
     end
 
@@ -917,4 +917,158 @@ describe Historiographer do
       expect(column.histories.last.name).to eq('feature_2')
     end
   end
+
+  describe 'Non-historiographer associations' do
+    it 'preserves associations to models without history tracking' do
+      # Create an author and byline (byline has no history tracking)
+      author = Author.create!(full_name: 'Test Author', history_user_id: 1)
+      byline = Byline.create!(name: 'Test Byline', author: author)
+      
+      # The author should have the byline association
+      expect(author.bylines).to include(byline)
+      
+      # Get the author's history record
+      author_history = AuthorHistory.last
+      expect(author_history).not_to be_nil
+      
+      # The history model should still be able to access the byline (non-history model)
+      # This should work because Byline doesn't have history tracking
+      expect(author_history.bylines).to include(byline)
+      
+      # The association should point to the regular Byline model, not a history model
+      byline_association = AuthorHistory.reflect_on_association(:bylines)
+      expect(byline_association).not_to be_nil
+      expect(byline_association.klass).to eq(Byline)
+    end
+    
+    it 'handles mixed associations correctly' do
+      # Create an author with both history-tracked and non-history-tracked associations
+      author = Author.create!(full_name: 'Test Author', history_user_id: 1)
+      post = Post.create!(title: 'Test Post', body: 'Test body', author_id: author.id, history_user_id: 1)
+      comment = Comment.create!(body: 'Test comment', author_id: author.id, post_id: post.id, history_user_id: 1)
+      byline = Byline.create!(name: 'Test Byline', author: author)
+      
+      author_history = AuthorHistory.last
+      
+      # History-tracked associations should work correctly
+      # Note: For history associations, we create custom methods rather than Rails associations
+      # so they won't show up in reflect_on_all_associations
+      expect(author_history).to respond_to(:posts)
+      expect(author_history).to respond_to(:comments)
+      
+      # The methods should return history records filtered by snapshot_id
+      post_histories = PostHistory.where(author_id: author.id)
+      expect(post_histories).not_to be_empty
+      
+      # When accessing through the history model, it should filter by snapshot_id
+      author_history_posts = author_history.posts
+      expect(author_history_posts).to be_a(ActiveRecord::Relation)
+      
+      # Non-history-tracked associations should show up as regular Rails associations
+      bylines_association = AuthorHistory.reflect_on_association(:bylines)
+      expect(bylines_association).not_to be_nil
+      expect(bylines_association.klass).to eq(Byline)
+      
+      # And they should work correctly
+      expect(author_history.bylines).to include(byline)
+    end
+  end
+
+  describe 'Association options preservation' do
+    # Test with inline class definitions to ensure associations are defined properly
+    
+    before(:all) do
+      # Create test classes inline for this test
+      class TestAssocArticle < ActiveRecord::Base
+        self.table_name = 'test_articles'
+        include Historiographer
+        belongs_to :test_assoc_category, 
+                   class_name: 'TestAssocCategory',
+                   foreign_key: 'test_category_id',
+                   optional: true, 
+                   touch: true, 
+                   counter_cache: 'test_articles_count'
+      end
+      
+      class TestAssocCategory < ActiveRecord::Base
+        self.table_name = 'test_categories'
+        include Historiographer
+        has_many :test_assoc_articles, 
+                 class_name: 'TestAssocArticle',
+                 foreign_key: 'test_category_id',
+                 dependent: :restrict_with_error, 
+                 inverse_of: :test_assoc_category
+      end
+      
+      class TestAssocArticleHistory < ActiveRecord::Base
+        self.table_name = 'test_article_histories'
+        include Historiographer::History
+      end
+      
+      class TestAssocCategoryHistory < ActiveRecord::Base
+        self.table_name = 'test_category_histories'
+        include Historiographer::History
+      end
+      
+      # Manually trigger association setup since we're in a test environment
+      # Force = true because associations may have been partially set up before all models were loaded
+      TestAssocArticleHistory.setup_history_associations(true) if TestAssocArticleHistory.respond_to?(:setup_history_associations)
+      TestAssocCategoryHistory.setup_history_associations(true) if TestAssocCategoryHistory.respond_to?(:setup_history_associations)
+    end
+    
+    after(:all) do
+      Object.send(:remove_const, :TestAssocArticle) if Object.const_defined?(:TestAssocArticle)
+      Object.send(:remove_const, :TestAssocArticleHistory) if Object.const_defined?(:TestAssocArticleHistory)
+      Object.send(:remove_const, :TestAssocCategory) if Object.const_defined?(:TestAssocCategory)
+      Object.send(:remove_const, :TestAssocCategoryHistory) if Object.const_defined?(:TestAssocCategoryHistory)
+    end
+    
+    it 'preserves optional setting for belongs_to associations' do
+      # Check the original TestAssocArticle belongs_to association
+      article_association = TestAssocArticle.reflect_on_association(:test_assoc_category)
+      expect(article_association).not_to be_nil
+      expect(article_association.options[:optional]).to eq(true)
+      
+      # The TestAssocArticleHistory should have the same options
+      article_history_association = TestAssocArticleHistory.reflect_on_association(:test_assoc_category)
+      expect(article_history_association).not_to be_nil
+      expect(article_history_association.options[:optional]).to eq(true)
+    end
+    
+    it 'preserves touch and counter_cache options for belongs_to associations' do
+      article_association = TestAssocArticle.reflect_on_association(:test_assoc_category)
+      expect(article_association.options[:touch]).to eq(true)
+      expect(article_association.options[:counter_cache]).to eq('test_articles_count')
+      
+      article_history_association = TestAssocArticleHistory.reflect_on_association(:test_assoc_category)
+      expect(article_history_association).not_to be_nil
+      expect(article_history_association.options[:touch]).to eq(true)
+      expect(article_history_association.options[:counter_cache]).to eq('test_articles_count')
+    end
+    
+    it 'preserves dependent and inverse_of options for has_many associations' do
+      category_articles_association = TestAssocCategory.reflect_on_association(:test_assoc_articles)
+      expect(category_articles_association.options[:dependent]).to eq(:restrict_with_error)
+      expect(category_articles_association.options[:inverse_of]).to eq(:test_assoc_category)
+      
+      # Note: has_many associations might not be copied to history models in the same way
+      # This is expected behavior since history models typically don't need the same associations
+    end
+    
+    it 'allows creating history records with nil optional associations' do
+      # Create an article without a category (should be valid since category is optional)
+      article = TestAssocArticle.create!(title: 'Test Article without category', history_user_id: 1)
+      expect(article.test_category_id).to be_nil
+      
+      # The history record should also be created successfully
+      history = TestAssocArticleHistory.last
+      expect(history).not_to be_nil
+      expect(history.test_category_id).to be_nil
+      expect(history.test_article_id).to eq(article.id)
+
+      # Creating snapshots should work even with nil associations
+      article.snapshot
+      expect { article.snapshot }.to_not raise_error
+    end
+  end
 end

data/spec/models/author.rb

@@ -2,4 +2,5 @@ class Author < ActiveRecord::Base
   include Historiographer
   has_many :comments
   has_many :posts
+  has_many :bylines  # This model doesn't have history tracking
 end

data/spec/models/byline.rb

@@ -0,0 +1,4 @@
+class Byline < ActiveRecord::Base
+  # Note: This model does NOT include Historiographer
+  belongs_to :author
+end

data/spec/models/post.rb

@@ -5,6 +5,8 @@ class Post < ApplicationRecord
   acts_as_paranoid
   has_many :comments
 
+  attr_accessor :type
+  
   validates :type, inclusion: { in: ['Post', 'PrivatePost', nil] }
   before_validation :set_defaults
   after_find :set_comment_count

data/spec/models/test_article.rb

@@ -0,0 +1,4 @@
+class TestArticle < ActiveRecord::Base
+  include Historiographer
+  # Association will be defined later to avoid circular dependency
+end

data/spec/models/test_article_history.rb

@@ -0,0 +1,3 @@
+class TestArticleHistory < ActiveRecord::Base
+  include Historiographer::History
+end

data/spec/models/test_category.rb

@@ -0,0 +1,4 @@
+class TestCategory < ActiveRecord::Base
+  include Historiographer
+  # Association will be defined later to avoid circular dependency
+end

data/spec/models/test_category_history.rb

@@ -0,0 +1,3 @@
+class TestCategoryHistory < ActiveRecord::Base
+  include Historiographer::History
+end

data/spec/spec_helper.rb

@@ -45,10 +45,9 @@ module Rails
   end
 
   def self.application
-    OpenStruct.new(
+    @application ||= OpenStruct.new(
       config: OpenStruct.new(
-        eager_load_namespaces: [],
-        autoloader: loader
+        eager_load_namespaces: []
       )
     )
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: historiographer
 version: !ruby/object:Gem::Version
-  version: 4.4.1
+  version: 4.4.2
 platform: ruby
 authors:
 - brettshollenberger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-21 00:00:00.000000000 Z
+date: 2025-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -262,6 +262,10 @@ files:
 - spec/db/migrate/20241119000000_create_datasets.rb
 - spec/db/migrate/2025082100000_create_projects.rb
 - spec/db/migrate/2025082100001_create_project_files.rb
+- spec/db/migrate/20250823000000_create_easy_ml_columns.rb
+- spec/db/migrate/20250824000000_create_test_articles.rb
+- spec/db/migrate/20250824000001_create_test_categories.rb
+- spec/db/migrate/20250825000000_create_bylines.rb
 - spec/db/schema.rb
 - spec/factories/post.rb
 - spec/foreign_key_spec.rb
@@ -269,6 +273,7 @@ files:
 - spec/models/application_record.rb
 - spec/models/author.rb
 - spec/models/author_history.rb
+- spec/models/byline.rb
 - spec/models/comment.rb
 - spec/models/comment_history.rb
 - spec/models/easy_ml/column.rb
@@ -283,6 +288,10 @@ files:
 - spec/models/safe_post_history.rb
 - spec/models/silent_post.rb
 - spec/models/silent_post_history.rb
+- spec/models/test_article.rb
+- spec/models/test_article_history.rb
+- spec/models/test_category.rb
+- spec/models/test_category_history.rb
 - spec/models/thing_with_compound_index.rb
 - spec/models/thing_with_compound_index_history.rb
 - spec/models/thing_without_history.rb