trusty-cms 5.5.9 → 5.6.1

data/spec/dummy/config/application.rb

@@ -31,7 +31,7 @@ module TrustyCms
 
     # Initialize extension paths
     config.initialize_extension_paths
-    extension_loader = ExtensionLoader.instance {|l| l.initializer = self }
+    extension_loader = ExtensionLoader.instance { |l| l.initializer = self }
     extension_loader.paths(:load).reverse_each do |path, value|
       config.autoload_paths.unshift path
       $LOAD_PATH.unshift path
@@ -101,7 +101,7 @@ module TrustyCms
     # config.action_controller.session_store = :cookie_store DEPRECATED
 
     # Activate observers that should always be running
-    #config.active_record.observers = :user_action_observer
+    # config.active_record.observers = :user_action_observer
 
     # The internationalization framework can be changed to have another default locale (standard is :en) or more load paths.
     # All files from config/locales/*.rb,yml are added automatically.
@@ -122,15 +122,15 @@ module TrustyCms
 
     config.after_initialize do
       extension_loader.load_extensions
-      extension_loader.load_extension_initalizers
+      extension_loader.load_extension_initializers
 
-      #Dir["#{TRUSTY_CMS_ROOT}/config/initializers/**/*.rb"].sort.each do |initializer|
+      # Dir["#{TRUSTY_CMS_ROOT}/config/initializers/**/*.rb"].sort.each do |initializer|
       #  load(initializer)
-      #end
+      # end
 
-      extension_loader.activate_extensions  # also calls initialize_views
-      #config.add_controller_paths(extension_loader.paths(:controller))
-      #config.add_eager_load_paths(extension_loader.paths(:eager_load))
+      extension_loader.activate_extensions # also calls initialize_views
+      # config.add_controller_paths(extension_loader.paths(:controller))
+      # config.add_eager_load_paths(extension_loader.paths(:eager_load))
 
       # Add new inflection rules using the following format:
       ActiveSupport::Inflector.inflections do |inflect|

data/spec/dummy/config/initializers/trusty_cms_config.rb

@@ -1,20 +1,23 @@
-TrustyCms.config do |config|
-  config.define 'admin.title', :default => "TrustyCms CMS"
-  config.define 'dev.host'
-  config.define 'local.timezone', :allow_change => true, :select_from => lambda { ActiveSupport::TimeZone::MAPPING.keys.sort }
-  config.define 'defaults.locale', :select_from => lambda { TrustyCms::AvailableLocales.locales }, :allow_blank => true
-  config.define 'defaults.page.parts', :default => "Body,Extended"
-  config.define 'defaults.page.status', :select_from => lambda { Status.selectable_values }, :allow_blank => false, :default => "Draft"
-  config.define 'defaults.page.filter', :select_from => lambda { TextFilter.descendants.map { |s| s.filter_name }.sort }, :allow_blank => true
-  config.define 'defaults.page.fields'
-  config.define 'pagination.param_name', :default => 'page'
-  config.define 'pagination.per_page_param_name', :default => 'per_page'
-  config.define 'admin.pagination.per_page', :type => :integer, :default => 50
-  config.define 'site.title', :default => "Your site title", :allow_blank => false
-  config.define 'site.host', :default => "www.example.com", :allow_blank => false
-  config.define 'user.allow_password_reset?', :default => true
-end
+Rails.application.reloader.to_prepare do
+  TrustyCms.config do |config|
+    config.define 'admin.title', :default => "TrustyCms CMS"
+    config.define 'dev.host'
+    config.define 'local.timezone', :allow_change => true, :select_from => lambda { ActiveSupport::TimeZone::MAPPING.keys.sort }
+    config.define 'defaults.locale', :select_from => lambda { TrustyCms::AvailableLocales.locales }, :allow_blank => true
+    config.define 'defaults.page.parts', :default => "Body,Extended"
+    config.define 'defaults.page.status', :select_from => lambda { Status.selectable_values }, :allow_blank => false, :default => "Draft"
+    config.define 'defaults.page.filter', :select_from => lambda { TextFilter.descendants.map { |s| s.filter_name }.sort }, :allow_blank => true
+    config.define 'defaults.page.fields'
+    config.define 'pagination.param_name', :default => 'page'
+    config.define 'pagination.per_page_param_name', :default => 'per_page'
+    config.define 'admin.pagination.per_page', :type => :integer, :default => 50
+    config.define 'site.title', :default => "Your site title", :allow_blank => false
+    config.define 'site.host', :default => "www.example.com", :allow_blank => false
+    config.define 'user.allow_password_reset?', :default => true
+  end
+
+  TrustyCms::Application.config do |config|
 
-TrustyCms::Application.config do |config|
+  end
 
 end

data/spec/dummy/db/schema.rb

@@ -2,34 +2,61 @@
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2016_10_27_141250) do
+ActiveRecord::Schema[7.0].define(version: 2023_10_19_192097) do
+  create_table "active_storage_attachments", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+    t.string "name", null: false
+    t.string "record_type", null: false
+    t.bigint "record_id", null: false
+    t.bigint "blob_id", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.index ["blob_id"], name: "index_active_storage_attachments_on_blob_id"
+    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|
+    t.string "key", null: false
+    t.string "filename", null: false
+    t.string "content_type"
+    t.text "metadata"
+    t.string "service_name", null: false
+    t.bigint "byte_size", null: false
+    t.string "checksum", null: false
+    t.datetime "created_at", precision: nil, null: false
+    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|
+    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", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "admins", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.string "email", default: "", null: false
     t.string "encrypted_password", default: "", null: false
     t.string "reset_password_token"
-    t.datetime "reset_password_sent_at"
-    t.datetime "remember_created_at"
+    t.datetime "reset_password_sent_at", precision: nil
+    t.datetime "remember_created_at", precision: nil
     t.integer "sign_in_count", default: 0, null: false
-    t.datetime "current_sign_in_at"
-    t.datetime "last_sign_in_at"
+    t.datetime "current_sign_in_at", precision: nil
+    t.datetime "last_sign_in_at", precision: nil
     t.string "current_sign_in_ip"
     t.string "last_sign_in_ip"
     t.string "confirmation_token"
-    t.datetime "confirmed_at"
-    t.datetime "confirmation_sent_at"
+    t.datetime "confirmed_at", precision: nil
+    t.datetime "confirmation_sent_at", precision: nil
     t.string "unconfirmed_email"
     t.integer "failed_attempts", default: 0, null: false
     t.string "unlock_token"
-    t.datetime "locked_at"
+    t.datetime "locked_at", precision: nil
     t.string "first_name"
     t.string "last_name"
     t.boolean "admin"
@@ -38,11 +65,11 @@ ActiveRecord::Schema.define(version: 2016_10_27_141250) do
     t.integer "site_id"
     t.integer "updated_by_id"
     t.text "notes"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
   end
 
-  create_table "assets", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "assets", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.string "caption"
     t.string "title"
     t.string "asset_file_name"
@@ -50,31 +77,31 @@ ActiveRecord::Schema.define(version: 2016_10_27_141250) do
     t.integer "asset_file_size"
     t.integer "created_by_id"
     t.integer "updated_by_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.string "uuid"
     t.integer "original_width"
     t.integer "original_height"
     t.string "original_extension"
   end
 
-  create_table "config", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "config", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", 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", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "extension_meta", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.string "name"
     t.integer "schema_version", default: 0
     t.boolean "enabled", default: true
   end
 
-  create_table "layouts", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "layouts", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.string "name", limit: 100
     t.text "content"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.integer "created_by_id"
     t.integer "updated_by_id"
     t.string "content_type", limit: 40
@@ -82,28 +109,28 @@ ActiveRecord::Schema.define(version: 2016_10_27_141250) do
     t.integer "site_id"
   end
 
-  create_table "page_attachments", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "page_attachments", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.integer "asset_id"
     t.integer "page_id"
     t.integer "position"
   end
 
-  create_table "page_fields", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "page_fields", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", 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", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "page_parts", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.string "name", limit: 100
     t.string "filter_id", limit: 25
-    t.text "content", limit: 16777215
+    t.text "content", size: :medium
     t.integer "page_id"
     t.index ["page_id", "name"], name: "parts_by_page"
   end
 
-  create_table "pages", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "pages", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.string "title"
     t.string "slug", limit: 100
     t.string "breadcrumb", limit: 160
@@ -111,9 +138,9 @@ ActiveRecord::Schema.define(version: 2016_10_27_141250) do
     t.integer "status_id", default: 1, null: false
     t.integer "parent_id"
     t.integer "layout_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.datetime "published_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
+    t.datetime "published_at", precision: nil
     t.integer "created_by_id"
     t.integer "updated_by_id"
     t.boolean "virtual", default: false, null: false
@@ -128,34 +155,34 @@ ActiveRecord::Schema.define(version: 2016_10_27_141250) do
     t.index ["virtual", "status_id"], name: "pages_published"
   end
 
-  create_table "sessions", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "sessions", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.string "session_id"
     t.text "data"
-    t.datetime "updated_at"
+    t.datetime "updated_at", precision: nil
     t.index ["session_id"], name: "index_sessions_on_session_id"
     t.index ["updated_at"], name: "index_sessions_on_updated_at"
   end
 
-  create_table "sites", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "sites", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.string "name"
     t.string "domain"
     t.integer "homepage_id"
     t.integer "position", default: 0
     t.integer "created_by_id"
-    t.datetime "created_at"
+    t.datetime "created_at", precision: nil
     t.integer "updated_by_id"
-    t.datetime "updated_at"
+    t.datetime "updated_at", precision: nil
     t.string "subtitle"
     t.string "abbreviation"
     t.string "base_domain"
   end
 
-  create_table "snippets", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "snippets", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.string "name", limit: 100, default: "", null: false
     t.string "filter_id", limit: 25
     t.text "content"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.integer "created_by_id"
     t.integer "updated_by_id"
     t.integer "lock_version", default: 0
@@ -163,15 +190,15 @@ ActiveRecord::Schema.define(version: 2016_10_27_141250) do
     t.index ["name", "site_id"], name: "name_site_id", unique: true
   end
 
-  create_table "users", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "users", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.string "name", limit: 100
     t.string "email"
     t.string "login", limit: 40, default: "", null: false
     t.string "password", limit: 40
     t.boolean "admin", default: false, null: false
     t.boolean "designer", default: false, null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.integer "created_by_id"
     t.integer "updated_by_id"
     t.string "salt"
@@ -181,7 +208,9 @@ ActiveRecord::Schema.define(version: 2016_10_27_141250) do
     t.integer "site_id"
     t.string "locale"
     t.string "password_reset_token"
-    t.datetime "password_reset_sent_at"
+    t.datetime "password_reset_sent_at", precision: nil
   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

@@ -25,31 +25,31 @@ a general purpose content management system--not merely a blogging engine.'
   s.license = 'MIT'
   s.test_files = Dir['spec/**/*']
   s.add_dependency 'activestorage-validator'
-  s.add_dependency 'acts_as_list',    '>= 0.9.5', '< 1.2.0'
-  s.add_dependency 'acts_as_tree',    '~> 2.9.1'
-  s.add_dependency 'ckeditor',        '>= 4.2.2', '< 4.4.0'
-  s.add_dependency 'delocalize',      '>= 0.2', '< 2.0'
+  s.add_dependency 'acts_as_list', '>= 0.9.5', '< 1.2.0'
+  s.add_dependency 'acts_as_tree', '~> 2.9.1'
+  s.add_dependency 'ckeditor', '>= 4.2.2', '< 4.4.0'
+  s.add_dependency 'delocalize', '>= 0.2', '< 2.0'
   s.add_dependency 'devise'
-  s.add_dependency 'execjs',          '~> 2.7'
-  s.add_dependency 'haml'
+  s.add_dependency 'execjs', '~> 2.7'
+  s.add_dependency 'haml', '>= 5.0', '< 6.0'
   s.add_dependency 'haml-rails'
-  s.add_dependency 'highline',        '>= 1.7.8', '< 2.2.0'
+  s.add_dependency 'highline', '>= 1.7.8', '< 2.2.0'
   s.add_dependency 'image_processing'
   s.add_dependency 'kraken-io'
   s.add_dependency 'mini_racer'
   s.add_dependency 'mysql2'
-  s.add_dependency 'rack',            '>= 2.0.1', '< 3.1.0'
-  s.add_dependency 'rack-cache',      '~> 1.7'
-  s.add_dependency 'radius',          '~> 0.7'
+  s.add_dependency 'rack', '>= 2.0.1', '< 3.1.0'
+  s.add_dependency 'rack-cache', '~> 1.7'
+  s.add_dependency 'radius', '~> 0.7'
   s.add_dependency 'rails'
-  s.add_dependency 'rake',            '< 14.0'
-  s.add_dependency 'rdoc',            '>= 5.1', '< 7.0'
-  s.add_dependency 'RedCloth',        '4.3.2'
+  s.add_dependency 'rake', '< 14.0'
+  s.add_dependency 'rdoc', '>= 5.1', '< 7.0'
+  s.add_dependency 'RedCloth', '4.3.2'
   s.add_dependency 'roadie-rails'
   s.add_dependency 'sass-rails'
-  s.add_dependency 'stringex',        '>= 2.7.1', '< 2.9.0'
-  s.add_dependency 'tzinfo',          '>= 1.2.3', '< 2.1.0'
-  s.add_dependency 'uglifier',        '>= 3.2', '< 5.0'
+  s.add_dependency 'stringex', '>= 2.7.1', '< 2.9.0'
+  s.add_dependency 'tzinfo', '>= 1.2.3', '< 2.1.0'
+  s.add_dependency 'uglifier', '>= 3.2', '< 5.0'
   s.add_dependency 'uuidtools', '>= 2.1.5', '< 2.3.0'
   s.add_dependency 'will_paginate', '>= 3', '< 5'
 end

data/vendor/extensions/multi-site-extension/multi_site_extension.rb

@@ -1,5 +1,3 @@
-require_dependency 'application_controller'
-
 class MultiSiteExtension < TrustyCms::Extension
   version "3.0.2"
   description %{ Enables virtual sites to be created with associated domain names.
@@ -7,7 +5,6 @@ class MultiSiteExtension < TrustyCms::Extension
                  individual site) and allows model classes to be scoped by site. }
   url "http://trustarts.org/"
 
-
   def activate
 
     # Model extensions
@@ -19,7 +16,7 @@ class MultiSiteExtension < TrustyCms::Extension
     Admin::ResourceController.send :include, MultiSite::ApplicationControllerExtensions
     ApplicationController.send :include, MultiSite::ApplicationControllerFilterExtensions
 
-    #ActionController::Base.send :include, MultiSite::ApplicationControllerExtensions
+    # ActionController::Base.send :include, MultiSite::ApplicationControllerExtensions
     SiteController.send :include, MultiSite::SiteControllerExtensions
     Admin::ResourceController.send :include, MultiSite::ResourceControllerExtensions
     Admin::PagesController.send :include, MultiSite::PagesControllerExtensions
@@ -39,7 +36,6 @@ class MultiSiteExtension < TrustyCms::Extension
       admin.snippets.edit.add :form, "choose_site", :before => "edit_filter" unless admin.snippets.edit.form.include?("choose_site")
     end
 
-
     unless defined? admin.site
       TrustyCms::AdminUI.send :include, MultiSite::AdminUI
       admin.site = TrustyCms::AdminUI.load_default_site_regions