historiographer 4.4.3 → 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/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/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.3
+  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
@@ -219,13 +219,8 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- ".document"
-- ".rspec"
-- ".ruby-version"
-- ".standalone_migrations"
 - DEVELOPMENT.md
 - Gemfile
-- Gemfile.lock
 - Guardfile
 - LICENSE.txt
 - README.md
@@ -236,10 +231,6 @@ files:
 - bin/test
 - bin/test-all
 - bin/test-rails
-- historiographer-4.1.12.gem
-- historiographer-4.1.13.gem
-- historiographer-4.1.14.gem
-- historiographer-4.3.0.gem
 - historiographer.gemspec
 - init.rb
 - instructions/implementation.md
@@ -282,7 +273,17 @@ files:
 - 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/historiographer_spec.rb
 - spec/integration/historiographer_safe_integration_spec.rb
@@ -294,10 +295,13 @@ files:
 - 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
@@ -312,6 +316,10 @@ 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
@@ -324,8 +332,13 @@ files:
 - 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

data/Gemfile.lock

@@ -1,355 +0,0 @@
-GIT
-  remote: https://github.com/technicalpickles/jeweler
-  revision: 2ab86309fc2494ba2a4e9c86c514742cd4f681c2
-  branch: master
-  specs:
-    jeweler (2.3.9)
-      builder
-      bundler
-      git (>= 1.2.5)
-      github_api (~> 0.16.0)
-      highline (>= 1.6.15)
-      nokogiri (>= 1.5.10)
-      psych
-      rake
-      rdoc
-      semver2
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (7.1.5)
-      actionpack (= 7.1.5)
-      activesupport (= 7.1.5)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-      zeitwerk (~> 2.6)
-    actionmailbox (7.1.5)
-      actionpack (= 7.1.5)
-      activejob (= 7.1.5)
-      activerecord (= 7.1.5)
-      activestorage (= 7.1.5)
-      activesupport (= 7.1.5)
-      mail (>= 2.7.1)
-      net-imap
-      net-pop
-      net-smtp
-    actionmailer (7.1.5)
-      actionpack (= 7.1.5)
-      actionview (= 7.1.5)
-      activejob (= 7.1.5)
-      activesupport (= 7.1.5)
-      mail (~> 2.5, >= 2.5.4)
-      net-imap
-      net-pop
-      net-smtp
-      rails-dom-testing (~> 2.2)
-    actionpack (7.1.5)
-      actionview (= 7.1.5)
-      activesupport (= 7.1.5)
-      nokogiri (>= 1.8.5)
-      racc
-      rack (>= 2.2.4)
-      rack-session (>= 1.0.1)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.5)
-      actionpack (= 7.1.5)
-      activerecord (= 7.1.5)
-      activestorage (= 7.1.5)
-      activesupport (= 7.1.5)
-      globalid (>= 0.6.0)
-      nokogiri (>= 1.8.5)
-    actionview (7.1.5)
-      activesupport (= 7.1.5)
-      builder (~> 3.1)
-      erubi (~> 1.11)
-      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.6)
-    activejob (7.1.5)
-      activesupport (= 7.1.5)
-      globalid (>= 0.3.6)
-    activemodel (7.1.5)
-      activesupport (= 7.1.5)
-    activerecord (7.1.5)
-      activemodel (= 7.1.5)
-      activesupport (= 7.1.5)
-      timeout (>= 0.4.0)
-    activerecord-import (1.8.1)
-      activerecord (>= 4.2)
-    activestorage (7.1.5)
-      actionpack (= 7.1.5)
-      activejob (= 7.1.5)
-      activerecord (= 7.1.5)
-      activesupport (= 7.1.5)
-      marcel (~> 1.0)
-    activesupport (7.1.5)
-      base64
-      benchmark (>= 0.3)
-      bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      connection_pool (>= 2.2.5)
-      drb
-      i18n (>= 1.6, < 2)
-      logger (>= 1.4.2)
-      minitest (>= 5.1)
-      mutex_m
-      securerandom (>= 0.3)
-      tzinfo (~> 2.0)
-    addressable (2.4.0)
-    base64 (0.2.0)
-    benchmark (0.4.0)
-    bigdecimal (3.1.8)
-    builder (3.3.0)
-    coderay (1.1.3)
-    combustion (1.5.0)
-      activesupport (>= 3.0.0)
-      railties (>= 3.0.0)
-      thor (>= 0.14.6)
-    concurrent-ruby (1.3.4)
-    connection_pool (2.4.1)
-    crass (1.0.6)
-    database_cleaner (2.1.0)
-      database_cleaner-active_record (>= 2, < 3)
-    database_cleaner-active_record (2.2.0)
-      activerecord (>= 5.a)
-      database_cleaner-core (~> 2.0.0)
-    database_cleaner-core (2.0.1)
-    date (3.4.0)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.5.1)
-    docile (1.4.1)
-    drb (2.2.1)
-    erubi (1.13.0)
-    factory_bot (6.5.0)
-      activesupport (>= 5.0.0)
-    factory_bot_rails (6.4.4)
-      factory_bot (~> 6.5)
-      railties (>= 5.0.0)
-    faraday (0.9.2)
-      multipart-post (>= 1.2, < 3)
-    ffi (1.17.0-arm64-darwin)
-    ffi (1.17.0-x86_64-darwin)
-    formatador (1.1.0)
-    git (1.11.0)
-      rchardet (~> 1.8)
-    github_api (0.16.0)
-      addressable (~> 2.4.0)
-      descendants_tracker (~> 0.0.4)
-      faraday (~> 0.8, < 0.10)
-      hashie (>= 3.4)
-      mime-types (>= 1.16, < 3.0)
-      oauth2 (~> 1.0)
-    globalid (1.2.1)
-      activesupport (>= 6.1)
-    guard (2.19.0)
-      formatador (>= 0.2.4)
-      listen (>= 2.7, < 4.0)
-      lumberjack (>= 1.0.12, < 2.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      pry (>= 0.13.0)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-compat (1.2.1)
-    guard-rspec (4.7.3)
-      guard (~> 2.1)
-      guard-compat (~> 1.1)
-      rspec (>= 2.99.0, < 4.0)
-    hashie (5.0.0)
-    highline (3.1.1)
-      reline
-    i18n (1.14.6)
-      concurrent-ruby (~> 1.0)
-    io-console (0.7.2)
-    irb (1.12.0)
-      rdoc
-      reline (>= 0.4.2)
-    json (1.8.6)
-    jwt (2.9.3)
-      base64
-    listen (3.9.0)
-      rb-fsevent (~> 0.10, >= 0.10.3)
-      rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.1)
-    loofah (2.23.1)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.12.0)
-    lumberjack (1.2.10)
-    mail (2.8.1)
-      mini_mime (>= 0.1.1)
-      net-imap
-      net-pop
-      net-smtp
-    marcel (1.0.4)
-    method_source (1.1.0)
-    mime-types (2.99.3)
-    mini_mime (1.1.5)
-    minitest (5.25.1)
-    multi_json (1.15.0)
-    multi_xml (0.6.0)
-    multipart-post (2.4.1)
-    mutex_m (0.2.0)
-    mysql2 (0.5.0)
-    nenv (0.3.0)
-    net-imap (0.4.18)
-      date
-      net-protocol
-    net-pop (0.1.2)
-      net-protocol
-    net-protocol (0.2.2)
-      timeout
-    net-smtp (0.5.0)
-      net-protocol
-    nio4r (2.7.4)
-    nokogiri (1.16.7-arm64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.16.7-x86_64-darwin)
-      racc (~> 1.4)
-    notiffany (0.1.3)
-      nenv (~> 0.1)
-      shellany (~> 0.0)
-    oauth2 (1.4.8)
-      faraday (>= 0.8, < 3.0)
-      jwt (>= 1.0, < 3.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
-    paranoia (3.0.0)
-      activerecord (>= 6, < 8.1)
-    pg (1.5.9)
-    pry (0.14.2)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    psych (5.2.0)
-      stringio
-    racc (1.8.1)
-    rack (2.2.10)
-    rack-session (1.0.2)
-      rack (< 3)
-    rack-test (2.1.0)
-      rack (>= 1.3)
-    rackup (1.0.1)
-      rack (< 3)
-      webrick
-    rails (7.1.5)
-      actioncable (= 7.1.5)
-      actionmailbox (= 7.1.5)
-      actionmailer (= 7.1.5)
-      actionpack (= 7.1.5)
-      actiontext (= 7.1.5)
-      actionview (= 7.1.5)
-      activejob (= 7.1.5)
-      activemodel (= 7.1.5)
-      activerecord (= 7.1.5)
-      activestorage (= 7.1.5)
-      activesupport (= 7.1.5)
-      bundler (>= 1.15.0)
-      railties (= 7.1.5)
-    rails-dom-testing (2.2.0)
-      activesupport (>= 5.0.0)
-      minitest
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
-      loofah (~> 2.21)
-      nokogiri (~> 1.14)
-    railties (7.1.5)
-      actionpack (= 7.1.5)
-      activesupport (= 7.1.5)
-      irb
-      rackup (>= 1.0.0)
-      rake (>= 12.2)
-      thor (~> 1.0, >= 1.2.2)
-      zeitwerk (~> 2.6)
-    rake (13.2.1)
-    rb-fsevent (0.11.2)
-    rb-inotify (0.11.1)
-      ffi (~> 1.0)
-    rchardet (1.8.0)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    reline (0.5.11)
-      io-console (~> 0.5)
-    rollbar (3.6.0)
-    rspec (3.13.0)
-      rspec-core (~> 3.13.0)
-      rspec-expectations (~> 3.13.0)
-      rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.2)
-      rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.3)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-rails (7.1.1)
-      actionpack (>= 7.0)
-      activesupport (>= 7.0)
-      railties (>= 7.0)
-      rspec-core (~> 3.13)
-      rspec-expectations (~> 3.13)
-      rspec-mocks (~> 3.13)
-      rspec-support (~> 3.13)
-    rspec-support (3.13.1)
-    securerandom (0.3.1)
-    semver2 (3.4.2)
-    shellany (0.0.1)
-    simplecov (0.22.0)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-      simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.13.1)
-    simplecov_json_formatter (0.1.4)
-    standalone_migrations (7.2.0)
-      activerecord (>= 6.0.0, < 8.0)
-      nokogiri (~> 1.14)
-      railties (>= 6.0.0, < 8.0)
-      rake (>= 10.0)
-    stringio (3.1.2)
-    thor (1.3.2)
-    thread_safe (0.3.6)
-    timecop (0.9.10)
-    timeout (0.4.2)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
-    webrick (1.9.0)
-    websocket-driver (0.7.6)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-    zeitwerk (2.6.18)
-
-PLATFORMS
-  arm64-darwin
-  x86_64-darwin
-
-DEPENDENCIES
-  activerecord (>= 6)
-  activerecord-import
-  activesupport
-  combustion (~> 1.3)
-  database_cleaner
-  factory_bot_rails
-  guard
-  guard-rspec
-  jeweler!
-  mysql2 (= 0.5)
-  paranoia
-  pg
-  pry
-  rails (>= 6)
-  rdoc (~> 3.12)
-  rollbar
-  rspec
-  rspec-rails
-  simplecov
-  standalone_migrations
-  timecop
-
-RUBY VERSION
-   ruby 3.0.2p107
-
-BUNDLED WITH
-   2.5.23