historiographer 4.4.2 → 4.4.4

data/spec/models/code_file.rb

@@ -0,0 +1,16 @@
+class CodeFile < ApplicationRecord
+  # This is a read-only model backed by a database view
+  # The view merges template_files and website_files
+  
+  self.table_name = 'code_files'
+  self.primary_key = nil # View doesn't have a primary key
+  
+  belongs_to :website
+  
+  # Default ordering since the view has no primary key
+  default_scope { order(created_at: :desc, path: :asc) }
+  
+  def readonly?
+    true
+  end
+end

data/spec/models/template.rb

@@ -0,0 +1,6 @@
+class Template < ApplicationRecord
+  include Historiographer
+
+  has_many :template_files, dependent: :destroy
+  has_many :websites
+end

data/spec/models/template_file.rb

@@ -0,0 +1,5 @@
+class TemplateFile < ApplicationRecord
+  include Historiographer
+  
+  belongs_to :template
+end

data/spec/models/template_file_history.rb

@@ -0,0 +1,3 @@
+class TemplateFileHistory < ApplicationRecord
+  include Historiographer::History
+end

data/spec/models/template_history.rb

@@ -0,0 +1,3 @@
+class TemplateHistory < ApplicationRecord
+  include Historiographer::History
+end

data/spec/models/test_user.rb

@@ -0,0 +1,4 @@
+class TestUser < ApplicationRecord
+  include Historiographer
+  has_many :test_websites, foreign_key: 'user_id'
+end

data/spec/models/test_user_history.rb

@@ -0,0 +1,3 @@
+class TestUserHistory < ApplicationRecord
+  include Historiographer::History
+end

data/spec/models/test_website.rb

@@ -0,0 +1,4 @@
+class TestWebsite < ApplicationRecord
+  include Historiographer
+  belongs_to :user, class_name: 'TestUser', foreign_key: 'user_id', optional: true
+end

data/spec/models/test_website_history.rb

@@ -0,0 +1,3 @@
+class TestWebsiteHistory < ApplicationRecord
+  include Historiographer::History
+end

data/spec/models/website.rb

@@ -0,0 +1,7 @@
+class Website < ApplicationRecord
+  include Historiographer
+  
+  belongs_to :template, optional: true
+  has_many :website_files, dependent: :destroy
+  has_many :code_files
+end

data/spec/models/website_file.rb

@@ -0,0 +1,5 @@
+class WebsiteFile < ApplicationRecord
+  include Historiographer
+  
+  belongs_to :website
+end

data/spec/models/website_file_history.rb

@@ -0,0 +1,3 @@
+class WebsiteFileHistory < ApplicationRecord
+  include Historiographer::History
+end

data/spec/models/website_history.rb

@@ -0,0 +1,3 @@
+class WebsiteHistory < ApplicationRecord
+  include Historiographer::History
+end

data/spec/rails_integration/historiographer_rails_integration_spec.rb

@@ -0,0 +1,106 @@
+# frozen_string_literal: true
+
+require 'combustion_helper'
+
+RSpec.describe 'Historiographer Rails Integration', type: :model do
+  describe 'when WebsiteHistory is loaded before Website (Rails autoloading scenario)' do
+    it 'handles the load order gracefully' do
+      expect(defined?(WebsiteHistory)).to be_truthy
+      expect(WebsiteHistory.ancestors).to include(Historiographer::History)
+      
+      expect(defined?(Website)).to be_truthy
+      expect(Website.ancestors).to include(Historiographer::Safe)
+      
+      expect(WebsiteHistory.foreign_class).to eq(Website)
+      
+      expect(WebsiteHistory).to respond_to(:setup_history_associations)
+      expect(WebsiteHistory).to respond_to(:original_class)
+      
+      expect { WebsiteHistory.setup_history_associations }.not_to raise_error
+    end
+    
+    it 'allows creating and querying history records' do
+      user = User.create!(name: 'Test User')
+      
+      website = Website.create!(
+        name: 'Production Site',
+        project_id: 1,
+        user_id: user.id,
+        history_user_id: user.id
+      )
+      
+      expect(website.histories.count).to eq(1)
+      
+      history = website.histories.first
+      expect(history).to be_a(WebsiteHistory)
+      expect(history.website_id).to eq(website.id)
+      expect(history.name).to eq('Production Site')
+      expect(history.history_user_id).to eq(user.id)
+      expect(history.history_started_at).to be_present
+      expect(history.history_ended_at).to be_nil
+      
+      website.update!(name: 'Updated Site', history_user_id: user.id)
+      
+      expect(website.histories.count).to eq(2)
+      
+      old_history = website.histories.where.not(history_ended_at: nil).first
+      expect(old_history.name).to eq('Production Site')
+      expect(old_history.history_ended_at).to be_present
+      
+      current_history = website.histories.current.first
+      expect(current_history.name).to eq('Updated Site')
+      expect(current_history.history_ended_at).to be_nil
+    end
+    
+    it 'supports associations on history models' do
+      website = Website.create!(name: 'Deploy Test Site', history_user_id: 1)
+      history = website.histories.first
+      
+      deploy = Deploy.create!(
+        website_history_id: history.id,
+        status: 'pending'
+      )
+      
+      expect(history.deploys).to include(deploy)
+      expect(deploy.website_history).to eq(history)
+      
+      expect(history.deploys.where(status: 'pending').count).to eq(1)
+    end
+    
+    it 'handles Safe mode without requiring history_user_id after initial creation' do
+      website = Website.create!(name: 'Safe Mode Test', history_user_id: 1)
+      
+      expect { website.update!(name: 'Updated Safe Mode Test') }.not_to raise_error
+      
+      expect(website.histories.count).to eq(2)
+      
+      current_history = website.histories.current.first
+      expect(current_history.name).to eq('Updated Safe Mode Test')
+      expect(current_history.history_user_id).to eq(1)
+      
+      website.update!(name: 'Another Update', history_user_id: nil)
+      expect(website.histories.count).to eq(3)
+      newest_history = website.histories.current.first
+      expect(newest_history.history_user_id).to be_nil
+    end
+    
+    it 'properly sets up delegated methods on history instances' do
+      website = Website.create!(name: 'Method Delegation Test', history_user_id: 1)
+      history = website.histories.first
+      
+      expect(history).to respond_to(:name)
+      
+      expect(history.name).to eq('Method Delegation Test')
+    end
+  end
+  
+  describe 'Rails after_initialize hook' do
+    it 'sets up associations after Rails initialization' do
+      expect(WebsiteHistory.reflect_on_association(:website)).to be_present
+      expect(WebsiteHistory.reflect_on_association(:deploys)).to be_present
+      
+      website_association = WebsiteHistory.reflect_on_association(:website)
+      expect(website_association.class_name).to eq('Website')
+    end
+  end
+end

data/spec/view_backed_model_spec.rb

@@ -0,0 +1,166 @@
+require 'spec_helper'
+
+# Load model classes
+require_relative 'models/template'
+require_relative 'models/template_history'
+require_relative 'models/website'
+require_relative 'models/website_history'
+require_relative 'models/template_file'
+require_relative 'models/template_file_history'
+require_relative 'models/website_file'
+require_relative 'models/website_file_history'
+require_relative 'models/code_file'
+
+describe 'View-backed model snapshotting' do
+  describe 'Website with code_files association (view-backed)' do
+    let(:template) { 
+      Template.create!(
+        name: 'Base Template', 
+        description: 'A base template',
+        history_user_id: 1
+      ) 
+    }
+    let(:website) { 
+      Website.create!(
+        domain: 'example.com', 
+        template: template,
+        history_user_id: 1
+      ) 
+    }
+    
+    before do
+      # Create template files
+      @template_file1 = TemplateFile.create!(
+        template: template,
+        path: 'index.html',
+        content: '<h1>Template Index</h1>',
+        shasum: 'abc123',
+        history_user_id: 1
+      )
+      
+      @template_file2 = TemplateFile.create!(
+        template: template,
+        path: 'about.html',
+        content: '<h1>Template About</h1>',
+        shasum: 'def456',
+        history_user_id: 1
+      )
+      
+      # Create website file that overrides one template file
+      @website_file = WebsiteFile.create!(
+        website: website,
+        path: 'index.html',
+        content: '<h1>Custom Index</h1>',
+        shasum: 'ghi789',
+        history_user_id: 1
+      )
+    end
+    
+    it 'has code_files that are backed by a view' do
+      # Verify that code_files exist
+      expect(website.code_files.count).to eq(2)
+      
+      # Verify that CodeFile has no primary key
+      expect(CodeFile.primary_key).to be_nil
+      
+      # Verify that CodeFile instances are read-only
+      code_file = website.code_files.first
+      expect(code_file.readonly?).to be true
+    end
+    
+    it 'returns correct merged data from the view' do
+      code_files = website.code_files.order(:path)
+      
+      # Should have about.html from template and index.html from website override
+      expect(code_files.map(&:path)).to match_array(['about.html', 'index.html'])
+      
+      index_file = code_files.find { |cf| cf.path == 'index.html' }
+      about_file = code_files.find { |cf| cf.path == 'about.html' }
+      
+      # index.html should come from website_files (override)
+      expect(index_file.content).to eq('<h1>Custom Index</h1>')
+      expect(index_file.source_type).to eq('WebsiteFile')
+      expect(index_file.source_id).to eq(@website_file.id)
+      
+      # about.html should come from template_files
+      expect(about_file.content).to eq('<h1>Template About</h1>')
+      expect(about_file.source_type).to eq('TemplateFile')
+      expect(about_file.source_id).to eq(@template_file2.id)
+    end
+    
+    context 'when snapshotting a model with view-backed associations' do
+      it 'creates snapshot for the main model but handles view-backed associations gracefully' do
+        # Create a snapshot of the website
+        expect { website.snapshot }.not_to raise_error
+        
+        # Verify that website history was created
+        expect(WebsiteHistory.where(website_id: website.id)).not_to be_empty
+        website_snapshot = WebsiteHistory.where(website_id: website.id).last
+        expect(website_snapshot.snapshot_id).not_to be_nil
+        
+        # Verify that associated models with primary keys have histories
+        expect(TemplateHistory.where(template_id: template.id)).not_to be_empty
+        expect(WebsiteFileHistory.where(website_file_id: @website_file.id)).not_to be_empty
+        expect(TemplateFileHistory.where(template_file_id: @template_file1.id)).not_to be_empty
+      end
+      
+      it 'does not attempt to create history for view-backed models' do
+        # Snapshot should succeed without trying to snapshot code_files
+        expect { website.snapshot }.not_to raise_error
+        
+        # Verify snapshot was created
+        snapshot = WebsiteHistory.where(website_id: website.id).where.not(snapshot_id: nil).last
+        expect(snapshot).not_to be_nil
+        
+        # There should be no CodeFileHistory table/model
+        expect { CodeFileHistory }.to raise_error(NameError)
+      end
+      
+      it 'correctly identifies models without primary keys' do
+        # CodeFile should not have a primary key
+        expect(CodeFile.primary_key).to be_nil
+        
+        # Regular models should have primary keys
+        expect(Website.primary_key).to eq('id')
+        expect(WebsiteFile.primary_key).to eq('id')
+        expect(TemplateFile.primary_key).to eq('id')
+      end
+      
+      it 'allows snapshot to complete even with view associations present' do
+        # Add more associations to make the test more complex
+        website2 = Website.create!(domain: 'example2.com', template: template, history_user_id: 1)
+        WebsiteFile.create!(
+          website: website2,
+          path: 'custom.html',
+          content: '<h1>Custom Page</h1>',
+          shasum: 'xyz999',
+          history_user_id: 1
+        )
+        
+        # Both websites should snapshot successfully
+        expect { website.snapshot }.not_to raise_error
+        expect { website2.snapshot }.not_to raise_error
+        
+        # Verify both have history records
+        expect(WebsiteHistory.where(website_id: website.id)).not_to be_empty
+        expect(WebsiteHistory.where(website_id: website2.id)).not_to be_empty
+      end
+    end
+  end
+  
+  describe 'Error handling for view-backed models' do
+    it 'should log a warning when attempting to snapshot a model without a primary key' do
+      # We'll need to patch the snapshot method to detect and skip models without primary keys
+      # This test verifies the expected behavior once the fix is implemented
+      
+      website = Website.create!(domain: 'test.com', history_user_id: 1)
+      
+      # Expect snapshot to complete successfully
+      expect { website.snapshot }.not_to raise_error
+      
+      # The view-backed association should not have created any history
+      # (since there's no history table for views)
+      expect(WebsiteHistory.where(website_id: website.id).count).to eq(1)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: historiographer
 version: !ruby/object:Gem::Version
-  version: 4.4.2
+  version: 4.4.4
 platform: ruby
 authors:
 - brettshollenberger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-22 00:00:00.000000000 Z
+date: 2025-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -208,27 +208,29 @@ dependencies:
         version: '0'
 description: Creates separate tables for each history table
 email: brett.shollenberger@gmail.com
-executables: []
+executables:
+- console
+- setup
+- test
+- test-all
+- test-rails
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- ".document"
-- ".rspec"
-- ".ruby-version"
-- ".standalone_migrations"
+- DEVELOPMENT.md
 - Gemfile
-- Gemfile.lock
 - Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - VERSION
-- historiographer-4.1.12.gem
-- historiographer-4.1.13.gem
-- historiographer-4.1.14.gem
-- historiographer-4.3.0.gem
+- bin/console
+- bin/setup
+- bin/test
+- bin/test-all
+- bin/test-rails
 - historiographer.gemspec
 - init.rb
 - instructions/implementation.md
@@ -244,6 +246,7 @@ files:
 - lib/historiographer/safe.rb
 - lib/historiographer/silent.rb
 - lib/historiographer/version.rb
+- spec/combustion_helper.rb
 - spec/db/database.yml
 - spec/db/migrate/20161121212228_create_posts.rb
 - spec/db/migrate/20161121212229_create_post_histories.rb
@@ -266,14 +269,39 @@ files:
 - 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/migrate/20250826000000_create_test_users.rb
+- spec/db/migrate/20250826000001_create_test_user_histories.rb
+- spec/db/migrate/20250826000002_create_test_websites.rb
+- spec/db/migrate/20250826000003_create_test_website_histories.rb
+- spec/db/migrate/20250827000000_create_templates.rb
+- spec/db/migrate/20250827000001_create_template_histories.rb
+- spec/db/migrate/20250827000002_create_websites.rb
+- spec/db/migrate/20250827000003_create_website_histories.rb
+- spec/db/migrate/20250827000004_create_template_files.rb
+- spec/db/migrate/20250827000005_create_template_file_histories.rb
+- spec/db/migrate/20250827000006_create_website_files.rb
+- spec/db/migrate/20250827000007_create_website_file_histories.rb
+- spec/db/migrate/20250827000008_create_code_files_view.rb
 - spec/db/schema.rb
+- spec/examples.txt
 - spec/factories/post.rb
-- spec/foreign_key_spec.rb
 - spec/historiographer_spec.rb
+- spec/integration/historiographer_safe_integration_spec.rb
+- spec/internal/app/models/application_record.rb
+- spec/internal/app/models/deploy.rb
+- spec/internal/app/models/user.rb
+- spec/internal/app/models/website.rb
+- spec/internal/app/models/website_history.rb
+- spec/internal/config/database.yml
+- spec/internal/config/routes.rb
+- spec/internal/db/schema.rb
+- spec/internal/log/development.log
+- spec/internal/log/test.log
 - spec/models/application_record.rb
 - spec/models/author.rb
 - spec/models/author_history.rb
 - spec/models/byline.rb
+- spec/models/code_file.rb
 - spec/models/comment.rb
 - spec/models/comment_history.rb
 - spec/models/easy_ml/column.rb
@@ -288,15 +316,29 @@ files:
 - spec/models/safe_post_history.rb
 - spec/models/silent_post.rb
 - spec/models/silent_post_history.rb
+- spec/models/template.rb
+- spec/models/template_file.rb
+- spec/models/template_file_history.rb
+- spec/models/template_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/test_user.rb
+- spec/models/test_user_history.rb
+- spec/models/test_website.rb
+- spec/models/test_website_history.rb
 - spec/models/thing_with_compound_index.rb
 - spec/models/thing_with_compound_index_history.rb
 - spec/models/thing_without_history.rb
 - spec/models/user.rb
+- spec/models/website.rb
+- spec/models/website_file.rb
+- spec/models/website_file_history.rb
+- spec/models/website_history.rb
+- spec/rails_integration/historiographer_rails_integration_spec.rb
 - spec/spec_helper.rb
+- spec/view_backed_model_spec.rb
 homepage: http://github.com/brettshollenberger/historiographer
 licenses:
 - MIT

data/.document

@@ -1,5 +0,0 @@
-lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt

data/.rspec

@@ -1 +0,0 @@
---color

data/.ruby-version

@@ -1 +0,0 @@
-3.0.2

data/.standalone_migrations

@@ -1,6 +0,0 @@
-db:
-  seeds: spec/db/seeds.rb
-  migrate: spec/db/migrate
-  schema: spec/db/schema.rb
-config:
-  database: spec/db/database.yml