trusty-cms 5.5.9 → 5.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f4ef88729e786d8a0977ac190c8546b49d5324469c7e9eaf80ef77ede977167
-  data.tar.gz: f2e6ddf0633251c8c6db60676c7f2a6ec83b6f4a39a2785cd7bb4f673c433081
+  metadata.gz: 8335ccbe0b9f13c382765aea13eab9c77b06a6a6284610a0353753bd3ad04cf8
+  data.tar.gz: ac210d21758eb07bb95ceddd8bf693cde011a37516e55a1e4953009559b84d5a
 SHA512:
-  metadata.gz: 4402deb3bc80c490eec946374b38311cba2d447d626d43956ee05c969b393f1502528fe4eeded862610022af5d47d1904cda074f527e36df7a83aeda7a62c7b8
-  data.tar.gz: f1ce51e5f002ed8dbe4a0182ed0c20cae0b46f079ac3947c97ddd692d7697edb31bef42e19589d465ab327e9b177b09d9e748d5824b41b57ab74658eac7e7406
+  metadata.gz: 4aa825126e6e9eff94a59d842a7c13d9b7a74cdc3995b390a9f18ad8bf28c664eb3cd206c696c608d9baaa3036caa5eb5f648f620d956cfee41f423d11b94afd
+  data.tar.gz: 3db3a0a1dfbfc251d40ff2f094c4877f5e70d5f610bfe0d6fa2a26be4d22108a60e9b84fe843b6f88ada69ddee977e7fd13a3c85758ca31f947e939562927b3d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (5.5.8)
+    trusty-cms (5.6.1)
       RedCloth (= 4.3.2)
       activestorage-validator
       acts_as_list (>= 0.9.5, < 1.2.0)
@@ -10,7 +10,7 @@ PATH
       delocalize (>= 0.2, < 2.0)
       devise
       execjs (~> 2.7)
-      haml
+      haml (>= 5.0, < 6.0)
       haml-rails
       highline (>= 1.7.8, < 2.2.0)
       image_processing
@@ -35,67 +35,73 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    actioncable (6.1.7.4)
-      actionpack (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+    actioncable (7.0.8)
+      actionpack (= 7.0.8)
+      activesupport (= 7.0.8)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.7.4)
-      actionpack (= 6.1.7.4)
-      activejob (= 6.1.7.4)
-      activerecord (= 6.1.7.4)
-      activestorage (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+    actionmailbox (7.0.8)
+      actionpack (= 7.0.8)
+      activejob (= 7.0.8)
+      activerecord (= 7.0.8)
+      activestorage (= 7.0.8)
+      activesupport (= 7.0.8)
       mail (>= 2.7.1)
-    actionmailer (6.1.7.4)
-      actionpack (= 6.1.7.4)
-      actionview (= 6.1.7.4)
-      activejob (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.0.8)
+      actionpack (= 7.0.8)
+      actionview (= 7.0.8)
+      activejob (= 7.0.8)
+      activesupport (= 7.0.8)
       mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.7.4)
-      actionview (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (7.0.8)
+      actionview (= 7.0.8)
+      activesupport (= 7.0.8)
+      rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.7.4)
-      actionpack (= 6.1.7.4)
-      activerecord (= 6.1.7.4)
-      activestorage (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+    actiontext (7.0.8)
+      actionpack (= 7.0.8)
+      activerecord (= 7.0.8)
+      activestorage (= 7.0.8)
+      activesupport (= 7.0.8)
+      globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (6.1.7.4)
-      activesupport (= 6.1.7.4)
+    actionview (7.0.8)
+      activesupport (= 7.0.8)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.7.4)
-      activesupport (= 6.1.7.4)
+    activejob (7.0.8)
+      activesupport (= 7.0.8)
       globalid (>= 0.3.6)
-    activemodel (6.1.7.4)
-      activesupport (= 6.1.7.4)
-    activerecord (6.1.7.4)
-      activemodel (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
-    activestorage (6.1.7.4)
-      actionpack (= 6.1.7.4)
-      activejob (= 6.1.7.4)
-      activerecord (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+    activemodel (7.0.8)
+      activesupport (= 7.0.8)
+    activerecord (7.0.8)
+      activemodel (= 7.0.8)
+      activesupport (= 7.0.8)
+    activestorage (7.0.8)
+      actionpack (= 7.0.8)
+      activejob (= 7.0.8)
+      activerecord (= 7.0.8)
+      activesupport (= 7.0.8)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
     activestorage-validator (0.3.0)
       rails (>= 6.1.0)
-    activesupport (6.1.7.4)
+    activesupport (7.0.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     acts_as_list (1.1.0)
       activerecord (>= 4.2)
     acts_as_tree (2.9.1)
@@ -129,6 +135,7 @@ GEM
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
+    date (3.3.3)
     delocalize (1.2.0)
       rails (>= 2)
     devise (4.9.2)
@@ -138,10 +145,9 @@ GEM
       responders
       warden (~> 1.2.3)
     diff-lcs (1.5.0)
-    digest (3.1.1)
     docile (1.4.0)
     erubi (1.12.0)
-    execjs (2.8.1)
+    execjs (2.9.1)
     factory_bot (6.2.1)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.2.0)
@@ -151,11 +157,10 @@ GEM
     file_validators (3.0.0)
       activemodel (>= 3.2)
       mime-types (>= 1.0)
-    globalid (1.1.0)
-      activesupport (>= 5.0)
-    haml (6.1.1)
-      temple (>= 0.8.2)
-      thor
+    globalid (1.2.1)
+      activesupport (>= 6.1)
+    haml (5.2.2)
+      temple (>= 0.8.0)
       tilt
     haml-rails (2.1.0)
       actionpack (>= 5.1)
@@ -171,7 +176,6 @@ GEM
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
-    io-wait (0.3.0)
     json (2.6.3)
     kraken-io (0.1.3)
       activesupport
@@ -182,7 +186,7 @@ GEM
       addressable (~> 2.8)
     libv8-node (16.10.0.0-x86_64-darwin)
     libv8-node (16.10.0.0-x86_64-linux)
-    loofah (2.21.3)
+    loofah (2.21.4)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -196,30 +200,26 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
     mini_magick (4.12.0)
-    mini_mime (1.1.2)
+    mini_mime (1.1.5)
     mini_racer (0.6.3)
       libv8-node (~> 16.10.0.0)
-    minitest (5.15.0)
+    minitest (5.20.0)
     multi_xml (0.6.0)
     multipart-post (2.2.3)
     mysql2 (0.5.5)
-    net-imap (0.2.2)
-      digest
+    net-imap (0.4.1)
+      date
       net-protocol
-      strscan
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.1.1)
-      io-wait
+    net-protocol (0.2.1)
       timeout
-    net-smtp (0.3.0)
-      digest
+    net-smtp (0.4.0)
       net-protocol
-      timeout
     nio4r (2.5.9)
-    nokogiri (1.12.5-x86_64-darwin)
+    nokogiri (1.15.4-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.12.5-x86_64-linux)
+    nokogiri (1.15.4-x86_64-linux)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     poltergeist (1.18.1)
@@ -236,41 +236,42 @@ GEM
       stringio
     public_suffix (4.0.7)
     racc (1.7.1)
-    rack (2.2.7)
-    rack-cache (1.13.0)
+    rack (2.2.8)
+    rack-cache (1.14.0)
       rack (>= 0.4)
     rack-test (2.1.0)
       rack (>= 1.3)
     radius (0.7.5)
-    rails (6.1.7.4)
-      actioncable (= 6.1.7.4)
-      actionmailbox (= 6.1.7.4)
-      actionmailer (= 6.1.7.4)
-      actionpack (= 6.1.7.4)
-      actiontext (= 6.1.7.4)
-      actionview (= 6.1.7.4)
-      activejob (= 6.1.7.4)
-      activemodel (= 6.1.7.4)
-      activerecord (= 6.1.7.4)
-      activestorage (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+    rails (7.0.8)
+      actioncable (= 7.0.8)
+      actionmailbox (= 7.0.8)
+      actionmailer (= 7.0.8)
+      actionpack (= 7.0.8)
+      actiontext (= 7.0.8)
+      actionview (= 7.0.8)
+      activejob (= 7.0.8)
+      activemodel (= 7.0.8)
+      activerecord (= 7.0.8)
+      activestorage (= 7.0.8)
+      activesupport (= 7.0.8)
       bundler (>= 1.15.0)
-      railties (= 6.1.7.4)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.1.1)
+      railties (= 7.0.8)
+    rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.5.0)
-      loofah (~> 2.19, >= 2.19.1)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
     rails-observers (0.1.5)
       activemodel (>= 4.0)
-    railties (6.1.7.4)
-      actionpack (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+    railties (7.0.8)
+      actionpack (= 7.0.8)
+      activesupport (= 7.0.8)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
+      zeitwerk (~> 2.5)
     rake (13.0.6)
     rdoc (6.5.0)
       psych (>= 4.0.0)
@@ -319,7 +320,7 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    sprockets (4.2.0)
+    sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
     sprockets-rails (3.4.2)
@@ -328,7 +329,6 @@ GEM
       sprockets (>= 3.0.0)
     stringex (2.8.6)
     stringio (3.0.5)
-    strscan (3.0.6)
     temple (0.10.0)
     terrapin (0.6.0)
       climate_control (>= 0.0.3, < 1.0)
@@ -344,13 +344,13 @@ GEM
     uuidtools (2.2.0)
     warden (1.2.9)
       rack (>= 2.0.9)
-    websocket-driver (0.7.5)
+    websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     will_paginate (4.0.0)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.8)
+    zeitwerk (2.6.12)
 
 PLATFORMS
   x86_64-darwin-18
@@ -377,4 +377,4 @@ DEPENDENCIES
   trustygems (~> 0.2.0)
 
 BUNDLED WITH
-   2.4.4
+   2.4.13

data/app/controllers/application_controller.rb

@@ -1,4 +1,3 @@
-# require_dependency 'trusty_cms'
 require 'login_system'
 
 class ApplicationController < ActionController::Base

data/app/controllers/site_controller.rb

@@ -1,4 +1,6 @@
 require 'trusty_cms/pagination/controller'
+require 'will_paginate/array'
+
 class SiteController < ApplicationController
   include TrustyCms::Pagination::Controller
 
@@ -42,16 +44,19 @@ class SiteController < ApplicationController
   def cacheable_request?
     (request.head? || request.get?) && live?
   end
+
   # hide_action :cacheable_request?
 
   def set_expiry(time, options = {})
     expires_in time, options
   end
+
   # hide_action :set_expiry
 
   def set_etag(val)
     headers['ETag'] = val
   end
+
   # hide_action :set_expiry
 
   private

data/app/models/site.rb

@@ -1,5 +1,6 @@
 # The site class includes - in find_for_host - some key retrieval and creation logic that is called from ApplicationController to set the current site context.
 # Otherwise it's just another Trusty data model.
+require 'acts_as_list'
 
 class Site < ActiveRecord::Base
   acts_as_list

data/app/models/trusty_cms/config.rb

@@ -81,7 +81,8 @@ module TrustyCms
               TrustyCms::Config.initialize_cache
             end
             TrustyCms::Config.initialize_cache if TrustyCms::Config.stale_cache?
-            Rails.cache.read('TrustyCms::Config')[key]
+            # Rails.cache.read('TrustyCms::Config')[key]
+            # TODO: Do we need this line?
           end
         end
       end

data/config/application.rb

@@ -1,4 +1,4 @@
-require File.expand_path('boot', __dir__)
+require_relative 'boot'
 
 require 'rails/all'
 require 'acts_as_tree'
@@ -18,8 +18,6 @@ module TrustyCms
   class Application < Rails::Application
     include TrustyCms::Initializer
     config.active_record.whitelist_attributes = true
-    config.autoload_paths += %W(#{config.root}/lib)
-    config.eager_load_paths << Rails.root.join('lib')
 
     # Enable the asset pipeline
     config.assets.enabled = true
@@ -80,7 +78,7 @@ module TrustyCms
     end
     config.after_initialize do
       extension_loader.load_extensions
-      extension_loader.load_extension_initalizers
+      extension_loader.load_extension_initializers
 
       extension_loader.activate_extensions # also calls initialize_views
       # config.add_controller_paths(extension_loader.paths(:controller))

data/config/initializers/trusty_cms_config.rb

@@ -1,5 +1,3 @@
-require 'multi_site/engine'
-require 'clipped/engine'
 Rails.application.reloader.to_prepare do
   TrustyCms.config do |config|
     config.define 'admin.title', default: 'TrustyCms CMS'
@@ -22,18 +20,18 @@ Rails.application.reloader.to_prepare do
 
   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 '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
+                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: {
@@ -74,7 +72,8 @@ Rails.application.reloader.to_prepare do
       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
+      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'

data/lib/configuration_extensions/configuration_extensions.rb

@@ -14,7 +14,7 @@ module TrustyCms
     #     config['other.thing'] = 'nothing'
     #   end
     #
-    def config  # method must be defined before any initializers run
+    def config # method must be defined before any initializers run
       yield TrustyCms::Config if block_given?
       TrustyCms::Config
     end
@@ -33,6 +33,7 @@ module TrustyCms
     def root
       Pathname.new(TRUSTY_CMS_ROOT) if defined?(TRUSTY_CMS_ROOT)
     end
+
     def boot!
       unless booted?
         preinitialize
@@ -46,12 +47,12 @@ module TrustyCms
 
     def pick_boot
       case
-        when app?
-          AppBoot.new
-        when vendor?
-          VendorBoot.new
-        else
-          GemBoot.new
+      when app?
+        AppBoot.new
+      when vendor?
+        VendorBoot.new
+      else
+        GemBoot.new
       end
     end
 
@@ -77,7 +78,6 @@ module TrustyCms
   end
 end
 
-
 class Rails::Application::Configuration
 
   # The TrustyCms::Configuration class extends Rails::Configuration with three purposes:
@@ -132,7 +132,8 @@ class Rails::Application::Configuration
     @extension_list ||= extensions ? expand_and_check(extensions) : available_extensions
   end
 
-  def expand_and_check(extension_list) #:nodoc
+  def expand_and_check(extension_list)
+    #:nodoc
     missing_extensions = extension_list - [:all] - available_extensions
     raise LoadError, "These configured extensions have not been found: #{missing_extensions.to_sentence}" if missing_extensions.any?
     if m = extension_list.index(:all)

data/lib/generators/extension/templates/extension.rb

@@ -1,5 +1,4 @@
 # Uncomment this if you reference any of your controllers in activate
-# require_dependency "application_controller"
 require "radiant-<%= file_name %>-extension"
 
 class <%= class_name %> < TrustyCms::Extension

data/lib/generators/language_extension/templates/extension.rb

@@ -1,5 +1,4 @@
 # Uncomment this if you reference any of your controllers in activate
-# require_dependency "application_controller"
 require "radiant-<%= file_name %>_language_pack-extension"
 
 class <%= class_name %> < TrustyCms::Extension

data/lib/generators/trusty_cms/templates/application.rb.erb

@@ -30,7 +30,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
@@ -51,7 +51,7 @@ module TrustyCms
     # An example of how to add extensions:
     # config.extensions = [ :snippets, :clipped, :layouts, :reorder, :multi_site, :rad_social]
 
-    config.extensions = [ ]
+    config.extensions = []
 
     # By default, only English translations are loaded. Remove any of these from
     # the list below if you'd like to provide any of the additional options
@@ -85,7 +85,6 @@ module TrustyCms
     #    Sets the meta store type and storage location.  We recommend you use
     #    radiant: since this will enable manual expiration and acceleration headers.
 
-
     config.middleware.use Rack::Cache,
                           :private_headers => ['Authorization'],
                           :entitystore => "radiant:tmp/cache/entity",
@@ -97,8 +96,6 @@ module TrustyCms
     config.middleware.insert_before(Rack::ConditionalGet, Rack::Cache)
     config.assets.enabled = true
 
-
-
     config.filter_parameters += [:password, :password_confirmation]
 
     # Use the database for sessions instead of the cookie-based default,
@@ -128,13 +125,13 @@ 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|
       #  load(initializer)
       #end
 
-      extension_loader.activate_extensions  # also calls initialize_views
+      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))
 

data/lib/trusty_cms/extension_loader.rb

@@ -13,15 +13,18 @@ module TrustyCms
 
       attr_accessor :config
 
-      def initialize(rails_config) #:nodoc
+      def initialize(rails_config)
+        #:nodoc
         @config = rails_config
       end
 
-      def before_clear(*_args) #:nodoc
+      def before_clear(*_args)
+        #:nodoc
         ExtensionLoader.deactivate_extensions
       end
 
-      def after_clear(*_args) #:nodoc
+      def after_clear(*_args)
+        #:nodoc
         ExtensionLoader.load_extensions
         ExtensionLoader.activate_extensions
       end
@@ -73,7 +76,6 @@ module TrustyCms
       begin
         constant = "#{name}_extension".camelize
         extension = constant.constantize
-        extension.unloadable
         extension.path = extension_path
         extension
       rescue LoadError, NameError => e
@@ -88,6 +90,10 @@ module TrustyCms
       extensions.each(&:load_initializers)
     end
 
+    def load_extension_initializers
+      load_extension_initalizers
+    end
+
     # Deactivates all enabled extensions.
     #
     def deactivate_extensions
@@ -138,5 +144,7 @@ module TrustyCms
         end
       end
     end
+
+    alias_method :load_extension_initializers, :load_extension_initalizers
   end
 end

data/lib/trusty_cms/initializer.rb

@@ -97,7 +97,7 @@ module TrustyCms
     def load_application_initializers
       load_trusty_initializers unless deployed_as_app?
       super
-      extension_loader.load_extension_initalizers
+      extension_loader.load_extension_initializers
     end
 
     # Loads initializers found in TRUSTY_CMS_ROOT/config/initializers.

data/lib/trusty_cms.rb

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