trusty-cms 7.1.0 → 7.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c78022a95d3821f76e6214fa192586ec8a831de449e9ae5baeeb5ef96b46a127
-  data.tar.gz: 61a9accc9830dfeefb30aafee4ef3ec3aed382d28f52f50184cb63031a7d60f7
+  metadata.gz: 1a7f52b7348e786e89e3229147fa20d111295ed8fb1c6b0a91a9ee9e1181efae
+  data.tar.gz: d8b45f266e546159fb7ab00a50f1dbc0ad8f0da5ae745a667da68186c015a984
 SHA512:
-  metadata.gz: 118506e5536ae11f90193be989baa2df5275712e0cda1c9d5f685838548c76035ab2f5dddd007b6e1b49a1a8b1d95aa59598c2db5afaab495c481729123aa9b7
-  data.tar.gz: 6c97409875cbbb4bb0b9dc8a91335a7d853fddc8b3762a64e8b90297e646c180444eb0637edfc3d26df66cd20f7eb032faa094944c24b1edad5112261db62b76
+  metadata.gz: 4818827adbde56816225a34298bc7a54115b3d1e746b7b03d2fa70a87d89b65d4fcf1b7a52a7317785cecf0cac69d933505bae64c075ee67f77a16ffe1d7e125
+  data.tar.gz: 32ed335cc892c7ac42a85a200f18f5da7c6ab7d763349ef1cb18abcd8dc1d91bce83df25662a0eecad02186ba396da3bd5741103f8878f70970c311ac405de1c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (7.1.0)
+    trusty-cms (7.1.1)
       RedCloth (= 4.3.3)
       activestorage-validator
       acts_as_list (>= 0.9.5, < 1.3.0)

data/app/assets/stylesheets/admin/assets.scss

@@ -1,3 +1,8 @@
+img.preview {
+  max-width: 300px;
+  max-height: 300px;
+}
+
 .ck-content .asset-image-tag {
   background-color: #dcdcdc;
   display: inline-flex;

data/app/controllers/admin/assets_controller.rb

@@ -1,7 +1,6 @@
 class Admin::AssetsController < Admin::ResourceController
   paginate_models(per_page: 50)
   COMPRESS_FILE_TYPE = ['image/jpeg', 'image/png', 'image/gif', 'image/svg+xml'].freeze
-  APPROVED_CONTENT_TYPES = Asset::APPROVED_CONTENT_TYPES
 
   def index
     assets = Asset.order('created_at DESC')
@@ -52,6 +51,7 @@ class Admin::AssetsController < Admin::ResourceController
     @page_attachments = []
     uploads = Array(asset_params.dig('asset', 'asset')).reject(&:blank?)
 
+
     uploads.each do |uploaded_asset|
       result = process_uploaded_asset(uploaded_asset)
 
@@ -64,11 +64,15 @@ class Admin::AssetsController < Admin::ResourceController
         @assets << @asset
       else
         flash[result.fetch(:flash_type, :error)] = result[:error]
+        @errors = result[:error]
       end
     end
 
     if asset_params[:for_attachment]
       render partial: 'admin/page_attachments/attachment', collection: @page_attachments
+    elsif @errors.present?
+      flash[:error] = @errors
+      redirect_to new_admin_asset_path
     else
       response_for :create
     end
@@ -83,7 +87,7 @@ class Admin::AssetsController < Admin::ResourceController
       return failure_response('Please only upload assets that have a valid extension in the name.', :unprocessable_entity, :notice)
     end
 
-    unless APPROVED_CONTENT_TYPES.include?(uploaded_asset.content_type)
+    unless Asset.approved_content_types.include?(uploaded_asset.content_type)
       return failure_response('Unsupported file type.', :unsupported_media_type, :error)
     end
 

data/app/models/asset.rb

@@ -1,8 +1,6 @@
 require 'trusty_cms/geometry'
 
 class Asset < ActiveRecord::Base
-  APPROVED_CONTENT_TYPES = %w[application/zip image/jpg image/jpeg image/png image/gif application/pdf text/css text/calendar].freeze
-
   has_many :page_attachments, dependent: :destroy
   has_many :pages, through: :page_attachments
   has_site if respond_to? :has_site
@@ -37,18 +35,32 @@ class Asset < ActiveRecord::Base
     end
   }
 
+  def self.approved_content_types
+    AssetType.known_mimetypes
+  end
+
   has_one_attached :asset
-  validates :asset,
-            presence: true,
-            blob:
-              {
-                content_type: APPROVED_CONTENT_TYPES,
-                size_range: 1..10.megabytes,
-              }
+  validates :asset, presence: true
+  validate :asset_within_configured_size, if: -> { asset.attached? }
+  validate :approved_content_type, if: -> { asset.attached? }
   before_validation :sync_attachment_metadata
   before_save :assign_title
   before_save :assign_uuid
 
+  def asset_within_configured_size
+    limit_mb =
+      if video_content_type?
+        TrustyCms.config['assets.max_video_size'].to_i
+      else
+        TrustyCms.config['assets.max_asset_size'].to_i
+      end
+
+    limit_bytes = limit_mb.megabytes
+    return if asset.blob.byte_size.between?(1, limit_bytes)
+
+    errors.add(:asset, :wrong_size_error, limit_mb: limit_mb)
+  end
+
   def asset_type
     AssetType.for(asset)
   end
@@ -75,6 +87,8 @@ class Asset < ActiveRecord::Base
            to: :asset_type
 
   def thumbnail(style_name = 'normal')
+    return rewrite_cloud_url(asset.url) if asset.attached? && content_type == 'application/pdf'
+
     variant = asset_variant(style_name.to_s)
     return rewrite_cloud_url(variant.processed.url) if variant
 
@@ -96,8 +110,11 @@ class Asset < ActiveRecord::Base
     %w[asset_content_type asset_file_name asset_file_size caption created_at created_by_id id original_extension original_height original_width title updated_at updated_by_id uuid]
   end
 
-  def render_original(style_name)
-    style_name.to_s == 'original' && asset.attached? && asset.key.include?('culturaldistrict')
+  def render_original(_style_name)
+    return false unless asset.attached?
+
+    prefix = TrustyCms::Config['assets.storage.prefix'].presence
+    prefix ? asset.key.start_with?(prefix) : asset.key.include?('/')
   end
 
   def asset_variant(style_name)
@@ -235,6 +252,16 @@ class Asset < ActiveRecord::Base
     end
   end
 
+  def video_content_type?
+    AssetType.known?(:video) && AssetType.find(:video).mime_types.include?(content_type)
+  end
+
+  def approved_content_type
+    return if Asset.approved_content_types.include?(asset.content_type)
+
+    errors.add(:asset, :content_type, filename: asset.filename.to_s)
+  end
+
   def sync_attachment_metadata
     return unless asset.attached?
 

data/app/views/admin/configuration/_clipped_edit.html.haml

@@ -2,6 +2,7 @@
   %h3
     = t('clipped_extension.assets')
   %p= edit_config 'assets.max_asset_size'
+  %p= edit_config 'assets.max_video_size'
   %p= edit_config 'assets.display_size'
   %p= edit_config 'assets.insertion_size'
   - %w{image video pdf}.each do |type|

data/app/views/admin/configuration/_clipped_show.html.haml

@@ -2,6 +2,8 @@
   = t('clipped_extension.assets')
 %p.ruled
   = show_config 'assets.max_asset_size'
+%p.ruled
+  = show_config 'assets.max_video_size'
 %p.ruled
   = show_config 'assets.display_size'
 %p.ruled

data/config/database.yml

@@ -0,0 +1,30 @@
+#
+# This is only an example configuration. Please see the Rails
+# documentation for more details.
+#
+defaults: &defaults
+  adapter:  mysql
+  db:     localhost
+
+development:
+  adapter: mysql2
+  database: trusty_cms_dev
+  username: root
+  password:
+
+test: &TEST
+  adapter:  mysql2
+  database: trusty_cms_test
+  username: root
+  password: ''
+  db: '127.0.0.1'
+  port: 0
+  encoding: utf8mb4
+  charset: utf8mb4
+  collation: utf8mb4_bin
+
+production:
+  adapter: mysql2
+  database: trusty_cms_live
+  username: root
+  password:

data/config/initializers/trusty_cms_config.rb

@@ -29,7 +29,8 @@ Rails.application.reloader.to_prepare do
         thumbs.define 'pdf', default: 'normal:size=640x640>,format=jpg|small:size=320x320>,format=jpg'
       end
 
-      assets.define 'max_asset_size', default: 5, type: :integer, units: 'MB'
+      assets.define 'max_asset_size', default: 10, type: :integer, units: 'MB'
+      assets.define 'max_video_size', default: 50, type: :integer, units: 'MB'
       assets.define 'display_size', default: 'normal', allow_blank: true
       assets.define 'insertion_size', default: 'normal', allow_blank: true
     end

data/config/locales/en.yml

@@ -17,6 +17,10 @@ en:
           attributes:
             asset:
               blank: 'You must choose a file to upload!'
+              content_type: '%{filename} is not a supported file type.'
+              max_size_error: 'File is too large (maximum is %{max_size}).'
+              min_size_error: 'File is too small (minimum is %{min_size}).'
+              wrong_size_error: 'File size must be between 1 byte and %{limit_mb} MB'
         page:
           attributes:
             slug:
@@ -134,6 +138,7 @@ en:
       display_size: 'Display Size'
       insertion_size: 'Insertion Size'
       max_asset_size: 'Max Asset Size'
+      max_video_size: 'Max Video Size'
       path: 'Path'
       s3:
         bucket: 'Bucket'

data/lib/trusty_cms/version.rb

@@ -1,3 +1,3 @@
 module TrustyCms
-  VERSION = '7.1.0'.freeze
+  VERSION = '7.1.1'.freeze
 end

data/spec/dummy/log/development.log

@@ -0,0 +1,345 @@
+   (0.5ms)  CREATE DATABASE `trusty_cms_dev` DEFAULT CHARACTER SET `utf8mb4`
+   (15.0ms)  CREATE DATABASE `trusty_cms_test` DEFAULT COLLATE `utf8mb4_bin`
+   (40.9ms)  CREATE TABLE `schema_migrations` (`version` varchar(255) NOT NULL PRIMARY KEY)
+   (14.6ms)  CREATE TABLE `ar_internal_metadata` (`key` varchar(255) NOT NULL PRIMARY KEY, `value` varchar(255), `created_at` datetime(6) NOT NULL, `updated_at` datetime(6) NOT NULL)
+   (0.7ms)  SELECT GET_LOCK('6658685849647950510', 0)
+  ActiveRecord::SchemaMigration Load (12.3ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` ORDER BY `schema_migrations`.`version` ASC
+  ActiveRecord::InternalMetadata Load (1.8ms)  SELECT * FROM `ar_internal_metadata` WHERE `ar_internal_metadata`.`key` = 'environment' ORDER BY `ar_internal_metadata`.`key` ASC LIMIT 1
+  ActiveRecord::InternalMetadata Create (1.5ms)  INSERT INTO `ar_internal_metadata` (`key`, `value`, `created_at`, `updated_at`) VALUES ('environment', 'development', '2026-04-20 21:10:45.666344', '2026-04-20 21:10:45.666346')
+   (0.2ms)  SELECT RELEASE_LOCK('6658685849647950510')
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` ORDER BY `schema_migrations`.`version` ASC
+   (13.1ms)  DROP TABLE `ar_internal_metadata`
+   (13.9ms)  DROP TABLE `schema_migrations`
+   (13.9ms)  CREATE TABLE `schema_migrations` (`version` varchar(255) NOT NULL PRIMARY KEY)
+   (8.6ms)  CREATE TABLE `ar_internal_metadata` (`key` varchar(255) NOT NULL PRIMARY KEY, `value` varchar(255), `created_at` datetime(6) NOT NULL, `updated_at` datetime(6) NOT NULL)
+   (0.1ms)  SELECT GET_LOCK('6658685849647950510', 0)
+  ActiveRecord::SchemaMigration Load (0.8ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` ORDER BY `schema_migrations`.`version` ASC
+  ActiveRecord::InternalMetadata Load (0.9ms)  SELECT * FROM `ar_internal_metadata` WHERE `ar_internal_metadata`.`key` = 'environment' ORDER BY `ar_internal_metadata`.`key` ASC LIMIT 1
+  ActiveRecord::InternalMetadata Create (1.0ms)  INSERT INTO `ar_internal_metadata` (`key`, `value`, `created_at`, `updated_at`) VALUES ('environment', 'development', '2026-04-20 21:11:12.190041', '2026-04-20 21:11:12.190057')
+Migrating to CreateTrustyTables (20260420211055)
+   (2.1ms)  DROP TABLE IF EXISTS `config`
+   (12.9ms)  CREATE TABLE `config` (`id` bigint NOT NULL AUTO_INCREMENT PRIMARY KEY, `key` varchar(40) DEFAULT '' NOT NULL, `value` varchar(255) DEFAULT '')
+   (12.8ms)  CREATE UNIQUE INDEX `key` ON `config` (`key`)
+   (1.3ms)  DROP TABLE IF EXISTS `pages`
+   (14.3ms)  CREATE TABLE `pages` (`id` bigint NOT NULL AUTO_INCREMENT PRIMARY KEY, `title` varchar(255), `slug` varchar(100), `breadcrumb` varchar(160), `class_name` varchar(25), `status_id` int DEFAULT 1 NOT NULL, `parent_id` int, `layout_id` int, `created_at` datetime, `updated_at` datetime, `published_at` datetime, `created_by` int, `updated_by` int)
+   (1.2ms)  DROP TABLE IF EXISTS `page_parts`
+   (16.2ms)  CREATE TABLE `page_parts` (`id` bigint NOT NULL AUTO_INCREMENT PRIMARY KEY, `name` varchar(100), `filter` varchar(25), `content` text, `page_id` int)
+   (1.1ms)  DROP TABLE IF EXISTS `snippets`
+   (16.8ms)  CREATE TABLE `snippets` (`id` bigint NOT NULL AUTO_INCREMENT PRIMARY KEY, `name` varchar(100) DEFAULT '' NOT NULL, `filter` varchar(25), `content` text, `created_at` datetime, `updated_at` datetime, `created_by` int, `updated_by` int)
+   (15.8ms)  CREATE UNIQUE INDEX `name` ON `snippets` (`name`)
+   (0.9ms)  DROP TABLE IF EXISTS `layouts`
+   (13.8ms)  CREATE TABLE `layouts` (`id` bigint NOT NULL AUTO_INCREMENT PRIMARY KEY, `name` varchar(100), `content` text, `created_at` datetime, `updated_at` datetime, `created_by` int, `updated_by` int)
+   (8.7ms)  DROP TABLE IF EXISTS `users`
+   (14.6ms)  CREATE TABLE `users` (`id` bigint NOT NULL AUTO_INCREMENT PRIMARY KEY, `name` varchar(100), `email` varchar(255), `login` varchar(40) DEFAULT '' NOT NULL, `password` varchar(40), `admin` tinyint(1) DEFAULT FALSE NOT NULL, `developer` tinyint(1) DEFAULT FALSE NOT NULL, `created_at` datetime, `updated_at` datetime, `created_by` int, `updated_by` int, `salt` varchar(255))
+   (13.0ms)  CREATE UNIQUE INDEX `login` ON `users` (`login`)
+  ActiveRecord::SchemaMigration Create (1.3ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211055')
+Migrating to InsertInitialData (20260420211056)
+  ActiveRecord::SchemaMigration Create (6.9ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211056')
+Migrating to RenameFilterColumn (20260420211057)
+   (16.8ms)  ALTER TABLE `page_parts` RENAME COLUMN `filter` TO `filter_id`
+   (6.2ms)  ALTER TABLE `snippets` RENAME COLUMN `filter` TO `filter_id`
+  ActiveRecord::SchemaMigration Create (0.4ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211057')
+Migrating to AddVirtualColumnToPage (20260420211058)
+   (19.3ms)  ALTER TABLE `pages` ADD `virtual` tinyint(1) DEFAULT FALSE NOT NULL
+  ActiveRecord::SchemaMigration Create (0.7ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211058')
+Migrating to RemoveUserLoginIndex (20260420211059)
+   (3.7ms)  DROP INDEX `login` ON `users`
+  ActiveRecord::SchemaMigration Create (0.4ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211059')
+Migrating to RemoveVirtualColumnFromPage (20260420211060)
+   (17.9ms)  ALTER TABLE `pages` DROP COLUMN `virtual`
+  ActiveRecord::SchemaMigration Create (0.5ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211060')
+Migrating to AddVirtualColumnToPageAgain (20260420211061)
+   (12.8ms)  ALTER TABLE `pages` ADD `virtual` tinyint(1) DEFAULT FALSE NOT NULL
+  ActiveRecord::SchemaMigration Create (0.4ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211061')
+Migrating to AddContentTypeFieldToLayout (20260420211062)
+   (20.6ms)  ALTER TABLE `layouts` ADD `content_type` varchar(40)
+  ActiveRecord::SchemaMigration Create (0.4ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211062')
+Migrating to CreateSites (20260420211063)
+   (5.4ms)  CREATE TABLE `sites` (`id` bigint NOT NULL AUTO_INCREMENT PRIMARY KEY, `name` varchar(255), `domain` varchar(255), `homepage_id` int)
+  ActiveRecord::SchemaMigration Create (0.4ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211063')
+Migrating to AddOrderToSites (20260420211064)
+   (17.9ms)  ALTER TABLE `sites` ADD `position` int DEFAULT 0
+  ActiveRecord::SchemaMigration Create (0.6ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211064')
+Migrating to CreateExtensionMeta (20260420211065)
+   (0.4ms)  DROP TABLE IF EXISTS `extension_meta`
+   (6.0ms)  CREATE TABLE `extension_meta` (`id` bigint NOT NULL AUTO_INCREMENT PRIMARY KEY, `name` varchar(255), `schema_version` int DEFAULT 0, `enabled` tinyint(1) DEFAULT TRUE)
+  ActiveRecord::SchemaMigration Create (0.6ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211065')
+Migrating to AddNotesFieldToUser (20260420211066)
+   (32.5ms)  ALTER TABLE `users` ADD `notes` text
+  ActiveRecord::SchemaMigration Create (0.5ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211066')
+Migrating to RenameConfigDefaultPartsKey (20260420211067)
+  TrustyCms::Config Load (0.2ms)  SELECT `config`.* FROM `config` WHERE `config`.`key` = 'default.parts' LIMIT 1
+  ActiveRecord::SchemaMigration Create (0.4ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211067')
+Migrating to AddOptimisticLocking (20260420211068)
+   (22.6ms)  ALTER TABLE `pages` ADD `lock_version` int DEFAULT 0
+   (61.6ms)  ALTER TABLE `layouts` ADD `lock_version` int DEFAULT 0
+   (53.1ms)  ALTER TABLE `snippets` ADD `lock_version` int DEFAULT 0
+   (94.7ms)  ALTER TABLE `users` ADD `lock_version` int DEFAULT 0
+  ActiveRecord::SchemaMigration Create (0.5ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211068')
+Migrating to AddSessions (20260420211069)
+   (47.7ms)  CREATE TABLE `sessions` (`id` bigint NOT NULL AUTO_INCREMENT PRIMARY KEY, `session_id` varchar(255), `data` text, `updated_at` datetime)
+   (8.7ms)  CREATE INDEX `index_sessions_on_session_id` ON `sessions` (`session_id`)
+   (8.0ms)  CREATE INDEX `index_sessions_on_updated_at` ON `sessions` (`updated_at`)
+  ActiveRecord::SchemaMigration Create (1.1ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211069')
+Migrating to RenameCreatedByUpdatedByColumns (20260420211070)
+   (12.8ms)  ALTER TABLE `pages` RENAME COLUMN `created_by` TO `created_by_id`
+   (7.3ms)  ALTER TABLE `pages` RENAME COLUMN `updated_by` TO `updated_by_id`
+   (8.1ms)  ALTER TABLE `snippets` RENAME COLUMN `created_by` TO `created_by_id`
+   (4.4ms)  ALTER TABLE `snippets` RENAME COLUMN `updated_by` TO `updated_by_id`
+   (5.2ms)  ALTER TABLE `layouts` RENAME COLUMN `created_by` TO `created_by_id`
+   (6.2ms)  ALTER TABLE `layouts` RENAME COLUMN `updated_by` TO `updated_by_id`
+   (4.8ms)  ALTER TABLE `users` RENAME COLUMN `created_by` TO `created_by_id`
+   (5.7ms)  ALTER TABLE `users` RENAME COLUMN `updated_by` TO `updated_by_id`
+  ActiveRecord::SchemaMigration Create (0.7ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211070')
+Migrating to AddDescriptionAndKeywordsToPages (20260420211071)
+   (12.3ms)  ALTER TABLE `pages` ADD `description` varchar(255)
+   (14.2ms)  ALTER TABLE `pages` ADD `keywords` varchar(255)
+  ActiveRecord::SchemaMigration Create (0.4ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211071')
+Migrating to AddSessionInfoToUsers (20260420211072)
+   (10.7ms)  ALTER TABLE `users` ADD `session_token` varchar(255)
+   (14.3ms)  ALTER TABLE `users` ADD `session_expire` datetime
+  ActiveRecord::SchemaMigration Create (0.5ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211072')
+Migrating to RemoveSessionExpireFromUsers (20260420211073)
+   (11.1ms)  ALTER TABLE `users` DROP COLUMN `session_expire`
+  ActiveRecord::SchemaMigration Create (0.2ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211073')
+Migrating to AddAdminFieldsToSites (20260420211074)
+   (5.5ms)  ALTER TABLE `sites` ADD `created_by_id` int
+   (9.0ms)  ALTER TABLE `sites` ADD `created_at` datetime
+   (17.4ms)  ALTER TABLE `sites` ADD `updated_by_id` int
+   (8.1ms)  ALTER TABLE `sites` ADD `updated_at` datetime
+   (4.3ms)  ALTER TABLE `sites` ADD `subtitle` varchar(255)
+  ActiveRecord::SchemaMigration Create (0.2ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211074')
+Migrating to AddSites (20260420211075)
+   (8.1ms)  ALTER TABLE `layouts` ADD `site_id` int
+   (7.3ms)  ALTER TABLE `snippets` ADD `site_id` int
+   (5.9ms)  ALTER TABLE `users` ADD `site_id` int
+  ActiveRecord::SchemaMigration Create (0.2ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211075')
+Migrating to SiteAbbreviation (20260420211076)
+   (7.3ms)  ALTER TABLE `sites` ADD `abbreviation` varchar(255)
+  ActiveRecord::SchemaMigration Create (0.5ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211076')
+Migrating to RecreateNonUniqueIndexOnSnippetsName (20260420211077)
+   (3.4ms)  DROP INDEX `name` ON `snippets`
+   (3.8ms)  CREATE UNIQUE INDEX `name_site_id` ON `snippets` (`name`, `site_id`)
+  ActiveRecord::SchemaMigration Create (0.3ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211077')
+Migrating to AddSiteIdToPages (20260420211078)
+   (7.9ms)  ALTER TABLE `pages` ADD `site_id` int
+   (3.0ms)  CREATE INDEX `index_pages_on_site_id` ON `pages` (`site_id`)
+  Site Load (0.2ms)  SELECT `sites`.* FROM `sites` ORDER BY position ASC
+  ActiveRecord::SchemaMigration Create (0.7ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211078')
+Migrating to AddBaseDomainToSites (20260420211079)
+   (10.7ms)  ALTER TABLE `sites` ADD `base_domain` varchar(255)
+  ActiveRecord::SchemaMigration Create (0.2ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211079')
+Migrating to CreateAssets (20260420211080)
+   (1.7ms)  CREATE TABLE `assets` (`id` bigint NOT NULL AUTO_INCREMENT PRIMARY KEY, `caption` varchar(255), `title` varchar(255))
+  ActiveRecord::SchemaMigration Create (0.2ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211080')
+Migrating to CreatePaperclipAttributes (20260420211081)
+   (8.9ms)  ALTER TABLE `assets` ADD `asset_file_name` varchar(255)
+   (4.0ms)  ALTER TABLE `assets` ADD `asset_content_type` varchar(255)
+   (3.6ms)  ALTER TABLE `assets` ADD `asset_file_size` int
+  ActiveRecord::SchemaMigration Create (0.2ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211081')
+Migrating to CreateUserObserver (20260420211082)
+   (6.6ms)  ALTER TABLE `assets` ADD `created_by` int
+   (7.2ms)  ALTER TABLE `assets` ADD `updated_by` int
+   (6.8ms)  ALTER TABLE `assets` ADD `created_at` datetime
+   (7.7ms)  ALTER TABLE `assets` ADD `updated_at` datetime
+  ActiveRecord::SchemaMigration Create (0.2ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211082')
+Migrating to CreatePageAttachments (20260420211083)
+   (4.2ms)  CREATE TABLE `page_attachments` (`id` bigint NOT NULL AUTO_INCREMENT PRIMARY KEY, `asset_id` int, `page_id` int, `position` int)
+  ActiveRecord::SchemaMigration Create (0.2ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211083')
+Migrating to RenameUsers (20260420211084)
+   (1.4ms)  ALTER TABLE `assets` RENAME COLUMN `created_by` TO `created_by_id`
+   (1.3ms)  ALTER TABLE `assets` RENAME COLUMN `updated_by` TO `updated_by_id`
+  ActiveRecord::SchemaMigration Create (0.3ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211084')
+Migrating to AddIndexes (20260420211085)
+   (2.3ms)  CREATE INDEX `pages_class_name` ON `pages` (`class_name`)
+   (2.3ms)  CREATE INDEX `pages_parent_id` ON `pages` (`parent_id`)
+   (2.0ms)  CREATE INDEX `pages_child_slug` ON `pages` (`slug`, `parent_id`)
+   (1.8ms)  CREATE INDEX `pages_published` ON `pages` (`virtual`, `status_id`)
+   (1.7ms)  CREATE INDEX `parts_by_page` ON `page_parts` (`page_id`, `name`)
+  ActiveRecord::SchemaMigration Create (0.2ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211085')
+Migrating to AddUserLanguage (20260420211086)
+   (9.2ms)  ALTER TABLE `users` ADD `language` varchar(255)
+  ActiveRecord::SchemaMigration Create (0.2ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211086')
+Migrating to RenameDeveloperRoleToDesigner (20260420211087)
+   (2.3ms)  ALTER TABLE `users` RENAME COLUMN `developer` TO `designer`
+  ActiveRecord::SchemaMigration Create (0.2ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211087')
+Migrating to ChangeUserLanguageToLocale (20260420211088)
+   (2.7ms)  ALTER TABLE `users` RENAME COLUMN `language` TO `locale`
+  ActiveRecord::SchemaMigration Create (0.2ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211088')
+Migrating to AddPageFields (20260420211089)
+   (1.8ms)  CREATE TABLE `page_fields` (`id` bigint NOT NULL AUTO_INCREMENT PRIMARY KEY, `page_id` int, `name` varchar(255), `content` varchar(255))
+   (1.5ms)  CREATE INDEX `index_page_fields_on_page_id` ON `page_fields` (`page_id`)
+  ActiveRecord::SchemaMigration Create (0.1ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211089')
+Migrating to ConvertPageMetas (20260420211090)
+   (23.7ms)  ALTER TABLE `pages` DROP COLUMN `keywords`
+   (150.1ms)  ALTER TABLE `pages` DROP COLUMN `description`
+  ActiveRecord::SchemaMigration Create (0.7ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211090')
+Migrating to AddFieldNameIndex (20260420211091)
+   (4.4ms)  DROP INDEX `index_page_fields_on_page_id` ON `page_fields`
+   (7.0ms)  CREATE INDEX `index_page_fields_on_page_id_and_name_and_content` ON `page_fields` (`page_id`, `name`, `content`)
+  ActiveRecord::SchemaMigration Create (0.4ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211091')
+Migrating to AssetUuid (20260420211092)
+   (12.8ms)  ALTER TABLE `assets` ADD `uuid` varchar(255)
+  Asset Load (0.4ms)  SELECT `assets`.* FROM `assets` ORDER BY created_at DESC
+  ActiveRecord::SchemaMigration Create (0.5ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211092')
+Migrating to UpdateConfiguration (20260420211093)
+  TrustyCms::Config Load (0.1ms)  SELECT `config`.* FROM `config`
+  ActiveRecord::SchemaMigration Create (0.4ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211093')
+Migrating to Dimensions (20260420211094)
+   (20.5ms)  ALTER TABLE `assets` ADD `original_width` int
+   (26.6ms)  ALTER TABLE `assets` ADD `original_height` int
+   (17.0ms)  ALTER TABLE `assets` ADD `original_extension` varchar(255)
+  ActiveRecord::SchemaMigration Create (0.5ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211094')
+Migrating to AddAllowedChildrenCacheToPages (20260420211095)
+   (45.2ms)  ALTER TABLE `pages` ADD `allowed_children_cache` text
+  ActiveRecord::SchemaMigration Create (0.2ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211095')
+Migrating to ExtendPagePartContentLimit (20260420211096)
+   (8.3ms)  ALTER TABLE `page_parts` CHANGE `content` `content` mediumtext DEFAULT NULL
+  ActiveRecord::SchemaMigration Create (0.3ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211096')
+Migrating to ChangePagesAllowedChildrenCacheToText (20260420211097)
+   (2.1ms)  ALTER TABLE `pages` CHANGE `allowed_children_cache` `allowed_children_cache` text DEFAULT NULL
+  ActiveRecord::SchemaMigration Create (0.3ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211097')
+Migrating to AddPasswordResetToUsers (20260420211098)
+   (6.4ms)  ALTER TABLE `users` ADD `password_reset_token` varchar(255)
+   (4.7ms)  ALTER TABLE `users` ADD `password_reset_sent_at` datetime
+  ActiveRecord::SchemaMigration Create (0.4ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211098')
+Migrating to AddPositionToPages (20260420211099)
+   (12.0ms)  ALTER TABLE `pages` ADD `position` int
+  Page Load (0.3ms)  SELECT `pages`.* FROM `pages` WHERE `pages`.`parent_id` IS NULL
+  ActiveRecord::SchemaMigration Create (0.4ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211099')
+Migrating to CreateAdminUsers (20260420211100)
+   (6.9ms)  CREATE TABLE `admins` (`id` bigint NOT NULL AUTO_INCREMENT PRIMARY KEY, `email` varchar(255) DEFAULT '' NOT NULL, `encrypted_password` varchar(255) DEFAULT '' NOT NULL, `reset_password_token` varchar(255), `reset_password_sent_at` datetime, `remember_created_at` datetime, `sign_in_count` int DEFAULT 0 NOT NULL, `current_sign_in_at` datetime, `last_sign_in_at` datetime, `current_sign_in_ip` varchar(255), `last_sign_in_ip` varchar(255), `confirmation_token` varchar(255), `confirmed_at` datetime, `confirmation_sent_at` datetime, `unconfirmed_email` varchar(255), `failed_attempts` int DEFAULT 0 NOT NULL, `unlock_token` varchar(255), `locked_at` datetime, `first_name` varchar(255), `last_name` varchar(255), `admin` tinyint(1), `designer` tinyint(1), `content_editor` tinyint(1), `site_id` int, `updated_by_id` int, `notes` text, `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL)
+  ActiveRecord::SchemaMigration Create (1.4ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211100')
+Migrating to CreateActiveStorageTables (20260420211101)
+   (6.7ms)  CREATE TABLE `active_storage_blobs` (`id` bigint NOT NULL AUTO_INCREMENT PRIMARY KEY, `key` varchar(255) NOT NULL, `filename` varchar(255) NOT NULL, `content_type` varchar(255), `metadata` text, `service_name` varchar(255) NOT NULL, `byte_size` bigint NOT NULL, `checksum` varchar(255) NOT NULL, `created_at` datetime NOT NULL, UNIQUE INDEX `index_active_storage_blobs_on_key` (`key`))
+   (3.9ms)  CREATE TABLE `active_storage_attachments` (`id` bigint NOT NULL AUTO_INCREMENT PRIMARY KEY, `name` varchar(255) NOT NULL, `record_type` varchar(255) NOT NULL, `record_id` bigint NOT NULL, `blob_id` bigint NOT NULL, `created_at` datetime NOT NULL, INDEX `index_active_storage_attachments_on_blob_id` (`blob_id`), UNIQUE INDEX `index_active_storage_attachments_uniqueness` (`record_type`, `record_id`, `name`, `blob_id`), CONSTRAINT `fk_rails_c3b3935057`
+FOREIGN KEY (`blob_id`)
+  REFERENCES `active_storage_blobs` (`id`)
+)
+   (4.0ms)  CREATE TABLE `active_storage_variant_records` (`id` bigint NOT NULL AUTO_INCREMENT PRIMARY KEY, `blob_id` bigint NOT NULL, `variation_digest` varchar(255) NOT NULL, UNIQUE INDEX `index_active_storage_variant_records_uniqueness` (`blob_id`, `variation_digest`), CONSTRAINT `fk_rails_993965df05`
+FOREIGN KEY (`blob_id`)
+  REFERENCES `active_storage_blobs` (`id`)
+)
+  ActiveRecord::SchemaMigration Create (0.3ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211101')
+Migrating to CreateSiteUsers (20260420211102)
+   (4.7ms)  CREATE TABLE `admins_sites` (`id` bigint NOT NULL AUTO_INCREMENT PRIMARY KEY, `admin_id` int NOT NULL, `site_id` int NOT NULL, INDEX `index_admins_sites_on_admin_id` (`admin_id`), INDEX `index_admins_sites_on_site_id` (`site_id`))
+  ActiveRecord::SchemaMigration Create (0.7ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211102')
+Migrating to CreateVersions (20260420211103)
+   (4.8ms)  CREATE TABLE `versions` (`id` bigint NOT NULL AUTO_INCREMENT PRIMARY KEY, `whodunnit` varchar(255), `created_at` datetime(6), `item_id` bigint NOT NULL, `item_type` varchar(191) NOT NULL, `event` varchar(255) NOT NULL, `object` longtext) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci
+   (6.0ms)  CREATE INDEX `index_versions_on_item_type_and_item_id` ON `versions` (`item_type`, `item_id`)
+  ActiveRecord::SchemaMigration Create (0.3ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211103')
+Migrating to CreateVersionAssociations (20260420211104)
+   (4.2ms)  CREATE TABLE `version_associations` (`id` bigint NOT NULL AUTO_INCREMENT PRIMARY KEY, `version_id` int, `foreign_key_name` varchar(255) NOT NULL, `foreign_key_id` int, `foreign_type` varchar(255))
+   (5.4ms)  CREATE INDEX `index_version_associations_on_version_id` ON `version_associations` (`version_id`)
+   (2.8ms)  CREATE INDEX `index_version_associations_on_foreign_key` ON `version_associations` (`foreign_key_name`, `foreign_key_id`, `foreign_type`)
+  ActiveRecord::SchemaMigration Create (0.3ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211104')
+Migrating to AddTransactionIdColumnToVersions (20260420211105)
+   (7.6ms)  ALTER TABLE `versions` ADD `transaction_id` int
+   (2.4ms)  CREATE INDEX `index_versions_on_transaction_id` ON `versions` (`transaction_id`)
+  ActiveRecord::SchemaMigration Create (0.3ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211105')
+Migrating to AddDeviseTwoFactorToAdmins (20260420211106)
+   (6.8ms)  ALTER TABLE `admins` ADD `otp_secret` varchar(255)
+   (5.8ms)  ALTER TABLE `admins` ADD `consumed_timestep` int
+   (13.6ms)  ALTER TABLE `admins` ADD `otp_required_for_login` tinyint(1)
+  ActiveRecord::SchemaMigration Create (0.3ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211106')
+Migrating to AddObjectChangesToVersions (20260420211107)
+   (7.7ms)  ALTER TABLE `versions` ADD `object_changes` longtext
+  ActiveRecord::SchemaMigration Create (0.5ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20260420211107')
+   (0.1ms)  SELECT RELEASE_LOCK('6658685849647950510')
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` ORDER BY `schema_migrations`.`version` ASC
+  TrustyCms::Config Load (0.1ms)  SELECT `config`.* FROM `config` WHERE `config`.`key` = 'admin.title' ORDER BY `config`.`id` ASC LIMIT 1
+  TRANSACTION (0.0ms)  BEGIN
+  TrustyCms::Config Create (2.1ms)  INSERT INTO `config` (`key`, `value`) VALUES ('admin.title', 'TrustyCms CMS')
+  TrustyCms::Config Load (0.1ms)  SELECT `config`.* FROM `config`
+  TRANSACTION (7.1ms)  COMMIT
+  TrustyCms::Config Load (0.3ms)  SELECT `config`.* FROM `config` WHERE `config`.`key` = 'defaults.page.parts' ORDER BY `config`.`id` ASC LIMIT 1
+  TRANSACTION (0.0ms)  BEGIN
+  TrustyCms::Config Create (0.1ms)  INSERT INTO `config` (`key`, `value`) VALUES ('defaults.page.parts', 'Body,Extended')
+  TrustyCms::Config Load (0.0ms)  SELECT `config`.* FROM `config`
+  TRANSACTION (0.1ms)  COMMIT
+  TrustyCms::Config Load (0.1ms)  SELECT `config`.* FROM `config` WHERE `config`.`key` = 'defaults.page.status' ORDER BY `config`.`id` ASC LIMIT 1
+  TRANSACTION (0.0ms)  BEGIN
+  TrustyCms::Config Create (0.1ms)  INSERT INTO `config` (`key`, `value`) VALUES ('defaults.page.status', 'Draft')
+  TrustyCms::Config Load (0.1ms)  SELECT `config`.* FROM `config`
+  TRANSACTION (0.1ms)  COMMIT
+  TrustyCms::Config Load (0.0ms)  SELECT `config`.* FROM `config` WHERE `config`.`key` = 'pagination.param_name' ORDER BY `config`.`id` ASC LIMIT 1
+  TRANSACTION (0.0ms)  BEGIN
+  TrustyCms::Config Create (0.1ms)  INSERT INTO `config` (`key`, `value`) VALUES ('pagination.param_name', 'page')
+  TrustyCms::Config Load (0.0ms)  SELECT `config`.* FROM `config`
+  TRANSACTION (0.1ms)  COMMIT
+  TrustyCms::Config Load (0.0ms)  SELECT `config`.* FROM `config` WHERE `config`.`key` = 'pagination.per_page_param_name' ORDER BY `config`.`id` ASC LIMIT 1
+  TRANSACTION (0.0ms)  BEGIN
+  TrustyCms::Config Create (0.1ms)  INSERT INTO `config` (`key`, `value`) VALUES ('pagination.per_page_param_name', 'per_page')
+  TrustyCms::Config Load (0.0ms)  SELECT `config`.* FROM `config`
+  TRANSACTION (0.1ms)  COMMIT
+  TrustyCms::Config Load (0.1ms)  SELECT `config`.* FROM `config` WHERE `config`.`key` = 'admin.pagination.per_page' ORDER BY `config`.`id` ASC LIMIT 1
+  TRANSACTION (0.0ms)  BEGIN
+  TrustyCms::Config Create (0.4ms)  INSERT INTO `config` (`key`, `value`) VALUES ('admin.pagination.per_page', '50')
+  TrustyCms::Config Load (0.0ms)  SELECT `config`.* FROM `config`
+  TRANSACTION (0.1ms)  COMMIT
+  TrustyCms::Config Load (0.1ms)  SELECT `config`.* FROM `config` WHERE `config`.`key` = 'site.title' ORDER BY `config`.`id` ASC LIMIT 1
+  TRANSACTION (0.0ms)  BEGIN
+  TrustyCms::Config Create (0.1ms)  INSERT INTO `config` (`key`, `value`) VALUES ('site.title', 'Your site title')
+  TrustyCms::Config Load (0.0ms)  SELECT `config`.* FROM `config`
+  TRANSACTION (0.2ms)  COMMIT
+  TrustyCms::Config Load (0.0ms)  SELECT `config`.* FROM `config` WHERE `config`.`key` = 'site.host' ORDER BY `config`.`id` ASC LIMIT 1
+  TRANSACTION (0.0ms)  BEGIN
+  TrustyCms::Config Create (0.1ms)  INSERT INTO `config` (`key`, `value`) VALUES ('site.host', 'www.example.com')
+  TrustyCms::Config Load (0.0ms)  SELECT `config`.* FROM `config`
+  TRANSACTION (0.3ms)  COMMIT
+  TrustyCms::Config Load (0.2ms)  SELECT `config`.* FROM `config` WHERE `config`.`key` = 'session_timeout' ORDER BY `config`.`id` ASC LIMIT 1
+  TRANSACTION (0.1ms)  BEGIN
+  TrustyCms::Config Create (0.5ms)  INSERT INTO `config` (`key`, `value`) VALUES ('session_timeout', '1209600')
+  TrustyCms::Config Load (0.1ms)  SELECT `config`.* FROM `config`
+  TRANSACTION (1.3ms)  COMMIT
+  TrustyCms::Config Load (1.2ms)  SELECT `config`.* FROM `config` WHERE `config`.`key` = 'assets.create_image_thumbnails?' ORDER BY `config`.`id` ASC LIMIT 1
+  TRANSACTION (0.4ms)  BEGIN
+  TrustyCms::Config Create (1.2ms)  INSERT INTO `config` (`key`, `value`) VALUES ('assets.create_image_thumbnails?', 'true')
+  TrustyCms::Config Load (5.6ms)  SELECT `config`.* FROM `config`
+  TRANSACTION (0.3ms)  COMMIT
+  TrustyCms::Config Load (0.2ms)  SELECT `config`.* FROM `config` WHERE `config`.`key` = 'assets.create_video_thumbnails?' ORDER BY `config`.`id` ASC LIMIT 1
+  TRANSACTION (0.1ms)  BEGIN
+  TrustyCms::Config Create (0.6ms)  INSERT INTO `config` (`key`, `value`) VALUES ('assets.create_video_thumbnails?', 'true')
+  TrustyCms::Config Load (0.2ms)  SELECT `config`.* FROM `config`
+  TRANSACTION (0.9ms)  COMMIT
+  TrustyCms::Config Load (0.5ms)  SELECT `config`.* FROM `config` WHERE `config`.`key` = 'assets.create_pdf_thumbnails?' ORDER BY `config`.`id` ASC LIMIT 1
+  TRANSACTION (0.0ms)  BEGIN
+  TrustyCms::Config Create (0.2ms)  INSERT INTO `config` (`key`, `value`) VALUES ('assets.create_pdf_thumbnails?', 'true')
+  TrustyCms::Config Load (0.3ms)  SELECT `config`.* FROM `config`
+  TRANSACTION (0.6ms)  COMMIT
+  TrustyCms::Config Load (0.5ms)  SELECT `config`.* FROM `config` WHERE `config`.`key` = 'assets.thumbnails.image' ORDER BY `config`.`id` ASC LIMIT 1
+  TRANSACTION (0.1ms)  BEGIN
+  TrustyCms::Config Create (0.2ms)  INSERT INTO `config` (`key`, `value`) VALUES ('assets.thumbnails.image', 'normal:size=640x640>|small:size=320x320>')
+  TrustyCms::Config Load (0.1ms)  SELECT `config`.* FROM `config`
+  TRANSACTION (0.5ms)  COMMIT
+  TrustyCms::Config Load (0.2ms)  SELECT `config`.* FROM `config` WHERE `config`.`key` = 'assets.thumbnails.video' ORDER BY `config`.`id` ASC LIMIT 1
+  TRANSACTION (0.0ms)  BEGIN
+  TrustyCms::Config Create (0.2ms)  INSERT INTO `config` (`key`, `value`) VALUES ('assets.thumbnails.video', 'normal:size=640x640>,format=jpg|small:size=320x320>,format=jpg')
+  TrustyCms::Config Load (0.1ms)  SELECT `config`.* FROM `config`
+  TRANSACTION (0.4ms)  COMMIT
+  TrustyCms::Config Load (0.1ms)  SELECT `config`.* FROM `config` WHERE `config`.`key` = 'assets.thumbnails.pdf' ORDER BY `config`.`id` ASC LIMIT 1
+  TRANSACTION (0.1ms)  BEGIN
+  TrustyCms::Config Create (0.2ms)  INSERT INTO `config` (`key`, `value`) VALUES ('assets.thumbnails.pdf', 'normal:size=640x640>,format=jpg|small:size=320x320>,format=jpg')
+  TrustyCms::Config Load (0.1ms)  SELECT `config`.* FROM `config`
+  TRANSACTION (0.2ms)  COMMIT
+  TrustyCms::Config Load (0.1ms)  SELECT `config`.* FROM `config` WHERE `config`.`key` = 'assets.max_asset_size' ORDER BY `config`.`id` ASC LIMIT 1
+  TRANSACTION (0.0ms)  BEGIN
+  TrustyCms::Config Create (0.1ms)  INSERT INTO `config` (`key`, `value`) VALUES ('assets.max_asset_size', '10')
+  TrustyCms::Config Load (0.1ms)  SELECT `config`.* FROM `config`
+  TRANSACTION (0.2ms)  COMMIT
+  TrustyCms::Config Load (0.1ms)  SELECT `config`.* FROM `config` WHERE `config`.`key` = 'assets.max_video_size' ORDER BY `config`.`id` ASC LIMIT 1
+  TRANSACTION (0.0ms)  BEGIN
+  TrustyCms::Config Create (0.2ms)  INSERT INTO `config` (`key`, `value`) VALUES ('assets.max_video_size', '50')
+  TrustyCms::Config Load (0.1ms)  SELECT `config`.* FROM `config`
+  TRANSACTION (0.2ms)  COMMIT
+  TrustyCms::Config Load (0.1ms)  SELECT `config`.* FROM `config` WHERE `config`.`key` = 'assets.display_size' ORDER BY `config`.`id` ASC LIMIT 1
+  TRANSACTION (0.0ms)  BEGIN
+  TrustyCms::Config Create (0.1ms)  INSERT INTO `config` (`key`, `value`) VALUES ('assets.display_size', 'normal')
+  TrustyCms::Config Load (0.1ms)  SELECT `config`.* FROM `config`
+  TRANSACTION (0.2ms)  COMMIT
+  TrustyCms::Config Load (0.1ms)  SELECT `config`.* FROM `config` WHERE `config`.`key` = 'assets.insertion_size' ORDER BY `config`.`id` ASC LIMIT 1
+  TRANSACTION (0.0ms)  BEGIN
+  TrustyCms::Config Create (0.1ms)  INSERT INTO `config` (`key`, `value`) VALUES ('assets.insertion_size', 'normal')
+  TrustyCms::Config Load (0.1ms)  SELECT `config`.* FROM `config`
+  TRANSACTION (0.3ms)  COMMIT
+   (1.0ms)  SELECT DISTINCT class_name FROM pages WHERE class_name <> '' AND class_name IS NOT NULL

data/spec/dummy/tmp/local_secret.txt

@@ -0,0 +1 @@
+1d9926ca1af1965414a2c8a3b0c301bcf1d26894000d2b3cc6a7b1c66edee3f4c759b8f792fdb3b3a8353464b39f53bfea2df3ea609a895b925602442d84a58a

data/spec/models/asset_spec.rb

@@ -11,30 +11,84 @@ RSpec.describe Asset, type: :model do
   end
 
   describe 'validations' do
+    before do
+      AssetType.new :image, icon: 'image', styles: :standard, extensions: %w[jpg jpeg png gif], mime_types: %w[image/png image/x-png image/jpeg image/pjpeg image/jpg image/gif] unless AssetType.known?(:image)
+      AssetType.new :video, icon: 'video', mime_types: %w[video/mp4 video/mpeg video/quicktime video/webm] unless AssetType.known?(:video)
+      AssetType.new :document, icon: 'document', mime_types: %w[application/msword application/rtf text/plain text/html] unless AssetType.known?(:document)
+    end
+
     it 'is valid when the content type is approved' do
-      asset = described_class.new(asset: upload_fixture('sample.ics', 'text/calendar'))
+      asset = described_class.new(asset: upload_fixture('sample.txt', 'text/plain'))
 
       expect(asset).to be_valid
     end
 
     it 'is invalid when the content type is not approved' do
-      asset = described_class.new(asset: upload_fixture('sample.txt', 'text/plain'))
+      asset = described_class.new(asset: upload_fixture('sample.txt', 'application/x-unsupported'))
 
       expect(asset).not_to be_valid
-      expect(asset.errors[:asset]).to include(a_string_matching(/file format/i))
+      expect(asset.errors[:asset]).to include(a_string_matching(/file type/i))
     end
 
-    it 'is invalid when the file exceeds the maximum size' do
-      Tempfile.open(['large', '.png']) do |tempfile|
-        tempfile.binmode
-        tempfile.write('0' * (10.megabytes + 1))
-        tempfile.rewind
+    context 'with stubbed size limits (1 MB asset / 2 MB video)' do
+      before do
+        allow(TrustyCms.config).to receive(:[]).and_call_original
+        allow(TrustyCms.config).to receive(:[]).with('assets.max_asset_size').and_return('1')
+        allow(TrustyCms.config).to receive(:[]).with('assets.max_video_size').and_return('2')
+      end
+
+      it 'is invalid when a non-video file exceeds the maximum asset size' do
+        Tempfile.open(['large', '.png']) do |tempfile|
+          tempfile.binmode
+          tempfile.write('0' * (1.megabyte + 1))
+          tempfile.rewind
 
-        uploaded = Rack::Test::UploadedFile.new(tempfile.path, 'image/png')
-        asset = described_class.new(asset: uploaded)
+          uploaded = Rack::Test::UploadedFile.new(tempfile.path, 'image/png')
+          asset = described_class.new(asset: uploaded)
 
-        expect(asset).not_to be_valid
-        expect(asset.errors[:asset]).to include(a_string_matching(/10 MB/))
+          expect(asset).not_to be_valid
+          expect(asset.errors[:asset]).to include(a_string_matching(/1 MB/))
+        end
+      end
+
+      it 'is invalid when a video file exceeds the maximum video size' do
+        Tempfile.open(['large', '.mp4']) do |tempfile|
+          tempfile.binmode
+          tempfile.write('0' * (2.megabytes + 1))
+          tempfile.rewind
+
+          uploaded = Rack::Test::UploadedFile.new(tempfile.path, 'video/mp4')
+          asset = described_class.new(asset: uploaded)
+
+          expect(asset).not_to be_valid
+          expect(asset.errors[:asset]).to include(a_string_matching(/2 MB/))
+        end
+      end
+
+      it 'allows a video file that exceeds the asset size limit but is within the video size limit' do
+        Tempfile.open(['video', '.mp4']) do |tempfile|
+          tempfile.binmode
+          tempfile.write('0' * (1.megabyte + 1.kilobyte))
+          tempfile.rewind
+
+          uploaded = Rack::Test::UploadedFile.new(tempfile.path, 'video/mp4')
+          asset = described_class.new(asset: uploaded)
+
+          expect(asset).to be_valid
+        end
+      end
+
+      it 'allows a video file within the maximum video size' do
+        Tempfile.open(['video', '.mp4']) do |tempfile|
+          tempfile.binmode
+          tempfile.write('0' * 1.kilobyte)
+          tempfile.rewind
+
+          uploaded = Rack::Test::UploadedFile.new(tempfile.path, 'video/mp4')
+          asset = described_class.new(asset: uploaded)
+
+          expect(asset).to be_valid
+        end
       end
     end
   end
@@ -101,5 +155,108 @@ RSpec.describe Asset, type: :model do
 
       expect(asset.thumbnail('thumbnail')).to eq('/rails/active_storage/variant/test')
     end
+
+    it 'returns the direct asset url for pdfs without variant processing' do
+      asset = described_class.new(caption: '')
+      allow(asset).to receive_message_chain(:asset, :attached?).and_return(true)
+      allow(asset).to receive(:content_type).and_return('application/pdf')
+      allow(asset).to receive_message_chain(:asset, :url).and_return('https://s3.amazonaws.com/bucket/myprefix/system/assets/20260501/doc-abc123.pdf')
+      allow(asset).to receive(:rewrite_cloud_url) { |url| url }
+
+      expect(asset).not_to receive(:asset_variant)
+      expect(asset.thumbnail('normal')).to eq('https://s3.amazonaws.com/bucket/myprefix/system/assets/20260501/doc-abc123.pdf')
+    end
+
+    it 'returns the asset type icon when nothing is attached' do
+      asset = described_class.new(caption: '')
+      allow(asset).to receive_message_chain(:asset, :attached?).and_return(false)
+      allow(asset).to receive(:asset_variant).and_return(nil)
+      allow(asset).to receive_message_chain(:asset_type, :icon).with('normal').and_return('/assets/admin/image_icon.png')
+
+      expect(asset.thumbnail('normal')).to eq('/assets/admin/image_icon.png')
+    end
+  end
+
+  describe '#render_original' do
+    it 'returns true for any style when the asset key starts with the configured prefix' do
+      asset = described_class.new
+      allow(TrustyCms::Config).to receive(:[]).with('assets.storage.prefix').and_return('myprefix')
+      allow(asset).to receive_message_chain(:asset, :attached?).and_return(true)
+      allow(asset).to receive_message_chain(:asset, :key).and_return('myprefix/system/assets/20260501/image-abc123.jpg')
+
+      expect(asset.render_original('normal')).to be(true)
+      expect(asset.render_original('thumbnail')).to be(true)
+      expect(asset.render_original('original')).to be(true)
+    end
+
+    it 'returns true when no prefix is configured but the key contains a path separator' do
+      asset = described_class.new
+      allow(TrustyCms::Config).to receive(:[]).with('assets.storage.prefix').and_return(nil)
+      allow(asset).to receive_message_chain(:asset, :attached?).and_return(true)
+      allow(asset).to receive_message_chain(:asset, :key).and_return('system/assets/20260501/image-abc123.jpg')
+
+      expect(asset.render_original('normal')).to be(true)
+    end
+
+    it 'returns false when the key does not start with the configured prefix' do
+      asset = described_class.new
+      allow(TrustyCms::Config).to receive(:[]).with('assets.storage.prefix').and_return('myprefix')
+      allow(asset).to receive_message_chain(:asset, :attached?).and_return(true)
+      allow(asset).to receive_message_chain(:asset, :key).and_return('randomlegacykey')
+
+      expect(asset.render_original('normal')).to be(false)
+    end
+
+    it 'returns false when no asset is attached' do
+      asset = described_class.new
+      allow(asset).to receive_message_chain(:asset, :attached?).and_return(false)
+
+      expect(asset.render_original('normal')).to be(false)
+    end
+  end
+
+  describe '#public_url' do
+    let(:original_url) { 'https://s3.amazonaws.com/bucket/myprefix/system/assets/20260501/image-abc123.jpg' }
+    let(:variant_url)  { 'https://s3.amazonaws.com/bucket/variants/abc/xyz.jpg' }
+
+    it 'returns the original url for new-style assets regardless of style' do
+      asset = described_class.new
+      allow(asset).to receive(:render_original).and_return(true)
+      allow(asset).to receive_message_chain(:asset, :url).and_return(original_url)
+      allow(asset).to receive(:rewrite_cloud_url) { |url| url }
+
+      expect(asset.public_url('normal')).to eq(original_url)
+      expect(asset.public_url('thumbnail')).to eq(original_url)
+    end
+
+    it 'returns the original url when style_name is original' do
+      asset = described_class.new
+      allow(asset).to receive(:render_original).and_return(false)
+      allow(asset).to receive_message_chain(:asset, :url).and_return(original_url)
+      allow(asset).to receive(:rewrite_cloud_url) { |url| url }
+
+      expect(asset.public_url('original')).to eq(original_url)
+    end
+
+    it 'returns a variant url for old-style assets' do
+      asset = described_class.new
+      allow(asset).to receive(:render_original).and_return(false)
+      processed = instance_double(ActiveStorage::Variant, url: variant_url)
+      variant   = instance_double(ActiveStorage::Variant, processed: processed)
+      allow(asset).to receive(:asset_variant).and_return(variant)
+      allow(asset).to receive(:rewrite_cloud_url) { |url| url }
+
+      expect(asset.public_url('normal')).to eq(variant_url)
+    end
+
+    it 'falls back to the asset url when no variant exists for an old-style asset' do
+      asset = described_class.new
+      allow(asset).to receive(:render_original).and_return(false)
+      allow(asset).to receive(:asset_variant).and_return(nil)
+      allow(asset).to receive_message_chain(:asset, :url).and_return('https://s3.amazonaws.com/bucket/randomlegacykey')
+      allow(asset).to receive(:rewrite_cloud_url) { |url| url }
+
+      expect(asset.public_url('normal')).to eq('https://s3.amazonaws.com/bucket/randomlegacykey')
+    end
   end
 end

data/trusty_cms.gemspec

@@ -3,7 +3,7 @@
 
 require File.expand_path(__FILE__ + '/../lib/trusty_cms/version.rb')
 Gem::Specification.new do |s|
-  s.required_ruby_version = '>= 3.0.5'
+  s.required_ruby_version = '>= 3.3.4'
   s.name = 'trusty-cms'
   s.version = TrustyCms::VERSION
   s.platform = Gem::Platform::RUBY

data/vendor/extensions/clipped-extension/clipped_extension.rb

@@ -9,11 +9,10 @@ class ClippedExtension < TrustyCms::Extension
         TrustyCms::AdminUI.send :include, ClippedAdminUI unless defined? admin.asset # defines shards for extension of the asset-admin interface
         Admin::PagesController.send :helper, Admin::AssetsHelper # currently only provides a description of asset sizes
         Page.send :include, AssetTags # radius tags for selecting sets of assets and presenting each one
-        AssetType.new :image, :icon => 'image', :default_radius_tag => 'image', :styles => :standard, :extensions => %w[jpg jpeg png gif], :mime_types => %w[image/png image/x-png image/jpeg image/pjpeg image/jpg image/gif]
-        AssetType.new :video, :icon => 'video', :styles => :standard, :mime_types => %w[application/x-mp4 video/mpeg video/quicktime video/x-la-asf video/x-ms-asf video/x-msvideo video/x-sgi-movie video/x-flv flv-application/octet-stream video/3gpp video/3gpp2 video/3gpp-tt video/BMPEG video/BT656 video/CelB video/DV video/H261 video/H263 video/H263-1998 video/H263-2000 video/H264 video/JPEG video/MJ2 video/MP1S video/MP2P video/MP2T video/mp4 video/MP4V-ES video/MPV video/mpeg4 video/mpeg4-generic video/nv video/parityfec video/pointer video/raw video/rtx video/ogg video/webm]
-        AssetType.new :audio, :icon => 'audio', :mime_types => %w[audio/mpeg audio/mpg audio/ogg application/ogg audio/x-ms-wma audio/vnd.rn-realaudio audio/x-wav]
+        AssetType.new :image, :icon => 'image', :default_radius_tag => 'image', :styles => :standard, :extensions => %w[jpg jpeg png gif webp avif], :mime_types => %w[image/png image/x-png image/jpeg image/pjpeg image/jpg image/gif image/webp image/avif]
+        AssetType.new :video, :icon => 'video', :styles => :standard, :mime_types => %w[video/mp4 video/webm video/quicktime video/mpeg video/ogg video/mp2t application/x-mp4]
+        AssetType.new :audio, :icon => 'audio', :mime_types => %w[audio/mpeg audio/mpg audio/ogg audio/mp4 audio/wav audio/x-wav application/ogg audio/flac]
         AssetType.new :pdf, :icon => 'pdf', :extensions => %w{pdf}, :mime_types => %w[application/pdf application/x-pdf], :styles => :standard
-        AssetType.new :document, :icon => 'document', :mime_types => %w[application/msword application/rtf application/vnd.ms-excel application/vnd.ms-powerpoint application/vnd.ms-project application/vnd.ms-works text/plain text/html]
         AssetType.new :other, :icon => 'unknown'
 
         admin.asset ||= TrustyCms::AdminUI.load_default_asset_regions # loads the shards defined in AssetsAdminUI

data/vendor/extensions/clipped-extension/lib/generators/templates/clipped_config.rb

@@ -3,7 +3,8 @@ TrustyCms.config do |config|
   # Uncomment and change the settings below to customize the Clipped extension
 
   # The default settings
-  # config["assets.max_asset_size"] = 5 # megabytes
+  # config["assets.max_asset_size"] = 10 # megabytes
+  # config["assets.max_video_size"] = 50 # megabytes
   # config["assets.display_size"] = "normal"
   # config["assets.insertion_size"] = "normal"
   # config["assets.create_image_thumbnails?"] = true

data/yarn.lock

@@ -1735,9 +1735,9 @@ flat-cache@^3.0.4:
     rimraf "^3.0.2"
 
 flatted@^3.2.9:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.3.tgz#67c8fad95454a7c7abebf74bb78ee74a44023358"
-  integrity sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.4.2.tgz#f5c23c107f0f37de8dbdf24f13722b3b98d52726"
+  integrity sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==
 
 fs.realpath@^1.0.0:
   version "1.0.0"
@@ -2262,9 +2262,9 @@ lodash.truncate@^4.4.2:
   integrity sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==
 
 lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.21:
-  version "4.17.23"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.23.tgz#f113b0378386103be4f6893388c73d0bde7f2c5a"
-  integrity sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==
+  version "4.18.1"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.18.1.tgz#ff2b66c1f6326d59513de2407bf881439812771c"
+  integrity sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==
 
 log-symbols@^4.1.0:
   version "4.1.0"
@@ -2961,9 +2961,9 @@ picocolors@^1.1.1:
   integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
 
 picomatch@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
-  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.2.tgz#5a942915e26b372dc0f0e6753149a16e6b1c5601"
+  integrity sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==
 
 postcss-html@^0.36.0:
   version "0.36.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 7.1.0
+  version: 7.1.1
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-16 00:00:00.000000000 Z
+date: 2026-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-validator
@@ -941,6 +941,7 @@ files:
 - config/application.rb
 - config/boot.rb
 - config/database.mysql.yml
+- config/database.yml
 - config/environment.rb
 - config/environments/development.rb
 - config/environments/production.rb
@@ -1194,11 +1195,17 @@ files:
 - spec/dummy/config/secrets.yml
 - spec/dummy/config/storage.yml
 - spec/dummy/db/schema.rb
+- spec/dummy/log/development.log
+- spec/dummy/log/test.log
 - spec/dummy/package.json
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/dummy/tmp/cache/747/A70/TrustyCms%3A%3AConfig
+- spec/dummy/tmp/cache/85C/FA0/TrustyCms.cache_mtime
+- spec/dummy/tmp/local_secret.txt
+- spec/dummy/tmp/trusty_config_cache.txt
 - spec/dummy/yarn.lock
 - spec/factories/layout.rb
 - spec/factories/page.rb
@@ -1305,14 +1312,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.5
+      version: 3.3.4
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: A no-fluff content management system designed for small teams.
@@ -1351,11 +1358,17 @@ test_files:
 - spec/dummy/config/storage.yml
 - spec/dummy/config.ru
 - spec/dummy/db/schema.rb
+- spec/dummy/log/development.log
+- spec/dummy/log/test.log
 - spec/dummy/package.json
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/dummy/tmp/cache/747/A70/TrustyCms%3A%3AConfig
+- spec/dummy/tmp/cache/85C/FA0/TrustyCms.cache_mtime
+- spec/dummy/tmp/local_secret.txt
+- spec/dummy/tmp/trusty_config_cache.txt
 - spec/dummy/yarn.lock
 - spec/factories/layout.rb
 - spec/factories/page.rb