trusty-cms 5.5.1 → 5.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1fe00a8e1fbde680ce99052e154774972e5bedaa0770e2b2aa12fb19771f642
-  data.tar.gz: 70ba4a618e0a4c576879c67aecebbda1d00f4a21c07138709e2320a6f7d1c361
+  metadata.gz: 8a0b63218f1b13cd9e62d0e9dd511832ce0b183b12dce7f448ae930a8f85aa37
+  data.tar.gz: 33a0c7bd22e54fb7d1b67faf6055fef788a1b99094b02a91898737f4012c05d1
 SHA512:
-  metadata.gz: aed01177b5e39f78c398e24c8105d785325df410d8e272788097705cbcd02599d9a7246c14df3010d94ad1ab2ef293d83e7c292349ed19cd72e02970c7333bc9
-  data.tar.gz: c4fa21d06a553b7eaf9dd8a4d20798466986fa0b9d41ee698f89d8b37c390645df33a5a87500487be3b29ffa3a0402cba774a12cafda0203eebacdb4e81f3b0e
+  metadata.gz: 626ce80ae15fe6a50ec19ea7f4e05897383ad8d3f2718bd97ffebc3ced51164d458d04ba857ce2a1b1e21e447c2ab270355f8e515e9586507222c11c82480803
+  data.tar.gz: 987ec216728bfa971e3fedca17b9672db471ff324472dfac87f1eb84ff27abe60ef2875f4123dde74f1c5ee586aa2bfdf0a50a8513d023b4cc842001117619a3

data/Gemfile

@@ -21,7 +21,7 @@ group :development, :test do
   gem 'mysql2'
   gem 'poltergeist', '~> 1.18.1'
   gem 'pry-byebug'
-  gem 'psych', '4.0.4'
+  gem 'psych', '5.0.2'
   gem 'rails-observers'
   gem 'rspec-rails'
   gem 'simplecov'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (5.5)
+    trusty-cms (5.5.6)
       RedCloth (= 4.3.2)
       activestorage-validator
       acts_as_list (>= 0.9.5, < 1.1.0)
@@ -12,12 +12,12 @@ PATH
       execjs (~> 2.7)
       haml (~> 5.2.2)
       haml-rails (~> 2.0)
-      highline (>= 1.7.8, < 2.1.0)
+      highline (>= 1.7.8, < 2.2.0)
       image_processing
       kraken-io
       mini_racer
       mysql2
-      rack (>= 2.0.1, < 2.3.0)
+      rack (>= 2.0.1, < 3.1.0)
       rack-cache (~> 1.7)
       radius (~> 0.7)
       rails
@@ -35,62 +35,62 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    actioncable (6.1.7)
-      actionpack (= 6.1.7)
-      activesupport (= 6.1.7)
+    actioncable (6.1.7.1)
+      actionpack (= 6.1.7.1)
+      activesupport (= 6.1.7.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.7)
-      actionpack (= 6.1.7)
-      activejob (= 6.1.7)
-      activerecord (= 6.1.7)
-      activestorage (= 6.1.7)
-      activesupport (= 6.1.7)
+    actionmailbox (6.1.7.1)
+      actionpack (= 6.1.7.1)
+      activejob (= 6.1.7.1)
+      activerecord (= 6.1.7.1)
+      activestorage (= 6.1.7.1)
+      activesupport (= 6.1.7.1)
       mail (>= 2.7.1)
-    actionmailer (6.1.7)
-      actionpack (= 6.1.7)
-      actionview (= 6.1.7)
-      activejob (= 6.1.7)
-      activesupport (= 6.1.7)
+    actionmailer (6.1.7.1)
+      actionpack (= 6.1.7.1)
+      actionview (= 6.1.7.1)
+      activejob (= 6.1.7.1)
+      activesupport (= 6.1.7.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.7)
-      actionview (= 6.1.7)
-      activesupport (= 6.1.7)
+    actionpack (6.1.7.1)
+      actionview (= 6.1.7.1)
+      activesupport (= 6.1.7.1)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.7)
-      actionpack (= 6.1.7)
-      activerecord (= 6.1.7)
-      activestorage (= 6.1.7)
-      activesupport (= 6.1.7)
+    actiontext (6.1.7.1)
+      actionpack (= 6.1.7.1)
+      activerecord (= 6.1.7.1)
+      activestorage (= 6.1.7.1)
+      activesupport (= 6.1.7.1)
       nokogiri (>= 1.8.5)
-    actionview (6.1.7)
-      activesupport (= 6.1.7)
+    actionview (6.1.7.1)
+      activesupport (= 6.1.7.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.7)
-      activesupport (= 6.1.7)
+    activejob (6.1.7.1)
+      activesupport (= 6.1.7.1)
       globalid (>= 0.3.6)
-    activemodel (6.1.7)
-      activesupport (= 6.1.7)
-    activerecord (6.1.7)
-      activemodel (= 6.1.7)
-      activesupport (= 6.1.7)
-    activestorage (6.1.7)
-      actionpack (= 6.1.7)
-      activejob (= 6.1.7)
-      activerecord (= 6.1.7)
-      activesupport (= 6.1.7)
+    activemodel (6.1.7.1)
+      activesupport (= 6.1.7.1)
+    activerecord (6.1.7.1)
+      activemodel (= 6.1.7.1)
+      activesupport (= 6.1.7.1)
+    activestorage (6.1.7.1)
+      actionpack (= 6.1.7.1)
+      activejob (= 6.1.7.1)
+      activerecord (= 6.1.7.1)
+      activesupport (= 6.1.7.1)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
     activestorage-validator (0.2.2)
       rails (>= 6.0.4.1)
-    activesupport (6.1.7)
+    activesupport (6.1.7.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -121,7 +121,7 @@ GEM
     coderay (1.1.3)
     concurrent-ruby (1.1.10)
     crass (1.0.6)
-    css_parser (1.12.0)
+    css_parser (1.14.0)
       addressable
     database_cleaner (2.0.1)
       database_cleaner-active_record (~> 2.0.0)
@@ -150,7 +150,7 @@ GEM
     file_validators (3.0.0)
       activemodel (>= 3.2)
       mime-types (>= 1.0)
-    globalid (1.0.0)
+    globalid (1.0.1)
       activesupport (>= 5.0)
     haml (5.2.2)
       temple (>= 0.8.0)
@@ -160,26 +160,25 @@ GEM
       activesupport (>= 5.1)
       haml (>= 4.0.6)
       railties (>= 5.1)
-    highline (2.0.3)
-    httparty (0.20.0)
-      mime-types (~> 3.0)
+    highline (2.1.0)
+    httparty (0.21.0)
+      mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
-    json (2.6.2)
+    json (2.6.3)
     kraken-io (0.1.3)
       activesupport
       httparty
       json
       multipart-post
-    launchy (2.5.0)
-      addressable (~> 2.7)
+    launchy (2.5.2)
+      addressable (~> 2.8)
     libv8-node (16.10.0.0-x86_64-darwin)
-    libv8-node (16.10.0.0-x86_64-linux)
-    loofah (2.19.0)
+    loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -188,9 +187,10 @@ GEM
     method_source (1.0.0)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0225)
-    mini_magick (4.11.0)
+    mime-types-data (3.2022.0105)
+    mini_magick (4.12.0)
     mini_mime (1.1.2)
+    mini_portile2 (2.6.1)
     mini_racer (0.6.3)
       libv8-node (~> 16.10.0.0)
     minitest (5.15.0)
@@ -198,9 +198,8 @@ GEM
     multipart-post (2.2.3)
     mysql2 (0.5.4)
     nio4r (2.5.8)
-    nokogiri (1.12.5-x86_64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.12.5-x86_64-linux)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     poltergeist (1.18.1)
@@ -213,52 +212,52 @@ GEM
     pry-byebug (3.9.0)
       byebug (~> 11.0)
       pry (~> 0.13.0)
-    psych (4.0.4)
+    psych (5.0.2)
       stringio
     public_suffix (4.0.7)
-    racc (1.6.0)
-    rack (2.2.4)
+    racc (1.6.2)
+    rack (2.2.6.2)
     rack-cache (1.13.0)
       rack (>= 0.4)
     rack-test (2.0.2)
       rack (>= 1.3)
     radius (0.7.5)
-    rails (6.1.7)
-      actioncable (= 6.1.7)
-      actionmailbox (= 6.1.7)
-      actionmailer (= 6.1.7)
-      actionpack (= 6.1.7)
-      actiontext (= 6.1.7)
-      actionview (= 6.1.7)
-      activejob (= 6.1.7)
-      activemodel (= 6.1.7)
-      activerecord (= 6.1.7)
-      activestorage (= 6.1.7)
-      activesupport (= 6.1.7)
+    rails (6.1.7.1)
+      actioncable (= 6.1.7.1)
+      actionmailbox (= 6.1.7.1)
+      actionmailer (= 6.1.7.1)
+      actionpack (= 6.1.7.1)
+      actiontext (= 6.1.7.1)
+      actionview (= 6.1.7.1)
+      activejob (= 6.1.7.1)
+      activemodel (= 6.1.7.1)
+      activerecord (= 6.1.7.1)
+      activestorage (= 6.1.7.1)
+      activesupport (= 6.1.7.1)
       bundler (>= 1.15.0)
-      railties (= 6.1.7)
+      railties (= 6.1.7.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.3)
-      loofah (~> 2.3)
+    rails-html-sanitizer (1.4.4)
+      loofah (~> 2.19, >= 2.19.1)
     rails-observers (0.1.5)
       activemodel (>= 4.0)
-    railties (6.1.7)
-      actionpack (= 6.1.7)
-      activesupport (= 6.1.7)
+    railties (6.1.7.1)
+      actionpack (= 6.1.7.1)
+      activesupport (= 6.1.7.1)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
     rake (13.0.6)
-    rdoc (6.4.0)
+    rdoc (6.5.0)
       psych (>= 4.0.0)
     regexp_parser (2.1.1)
     responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
-    roadie (5.0.1)
+    roadie (5.1.0)
       css_parser (~> 1.4)
       nokogiri (~> 1.8)
     roadie-rails (3.0.0)
@@ -266,10 +265,10 @@ GEM
       roadie (~> 5.0)
     rspec-core (3.12.0)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.0)
+    rspec-expectations (3.12.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.0)
+    rspec-mocks (3.12.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-rails (6.0.1)
@@ -293,21 +292,21 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    simplecov (0.21.2)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.3)
-    sprockets (4.1.1)
+    simplecov_json_formatter (0.1.4)
+    sprockets (4.2.0)
       concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
+      rack (>= 2.2.4, < 4)
     sprockets-rails (3.4.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     stringex (2.8.5)
-    stringio (3.0.2)
+    stringio (3.0.4)
     temple (0.9.1)
     terrapin (0.6.0)
       climate_control (>= 0.0.3, < 1.0)
@@ -328,12 +327,13 @@ GEM
     will_paginate (3.3.1)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.3)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   x86_64-darwin-18
   x86_64-darwin-20
   x86_64-darwin-21
+  x86_64-darwin-22
   x86_64-linux
 
 DEPENDENCIES
@@ -346,7 +346,7 @@ DEPENDENCIES
   mysql2
   poltergeist (~> 1.18.1)
   pry-byebug
-  psych (= 4.0.4)
+  psych (= 5.0.2)
   rails-observers
   rspec-rails
   simplecov
@@ -354,4 +354,4 @@ DEPENDENCIES
   trustygems (~> 0.2.0)
 
 BUNDLED WITH
-   2.3.4
+   2.4.4

data/app/controllers/admin/resource_controller.rb

@@ -214,11 +214,6 @@ class Admin::ResourceController < ApplicationController
     flash.now[:error] = t('resource_controller.validation_errors')
   end
 
-  def announce_removed
-    ActiveSupport::Deprecation.warn('announce_removed is no longer encouraged in TrustyCms 0.9.x.', caller)
-    flash[:notice] = t('resource_controller.removed', humanized_model_name: humanized_model_name)
-  end
-
   def announce_not_found
     flash[:notice] = t('resource_controller.not_found', humanized_model_name: humanized_model_name)
   end

data/app/models/page.rb

@@ -30,7 +30,6 @@ class Page < ActiveRecord::Base
 
   include TrustyCms::Taggable
   include StandardTags
-  include DeprecatedTags
   include Annotatable
 
   annotate :description
@@ -213,7 +212,6 @@ class Page < ActiveRecord::Base
     end
     slug_child
   end
-  alias_method :find_by_url, :find_by_path
 
   def update_status
     self.published_at = Time.zone.now if published? && published_at == nil
@@ -249,11 +247,6 @@ class Page < ActiveRecord::Base
       root.find_by_path(path, live)
     end
 
-    def find_by_url(*args)
-      ActiveSupport::Deprecation.warn("`find_by_url' has been deprecated; use `find_by_path' instead.", caller)
-      find_by_path(*args)
-    end
-
     def date_column_names
       columns.collect { |c| c.name if c.sql_type =~ /(date|time)/ }.compact
     end

data/app/models/standard_tags.rb

@@ -34,7 +34,6 @@ module StandardTags
   tag 'path' do |tag|
     relative_url_for(tag.locals.page.path, tag.globals.page.request)
   end
-  deprecated_tag 'url', substitute: 'path', deadline: '1.2'
 
   desc %{
     Gives access to a page's children.
@@ -592,7 +591,6 @@ module StandardTags
       tag.expand
     end
   end
-  deprecated_tag 'if_url', substitute: 'if_path', deadline: '1.2'
 
   desc %{
     The opposite of the @if_path@ tag.
@@ -608,7 +606,6 @@ module StandardTags
       tag.expand
     end
   end
-  deprecated_tag 'unless_url', substitute: 'unless_path', deadline: '1.2'
 
   desc %{
     Renders the contained elements if the current contextual page is either the actual page or one of its parents.
@@ -798,7 +795,7 @@ module StandardTags
     tag.expand
     raise TagError.new("`navigation' tag must include a `normal' tag") unless hash.has_key? :normal
 
-    ActiveSupport::Deprecation.warn("The 'urls' attribute of the r:navigation tag has been deprecated in favour of 'paths'. Please update your site.") if tag.attr['urls']
+    # ActiveSupport::Deprecation.warn("The 'urls' attribute of the r:navigation tag has been deprecated in favour of 'paths'. Please update your site.") if tag.attr['urls']
     result = []
     pairs = (tag.attr['paths'] || tag.attr['urls']).to_s.split('|').map do |pair|
       parts = pair.split(':')
@@ -837,9 +834,9 @@ module StandardTags
       hash[symbol]
     end
   end
-  tag 'navigation:url' do |tag|
+  tag 'navigation:path' do |tag|
     hash = tag.locals.navigation
-    ActiveSupport::Deprecation.warn("The 'r:navigation:url' tag has been deprecated in favour of 'r:navigation:path'. Please update your site.")
+    # ActiveSupport::Deprecation.warn("The 'r:navigation:url' tag has been deprecated in favour of 'r:navigation:path'. Please update your site.")
     hash[:path]
   end
 

data/config/initializers/trusty_cms_config.rb

@@ -1,94 +1,95 @@
 require 'multi_site/engine'
 require 'clipped/engine'
+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
+    config.define 'session_timeout', default: 2.weeks
+    require 'multi_site/scoped_validation'
+  end
 
-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
-  config.define 'session_timeout', default: 2.weeks
-  require 'multi_site/scoped_validation'
-end
+  TrustyCms.config do |config|
+    config.namespace 'paperclip' do |pc|
+      pc.define 'url',                      default: '/system/:attachment/:id/:style/:basename:no_original_style.:extension', allow_change: true
+      pc.define 'path',                     default: ':rails_root/public/system/:attachment/:id/:style/:basename:no_original_style.:extension', allow_change: true
+      pc.define 'skip_filetype_validation', default: true, type: :boolean
+      pc.define 'storage', default: 'filesystem',
+                           select_from: {
+                             'File System' => 'filesystem',
+                             'Amazon S3' => 'fog',
+                             'Google Storage' => 'fog',
+                             'Rackspace Cloud Files' => 'fog',
+                           },
+                           allow_blank: false,
+                           allow_display: false
 
-TrustyCms.config do |config|
-  config.namespace 'paperclip' do |pc|
-    pc.define 'url',                      default: '/system/:attachment/:id/:style/:basename:no_original_style.:extension', allow_change: true
-    pc.define 'path',                     default: ':rails_root/public/system/:attachment/:id/:style/:basename:no_original_style.:extension', allow_change: true
-    pc.define 'skip_filetype_validation', default: true, type: :boolean
-    pc.define 'storage', default: 'filesystem',
-                         select_from: {
-                           'File System' => 'filesystem',
-                           'Amazon S3' => 'fog',
-                           'Google Storage' => 'fog',
-                           'Rackspace Cloud Files' => 'fog',
-                         },
-                         allow_blank: false,
-                         allow_display: false
+      pc.namespace 'fog' do |fog|
+        fog.define 'provider', select_from: {
+          'Amazon S3' => 'AWS',
+          'Google Storage' => 'Google',
+          'Rackspace Cloud Files' => 'Rackspace',
+        }
+        fog.define 'directory'
+        fog.define 'public?', default: true
+        fog.define 'host'
+      end
 
-    pc.namespace 'fog' do |fog|
-      fog.define 'provider', select_from: {
-        'Amazon S3' => 'AWS',
-        'Google Storage' => 'Google',
-        'Rackspace Cloud Files' => 'Rackspace',
-      }
-      fog.define 'directory'
-      fog.define 'public?', default: true
-      fog.define 'host'
-    end
+      pc.namespace 'google_storage' do |gs|
+        gs.define 'access_key_id'
+        gs.define 'secret_access_key'
+      end
 
-    pc.namespace 'google_storage' do |gs|
-      gs.define 'access_key_id'
-      gs.define 'secret_access_key'
-    end
+      pc.namespace 'rackspace' do |rs|
+        rs.define 'username'
+        rs.define 'api_key'
+      end
 
-    pc.namespace 'rackspace' do |rs|
-      rs.define 'username'
-      rs.define 'api_key'
+      pc.namespace 's3' do |s3|
+        s3.define 'key'
+        s3.define 'secret'
+        s3.define 'region', select_from: {
+          'Asia North East' => 'ap-northeast-1',
+          'Asia South East' => 'ap-southeast-1',
+          'EU West' => 'eu-west-1',
+          'US East' => 'us-east-1',
+          'US West' => 'us-west-1',
+        }
+      end
     end
 
-    pc.namespace 's3' do |s3|
-      s3.define 'key'
-      s3.define 'secret'
-      s3.define 'region', select_from: {
-        'Asia North East' => 'ap-northeast-1',
-        'Asia South East' => 'ap-southeast-1',
-        'EU West' => 'eu-west-1',
-        'US East' => 'us-east-1',
-        'US West' => 'us-west-1',
-      }
-    end
-  end
+    config.namespace 'assets', allow_display: false do |assets|
+      assets.define 'create_image_thumbnails?', default: 'true'
+      assets.define 'create_video_thumbnails?', default: 'true'
+      assets.define 'create_pdf_thumbnails?', default: 'true'
 
-  config.namespace 'assets', allow_display: false do |assets|
-    assets.define 'create_image_thumbnails?', default: 'true'
-    assets.define 'create_video_thumbnails?', default: 'true'
-    assets.define 'create_pdf_thumbnails?', default: 'true'
+      assets.namespace 'thumbnails' do |thumbs| # NB :icon and :thumbnail are already defined as fixed formats for use in the admin interface and can't be changed
+        thumbs.define 'image', default: 'normal:size=640x640>|small:size=320x320>'
+        thumbs.define 'video', default: 'normal:size=640x640>,format=jpg|small:size=320x320>,format=jpg'
+        thumbs.define 'pdf', default: 'normal:size=640x640>,format=jpg|small:size=320x320>,format=jpg'
+      end
 
-    assets.namespace 'thumbnails' do |thumbs| # NB :icon and :thumbnail are already defined as fixed formats for use in the admin interface and can't be changed
-      thumbs.define 'image', default: 'normal:size=640x640>|small:size=320x320>'
-      thumbs.define 'video', default: 'normal:size=640x640>,format=jpg|small:size=320x320>,format=jpg'
-      thumbs.define 'pdf', default: 'normal:size=640x640>,format=jpg|small:size=320x320>,format=jpg'
+      assets.define 'max_asset_size', default: 5, type: :integer, units: 'MB'
+      assets.define 'display_size', default: 'normal', allow_blank: true
+      assets.define 'insertion_size', default: 'normal', allow_blank: true
     end
-
-    assets.define 'max_asset_size', default: 5, type: :integer, units: 'MB'
-    assets.define 'display_size', default: 'normal', allow_blank: true
-    assets.define 'insertion_size', default: 'normal', allow_blank: true
   end
-end
 
-if TrustyCms.config_definitions['defaults.snippet.filter'].nil?
-  TrustyCms.config.define 'defaults.snippet.filter', select_from: lambda { TextFilter.descendants.map { |s| s.filter_name }.sort }, allow_blank: true
-end
+  if TrustyCms.config_definitions['defaults.snippet.filter'].nil?
+    TrustyCms.config.define 'defaults.snippet.filter', select_from: lambda { TextFilter.descendants.map { |s| s.filter_name }.sort }, allow_blank: true
+  end
 
-Admin::LayoutsController.send :helper, MultiSite::SiteChooserHelper
-Admin::SnippetsController.send :helper, MultiSite::SiteChooserHelper
+  Admin::LayoutsController.send :helper, MultiSite::SiteChooserHelper
+  Admin::SnippetsController.send :helper, MultiSite::SiteChooserHelper
+end

data/lib/generators/language_extension/templates/available_tags.yml

@@ -222,15 +222,6 @@
 
       <pre><code><r&#58;if_self>...</r&#58;if_self></code></pre>
 
-    if_url:
-      Renders the containing elements only if the page's url matches the regular expression
-      given in the @matches@ attribute. If the @ignore_case@ attribute is set to false, the
-      match is case sensitive. By default, @ignore_case@ is set to true.
-
-      *Usage&#58;*
-
-      <pre><code><r&#58;if_url matches="regexp" [ignore_case="true|false"]>...</r&#58;if_url></code></pre>
-
     markdown:
       Filters its contents with the Markdown filter.
 
@@ -443,13 +434,6 @@
 
       <pre><code><r&#58;unless_self>...</r&#58;unless_self></code></pre>
 
-    unless_url:
-      The opposite of the @if_url@ tag.
-
-      *Usage&#58;*
-
-      <pre><code><r&#58;unless_url matches="regexp" [ignore_case="true|false"]>...</r&#58;unless_url></code></pre>
-
     url:
       Renders the @url@ attribute of the current page.
 

data/lib/trusty_cms.rb

@@ -2,6 +2,6 @@ TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..')) unle
 
 unless defined? TrustyCms::VERSION
   module TrustyCms
-    VERSION = '5.5.1'.freeze
+    VERSION = '5.5.6'.freeze
   end
 end

data/package.json

@@ -7,9 +7,9 @@
   "author": "Danielle Greaves <danigreaves@gmail.com>",
   "license": "MIT",
   "dependencies": {
-    "@fortawesome/fontawesome-free": "^5.13.0",
+    "@fortawesome/fontawesome-free": "^5.15.4",
     "blueimp-file-upload": "^10.32.0",
-    "jquery": "^3.5.0",
+    "jquery": "^3.6.1",
     "jquery-treetable": "^3.2.0-1",
     "jquery-ui": "^1.13.2",
     "jquery-ujs": "^1.2.2",

data/spec/dummy/package.json

@@ -4,9 +4,9 @@
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "jquery": "^3.5.0",
+    "jquery": "^3.6.1",
     "jquery-treetable": "^3.2.0-1",
     "jquery-ui": "^1.12.1",
-    "jquery-ujs": "^1.2.2"
+    "jquery-ujs": "^1.2.3"
   }
 }

data/spec/dummy/yarn.lock

@@ -16,22 +16,21 @@ jquery-ui@^1.12.1:
   dependencies:
     jquery ">=1.8.0 <4.0.0"
 
-jquery-ujs@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/jquery-ujs/-/jquery-ujs-1.2.2.tgz#6a8ef1020e6b6dda385b90a4bddc128c21c56397"
-  dependencies:
-    jquery ">=1.8.0"
+jquery-ujs@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/jquery-ujs/-/jquery-ujs-1.2.3.tgz#dcac6026ab7268e5ee41faf9d31c997cd4ddd603"
+  integrity sha512-59wvfx5vcCTHMeQT1/OwFiAj+UffLIwjRIoXdpO7Z7BCFGepzq9T9oLVeoItjTqjoXfUrHJvV7QU6pUR+UzOoA==
 
 jquery@>=1.6:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
   integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
 
-jquery@>=1.8.0, jquery@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9"
-
 "jquery@>=1.8.0 <4.0.0":
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.1.tgz#fab0408f8b45fc19f956205773b62b292c147a16"
   integrity sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw==
+
+jquery@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9"

data/trusty_cms.gemspec

@@ -33,12 +33,12 @@ a general purpose content management system--not merely a blogging engine.'
   s.add_dependency 'execjs',          '~> 2.7'
   s.add_dependency 'haml',            '~> 5.2.2'
   s.add_dependency 'haml-rails',      '~> 2.0'
-  s.add_dependency 'highline',        '>= 1.7.8', '< 2.1.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', '< 2.3.0'
+  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'

data/yarn.lock

@@ -184,10 +184,10 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
-"@fortawesome/fontawesome-free@^5.13.0":
-  version "5.13.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.13.0.tgz#fcb113d1aca4b471b709e8c9c168674fbd6e06d9"
-  integrity sha512-xKOeQEl5O47GPZYIMToj6uuA2syyFlq9EMSl2ui0uytjY9xbe8XS0pexNWmxrdcCyNGyDmLyYw5FtKsalBUeOg==
+"@fortawesome/fontawesome-free@^5.15.4":
+  version "5.15.4"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz#ecda5712b61ac852c760d8b3c79c96adca5554e5"
+  integrity sha512-eYm8vijH/hpzr/6/1CJ/V/Eb1xQFW2nnUKArb3z+yUWv7HTwj6M7SP957oMjfZjAHU6qpoNc2wQvIxBLWYa/Jg==
 
 "@nodelib/fs.scandir@2.1.3":
   version "2.1.3"
@@ -319,9 +319,9 @@ bail@^1.0.0:
   integrity sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==
 
 balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
 blueimp-canvas-to-blob@3:
   version "3.29.0"
@@ -477,7 +477,7 @@ color-name@~1.1.4:
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
 convert-source-map@^1.7.0:
   version "1.7.0"
@@ -986,12 +986,12 @@ jquery@>=1.6:
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
   integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
 
-jquery@>=1.8.0, jquery@^3.5.0:
+jquery@>=1.8.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9"
   integrity sha512-Xb7SVYMvygPxbFMpTFQiHh1J7HClEaThguL15N/Gg37Lri/qKyhRGZYzHRyLH8Stq3Aow0LsHO2O2ci86fCrNQ==
 
-"jquery@>=1.8.0 <4.0.0":
+"jquery@>=1.8.0 <4.0.0", jquery@^3.6.1:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.1.tgz#fab0408f8b45fc19f956205773b62b292c147a16"
   integrity sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw==
@@ -1022,11 +1022,9 @@ json-schema-traverse@^0.4.1:
   integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
 json5@^2.1.2:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
-  integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
-  dependencies:
-    minimist "^1.2.5"
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
+  integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
 kind-of@^6.0.2:
   version "6.0.3"
@@ -1157,9 +1155,9 @@ min-indent@^1.0.0:
   integrity sha1-z8RcN+nsDY8KDsPdTvf3w6vjklY=
 
 minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
+  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
   dependencies:
     brace-expansion "^1.1.7"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 5.5.1
+  version: 5.5.6
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-17 00:00:00.000000000 Z
+date: 2023-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-validator
@@ -163,7 +163,7 @@ dependencies:
         version: 1.7.8
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -173,7 +173,7 @@ dependencies:
         version: 1.7.8
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: image_processing
   requirement: !ruby/object:Gem::Requirement
@@ -239,7 +239,7 @@ dependencies:
         version: 2.0.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -249,7 +249,7 @@ dependencies:
         version: 2.0.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rack-cache
   requirement: !ruby/object:Gem::Requirement
@@ -494,14 +494,11 @@ files:
 - app/assets/images/admin/avatar_64x64.png
 - app/assets/images/admin/avatar_96x96.png
 - app/assets/images/admin/brown_bottom_line.gif
-- app/assets/images/admin/c_icon.png
 - app/assets/images/admin/calendar_down.gif
 - app/assets/images/admin/calendar_down.png
 - app/assets/images/admin/collapse.png
 - app/assets/images/admin/collapsed.png
 - app/assets/images/admin/copy.png
-- app/assets/images/admin/css_icon.png
-- app/assets/images/admin/database_icon.png
 - app/assets/images/admin/default_forgot_password.svg
 - app/assets/images/admin/default_reset_password.svg
 - app/assets/images/admin/default_safe_login.svg
@@ -509,15 +506,8 @@ files:
 - app/assets/images/admin/document_icon.png
 - app/assets/images/admin/document_thumbnail.png
 - app/assets/images/admin/draft_page.png
-- app/assets/images/admin/flash_icon.png
-- app/assets/images/admin/flash_thumbnail.png
-- app/assets/images/admin/font_icon.png
-- app/assets/images/admin/gzip_icon.png
-- app/assets/images/admin/html_icon.png
 - app/assets/images/admin/image.png
-- app/assets/images/admin/image_icon.png
 - app/assets/images/admin/image_thumbnail.png
-- app/assets/images/admin/java_icon.png
 - app/assets/images/admin/javascript.png
 - app/assets/images/admin/layout.png
 - app/assets/images/admin/metadata_toggle.png
@@ -534,8 +524,6 @@ files:
 - app/assets/images/admin/page_edit.png
 - app/assets/images/admin/pdf_icon.png
 - app/assets/images/admin/pdf_thumbnail.png
-- app/assets/images/admin/perl_icon.png
-- app/assets/images/admin/php_icon.png
 - app/assets/images/admin/plus.png
 - app/assets/images/admin/plus_disabled.png
 - app/assets/images/admin/plus_grey.png
@@ -544,17 +532,12 @@ files:
 - app/assets/images/admin/popup_border_bottom_right.png
 - app/assets/images/admin/popup_border_top_left.png
 - app/assets/images/admin/popup_border_top_right.png
-- app/assets/images/admin/presentation_icon.png
-- app/assets/images/admin/python_icon.png
 - app/assets/images/admin/remove.png
 - app/assets/images/admin/reorder_assets.png
-- app/assets/images/admin/ruby_icon.png
-- app/assets/images/admin/script_icon.png
 - app/assets/images/admin/search.png
 - app/assets/images/admin/single_form_shadow.png
 - app/assets/images/admin/snippet.png
 - app/assets/images/admin/spinner.gif
-- app/assets/images/admin/spreadsheet_icon.png
 - app/assets/images/admin/status_background.png
 - app/assets/images/admin/status_bottom_left.png
 - app/assets/images/admin/status_bottom_right.png
@@ -563,7 +546,6 @@ files:
 - app/assets/images/admin/status_top_right.png
 - app/assets/images/admin/stylesheet.png
 - app/assets/images/admin/tab_close.png
-- app/assets/images/admin/tar_icon.png
 - app/assets/images/admin/ui-bg_flat_75_ffffff_40x100.png
 - app/assets/images/admin/ui-bg_glass_55_fbf9ee_1x400.png
 - app/assets/images/admin/ui-bg_glass_65_ffffff_1x400.png
@@ -582,15 +564,12 @@ files:
 - app/assets/images/admin/video_icon.png
 - app/assets/images/admin/video_thumbnail.png
 - app/assets/images/admin/virtual_page.png
-- app/assets/images/admin/xml_icon.png
-- app/assets/images/admin/zip_icon.png
 - app/assets/images/rad_social/ajax-loader-small.gif
 - app/assets/images/rad_social/ajax-loader.gif
 - app/assets/images/rad_social/bg_primary-btn.png
 - app/assets/images/rad_social/email.png
 - app/assets/images/rad_social/facebook.png
 - app/assets/images/rad_social/twitter.png
-- app/assets/images/radiant/radiant-badge-color.png
 - app/assets/javascripts/admin.js
 - app/assets/javascripts/admin/assets.js
 - app/assets/javascripts/admin/assets_admin.js
@@ -691,11 +670,9 @@ files:
 - app/mailers/rad_social_mailer.rb
 - app/models/asset.rb
 - app/models/asset_type.rb
-- app/models/deprecated_tags.rb
 - app/models/file_not_found_page.rb
 - app/models/haml_filter.rb
 - app/models/layout.rb
-- app/models/legacy_user.rb
 - app/models/menu_renderer.rb
 - app/models/page.rb
 - app/models/page_attachment.rb
@@ -980,7 +957,6 @@ files:
 - lib/tasks/radiant_config.rake
 - lib/tasks/snippets_extension_tasks.rake
 - lib/tasks/translate.rake
-- lib/tasks/upgrade_to_devise.rake
 - lib/translation_support.rb
 - lib/trusty_cms.rb
 - lib/trusty_cms/admin_ui.rb
@@ -1163,52 +1139,52 @@ signing_key:
 specification_version: 4
 summary: A no-fluff content management system designed for small teams.
 test_files:
-- spec/spec_helper.rb
-- spec/fixtures/users.yml
-- spec/models/layout_spec.rb
-- spec/rails_helper.rb
-- spec/support/custom_actions.rb
-- spec/features/pages_spec.rb
 - spec/features/config_spec.rb
+- spec/features/pages_spec.rb
 - spec/features/layouts_spec.rb
-- spec/controllers/application_controller_spec.rb
-- spec/controllers/users_controller_spec.rb
-- spec/dummy/config/environments/test.rb
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
-- spec/dummy/config/environment.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/secrets.yml
 - spec/dummy/config/initializers/trusty_cms_config.rb
-- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/application.rb
-- spec/dummy/config/secrets.yml
+- spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/cookies_serializer.rb
+- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/boot.rb
-- spec/dummy/package.json
-- spec/dummy/app/assets/config/manifest.js
-- spec/dummy/db/schema.rb
+- spec/dummy/config/application.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/environment.rb
+- spec/dummy/config/locales/en.yml
+- spec/dummy/config/routes.rb
 - spec/dummy/Rakefile
 - spec/dummy/config.ru
+- spec/dummy/app/assets/config/manifest.js
+- spec/dummy/yarn.lock
+- spec/dummy/db/schema.rb
 - spec/dummy/README.rdoc
+- spec/dummy/public/422.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/public/404.html
 - spec/dummy/public/500.html
-- spec/dummy/public/422.html
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rails
-- spec/dummy/bin/setup
+- spec/dummy/package.json
 - spec/dummy/bin/rake
-- spec/dummy/yarn.lock
+- spec/dummy/bin/setup
+- spec/dummy/bin/rails
+- spec/dummy/bin/bundle
+- spec/models/layout_spec.rb
+- spec/controllers/users_controller_spec.rb
+- spec/controllers/application_controller_spec.rb
+- spec/rails_helper.rb
+- spec/spec_helper.rb
 - spec/ci/database.mysql.yml
+- spec/support/custom_actions.rb
+- spec/fixtures/users.yml
+- spec/factories/page.rb
 - spec/factories/page_part.rb
 - spec/factories/layout.rb
-- spec/factories/page.rb
 - spec/factories/user.rb

data/app/models/deprecated_tags.rb

@@ -1,13 +0,0 @@
-require 'trusty_cms/taggable'
-module DeprecatedTags
-  include TrustyCms::Taggable
-
-  deprecated_tag 'comment', substitute: 'hide', deadline: '2.0'
-
-  deprecated_tag 'rfc1123_date', deadline: '2.0' do |tag|
-    page = tag.locals.page
-    if date = page.published_at || page.created_at
-      CGI.rfc1123_date(date.to_time)
-    end
-  end
-end

data/app/models/legacy_user.rb

@@ -1,6 +0,0 @@
-class LegacyUser < ActiveRecord::Base
-  self.table_name = 'users'
-
-  # this is a legacy class
-  # this table formally held user information for when TrustyCMS had a handwritten authentication system
-end

data/lib/tasks/upgrade_to_devise.rake

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-# Define a namespace for the task
-namespace :import do
-  desc 'Imports the legacy user data into the Devise Admin table'
-  task admins: :environment do
-    CHARS = ('0'..'9').to_a + ('A'..'Z').to_a + ('a'..'z').to_a + (1..9).to_a + ['`', '~', '!', '@', '#', '$', '%', '^', '&', '*']
-    password = CHARS.sort_by { rand }.join[0...15]
-
-    LegacyUser.all.each do |legacy|
-      u = User.new(
-        email: legacy.email,
-        first_name: legacy.name.split[0],
-        last_name: legacy.name.split[1],
-        password: password,
-        password_confirmation: password,
-        admin: legacy.admin,
-        designer: legacy.designer,
-        content_editor: legacy.content_editor,
-        notes: legacy.notes,
-      )
-      u.save!
-    end
-  end
-end