trusty-cms 7.0.7 → 7.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21602eb92fa965a61823801ab54c65663f5c91e13a5c379b0e6653868934285e
-  data.tar.gz: d479f8e082e2efc68e9feb96b461e3ebd66cf681ec6bb2a0c5e6f7cead81fb59
+  metadata.gz: 170bd1825c9f7ff25e1bcf51d8ac424e32612d8415a7d640fc441195e9bddb4c
+  data.tar.gz: 2c367de40351f12fd2d71e2f4fb9ff842a0379fe07f313c8e040a43979bc5e8e
 SHA512:
-  metadata.gz: 0a73dba1d21d9ad6998e71cb82aa8e704a63a173e66512d9aa029f26ce835e610356b58f321c5daad20e1cde525c1724fd222b3c571c2ea8ea062927f1f7f8a9
-  data.tar.gz: d12a09d633c3b63817c9fa725bd4b30d74d590cf69859d2d580348ba8bebf26ccc6c72bbda4aeae4d7f599a1cc69a2cb2c453d4ce85b68ce19af78f2e8255d31
+  metadata.gz: 1247c66e283d00de5c30181d53d356271c165401a40de6c8ffbf6d4cbc9dcb31d96e980daea0ac150b64abccd4101dc027b7484f8dfa965db74c36628e0089a6
+  data.tar.gz: eb1e804f9a828378cc4cf4553c0761753c08b133011409cbc514f79dae86ef377a69c74ef20125f3d472f997d68dc772f291126cd8413b803f775b76e249d5f6

data/Gemfile

@@ -7,8 +7,8 @@ source 'https://rubygems.org'
 # requires trusty and therefore pulls in every
 # dependency mentioned in trusty.gemspec.
 
-gem 'paper_trail'
-gem 'paper_trail-association_tracking'
+gem 'paper_trail', '~> 16.0.0'
+gem 'paper_trail-association_tracking', '~> 2.2.1'
 gem 'psych', '5.2.2'
 gem 'trustygems', '~> 0.2.0'
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (7.0.7)
+    trusty-cms (7.0.8)
       RedCloth (= 4.3.3)
       activestorage-validator
       acts_as_list (>= 0.9.5, < 1.3.0)
@@ -21,6 +21,8 @@ PATH
       mini_racer
       mutex_m
       mysql2
+      paper_trail (~> 16.0.0)
+      paper_trail-association_tracking (~> 2.2.1)
       rack (>= 2.0.1, < 3.2.0)
       rack-cache (~> 1.7)
       radius (~> 0.7)
@@ -429,8 +431,8 @@ DEPENDENCIES
   file_validators
   launchy (~> 3.0.1)
   mysql2
-  paper_trail
-  paper_trail-association_tracking
+  paper_trail (~> 16.0.0)
+  paper_trail-association_tracking (~> 2.2.1)
   poltergeist (~> 1.18.1)
   pry-byebug
   psych (= 5.2.2)

data/INSTALL.md

@@ -14,9 +14,11 @@ From within the directory containing your TrustyCMS instance:
 4. Run the Trusty CMS generator to get the project into shape: `rails g trusty_cms [project_name]`.
     - This will ask you if you want to replace a number of existing files (like application.rb); reply Y to all.
 
-5. add config.extensions = [ :snippets, :clipped, :layouts, :multi_site ] to enable them in application.rb
+5. Add `config.extensions = [ :snippets, :clipped, :layouts, :multi_site ]` to enable them in application.rb
+
+6. Add `config.active_record.yaml_column_permitted_classes = [Symbol, Date, Time, ActiveSupport::TimeWithZone, ActiveSupport::TimeZone]` to application.rb. This is required for pages to save previous versions.
 
 7. Add utf8 encoding to your db.yml
 
-6. Run `bundle exec rake db:setup`, `bundle exec rake trusty_cms:install:migrations`, then
+8. Run `bundle exec rake db:setup`, `bundle exec rake trusty_cms:install:migrations`, then
    `bundle exec rake db:bootstrap`.

data/app/views/admin/pages/_fields.html.haml

@@ -30,6 +30,9 @@
         = render :partial => 'admin/page_parts/page_part', :collection => @page.parts
     = render_region :parts_bottom, :locals => {:f => fields}
 
+#previous-versions
+  = render :partial => 'admin/pages/previous_versions'
+
 .set
   - render_region :layout, :locals => {:f => fields} do |layout|
     - layout.edit_layout do

data/app/views/admin/pages/_previous_versions.haml

@@ -0,0 +1,28 @@
+%fieldset
+  %h4
+    %i.fas.fa-clock-rotate-left
+    Previous Versions
+
+  - if @versions.present?
+    %section
+      %table
+        %thead
+          %tr
+            %th Date Updated
+            %th Time Updated
+            %th Updated By
+            %th Action
+        %tbody{ :id => 'versions-table' }
+          - @versions.each do |version|
+            %tr
+              %td= version[:update_date]
+              %td= version[:update_time]
+              %td= version[:updated_by]
+              %td
+                = link_to 'Restore', 
+                  restore_version_admin_page_path(@page.id, version_index: version[:index]),
+                  method: :put,
+                  data: { confirm: 'Are you sure you want to restore this version?' }
+  - else
+    %section
+      %p No previous versions are available.

data/config/initializers/paper_trail.rb

@@ -1,2 +1,2 @@
-PaperTrail.config.track_associations = true
 PaperTrail.config.version_limit = 5
+PaperTrail.config.track_associations = true

data/lib/trusty_cms/engine.rb

@@ -1,3 +1,9 @@
+require 'ckeditor'
+require 'devise'
+require 'ransack'
+require 'paper_trail'
+require 'paper_trail-association_tracking'
+
 module TrustyCms
   class Engine < Rails::Engine
     isolate_namespace TrustyCms
@@ -19,8 +25,3 @@ module TrustyCms
     end
   end
 end
-
-require 'ckeditor'
-require 'devise'
-require 'ransack'
-

data/lib/trusty_cms/version.rb

@@ -1,4 +1,4 @@
 module TrustyCms
-  VERSION = '7.0.7'.freeze
+  VERSION = '7.0.8'.freeze
 end
 

data/spec/dummy/db/schema.rb

@@ -10,8 +10,8 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2024_11_08_172942) do
-  create_table "active_storage_attachments", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+ActiveRecord::Schema[7.0].define(version: 2025_01_03_191134) do
+  create_table "active_storage_attachments", charset: "utf8", force: :cascade do |t|
     t.string "name", null: false
     t.string "record_type", null: false
     t.bigint "record_id", null: false
@@ -21,7 +21,7 @@ ActiveRecord::Schema[7.0].define(version: 2024_11_08_172942) do
     t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true
   end
 
-  create_table "active_storage_blobs", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "active_storage_blobs", charset: "utf8", force: :cascade do |t|
     t.string "key", null: false
     t.string "filename", null: false
     t.string "content_type"
@@ -33,13 +33,13 @@ ActiveRecord::Schema[7.0].define(version: 2024_11_08_172942) do
     t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true
   end
 
-  create_table "active_storage_variant_records", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "active_storage_variant_records", charset: "utf8", force: :cascade do |t|
     t.bigint "blob_id", null: false
     t.string "variation_digest", null: false
     t.index ["blob_id", "variation_digest"], name: "index_active_storage_variant_records_uniqueness", unique: true
   end
 
-  create_table "admins", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "admins", charset: "utf8", force: :cascade do |t|
     t.string "email", default: "", null: false
     t.string "encrypted_password", default: "", null: false
     t.string "reset_password_token"
@@ -69,14 +69,14 @@ ActiveRecord::Schema[7.0].define(version: 2024_11_08_172942) do
     t.datetime "updated_at", precision: nil, null: false
   end
 
-  create_table "admins_sites", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "admins_sites", charset: "utf8", force: :cascade do |t|
     t.integer "admin_id", null: false
     t.integer "site_id", null: false
     t.index ["admin_id"], name: "index_admins_sites_on_admin_id"
     t.index ["site_id"], name: "index_admins_sites_on_site_id"
   end
 
-  create_table "assets", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "assets", charset: "utf8", force: :cascade do |t|
     t.string "caption"
     t.string "title"
     t.string "asset_file_name"
@@ -92,19 +92,19 @@ ActiveRecord::Schema[7.0].define(version: 2024_11_08_172942) do
     t.string "original_extension"
   end
 
-  create_table "config", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "config", charset: "utf8", force: :cascade do |t|
     t.string "key", limit: 40, default: "", null: false
     t.string "value", default: ""
     t.index ["key"], name: "key", unique: true
   end
 
-  create_table "extension_meta", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "extension_meta", charset: "utf8", force: :cascade do |t|
     t.string "name"
     t.integer "schema_version", default: 0
     t.boolean "enabled", default: true
   end
 
-  create_table "layouts", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "layouts", charset: "utf8", force: :cascade do |t|
     t.string "name", limit: 100
     t.text "content"
     t.datetime "created_at", precision: nil
@@ -116,20 +116,20 @@ ActiveRecord::Schema[7.0].define(version: 2024_11_08_172942) do
     t.integer "site_id"
   end
 
-  create_table "page_attachments", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "page_attachments", charset: "utf8", force: :cascade do |t|
     t.integer "asset_id"
     t.integer "page_id"
     t.integer "position"
   end
 
-  create_table "page_fields", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "page_fields", charset: "utf8", force: :cascade do |t|
     t.integer "page_id"
     t.string "name"
     t.string "content"
     t.index ["page_id", "name", "content"], name: "index_page_fields_on_page_id_and_name_and_content"
   end
 
-  create_table "page_parts", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "page_parts", charset: "utf8", force: :cascade do |t|
     t.string "name", limit: 100
     t.string "filter_id", limit: 25
     t.text "content", size: :medium
@@ -137,7 +137,7 @@ ActiveRecord::Schema[7.0].define(version: 2024_11_08_172942) do
     t.index ["page_id", "name"], name: "parts_by_page"
   end
 
-  create_table "pages", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "pages", charset: "utf8", force: :cascade do |t|
     t.string "title"
     t.string "slug", limit: 100
     t.string "breadcrumb", limit: 160
@@ -162,7 +162,7 @@ ActiveRecord::Schema[7.0].define(version: 2024_11_08_172942) do
     t.index ["virtual", "status_id"], name: "pages_published"
   end
 
-  create_table "sessions", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "sessions", charset: "utf8", force: :cascade do |t|
     t.string "session_id"
     t.text "data"
     t.datetime "updated_at", precision: nil
@@ -170,7 +170,7 @@ ActiveRecord::Schema[7.0].define(version: 2024_11_08_172942) do
     t.index ["updated_at"], name: "index_sessions_on_updated_at"
   end
 
-  create_table "sites", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "sites", charset: "utf8", force: :cascade do |t|
     t.string "name"
     t.string "domain"
     t.integer "homepage_id"
@@ -184,7 +184,7 @@ ActiveRecord::Schema[7.0].define(version: 2024_11_08_172942) do
     t.string "base_domain"
   end
 
-  create_table "snippets", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "snippets", charset: "utf8", force: :cascade do |t|
     t.string "name", limit: 100, default: "", null: false
     t.string "filter_id", limit: 25
     t.text "content"
@@ -197,7 +197,7 @@ ActiveRecord::Schema[7.0].define(version: 2024_11_08_172942) do
     t.index ["name", "site_id"], name: "name_site_id", unique: true
   end
 
-  create_table "users", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "users", charset: "utf8", force: :cascade do |t|
     t.string "name", limit: 100
     t.string "email"
     t.string "login", limit: 40, default: "", null: false
@@ -218,6 +218,27 @@ ActiveRecord::Schema[7.0].define(version: 2024_11_08_172942) do
     t.datetime "password_reset_sent_at", precision: nil
   end
 
+  create_table "version_associations", charset: "utf8", force: :cascade do |t|
+    t.integer "version_id"
+    t.string "foreign_key_name", null: false
+    t.integer "foreign_key_id"
+    t.string "foreign_type"
+    t.index ["foreign_key_name", "foreign_key_id", "foreign_type"], name: "index_version_associations_on_foreign_key"
+    t.index ["version_id"], name: "index_version_associations_on_version_id"
+  end
+
+  create_table "versions", charset: "utf8mb4", force: :cascade do |t|
+    t.string "whodunnit"
+    t.datetime "created_at"
+    t.bigint "item_id", null: false
+    t.string "item_type", limit: 191, null: false
+    t.string "event", null: false
+    t.text "object", size: :long
+    t.integer "transaction_id"
+    t.index ["item_type", "item_id"], name: "index_versions_on_item_type_and_item_id"
+    t.index ["transaction_id"], name: "index_versions_on_transaction_id"
+  end
+
   add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
   add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
 end

data/trusty_cms.gemspec

@@ -43,6 +43,8 @@ a general purpose content management system--not merely a blogging engine.'
   s.add_dependency 'mini_racer'
   s.add_dependency 'mutex_m'
   s.add_dependency 'mysql2'
+  s.add_dependency 'paper_trail', '~> 16.0.0'
+  s.add_dependency 'paper_trail-association_tracking', '~> 2.2.1'
   s.add_dependency 'rack', '>= 2.0.1', '< 3.2.0'
   s.add_dependency 'rack-cache', '~> 1.7'
   s.add_dependency 'radius', '~> 0.7'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 7.0.7
+  version: 7.0.8
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-01-08 00:00:00.000000000 Z
+date: 2025-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-validator
@@ -292,6 +292,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: paper_trail
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 16.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 16.0.0
+- !ruby/object:Gem::Dependency
+  name: paper_trail-association_tracking
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -790,6 +818,7 @@ files:
 - app/views/admin/pages/_meta_row.html.haml
 - app/views/admin/pages/_node.html.haml
 - app/views/admin/pages/_popups.html.haml
+- app/views/admin/pages/_previous_versions.haml
 - app/views/admin/pages/children.html.haml
 - app/views/admin/pages/edit.html.haml
 - app/views/admin/pages/index.html.haml