trusty-cms 5.3.2 → 5.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be4e9c02223ff0d0f060b7ea9b941c3e031df71f942c31898e4cc936e7575e1d
-  data.tar.gz: 0c7d82d1e442acb98d4d69814d11539f27d28fe8282129b2fc3358f6893de43a
+  metadata.gz: 2f41c5db88399ed3675b8082e59ed41c9bf5fdfedf929575c4b8fc5100edf54b
+  data.tar.gz: daef5f8d9dfde5ccb49d4e0c41f547515ce90414809d8e3e053af21318ad823f
 SHA512:
-  metadata.gz: b4d5bb952c13cbab60c3985a395ddc1d71b263e55504898ead1f69b17279cb5c430c55f013b246c9d60c2c9fa99adddb1de48df259e2d1b2e340c6e19ae50156
-  data.tar.gz: 384d7c0727f28d4c68396e95d8c0ea8a418964f6551f858ac7aeaf1abe4539db4f8385260b7537b3f7c0ed492fd951131d562fd748ac4e866af21232651a616d
+  metadata.gz: 7f03979458cf796043da050714854a889eea8c3a846c6ab0358c5ec015a9bebcc742153fabbee0613c73b0b5e4e9e693f4ebe21f58a60cf3c53d248d8532138a
+  data.tar.gz: 3572d0b7d1cb9b2eb99877960b7fa3ceb8dc82eb4b3197971c43bd3e51a0ca48aceb9abefce3d7b3fd7e1dad21d8b35da6327e7d2e1d8ed3cc5ade8584bc5900

data/Gemfile

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (5.3)
+    trusty-cms (5.3.3)
       RedCloth (= 4.3.2)
       activestorage-validator
       acts_as_list (>= 0.9.5, < 1.1.0)
@@ -202,8 +202,8 @@ GEM
       libv8-node (~> 16.10.0.0)
     minitest (5.15.0)
     multi_xml (0.6.0)
-    multipart-post (2.1.1)
-    mysql2 (0.5.3)
+    multipart-post (2.2.2)
+    mysql2 (0.5.4)
     nio4r (2.5.8)
     nokogiri (1.12.5-x86_64-darwin)
       racc (~> 1.4)
@@ -220,11 +220,11 @@ GEM
     pry-byebug (3.9.0)
       byebug (~> 11.0)
       pry (~> 0.13.0)
-    psych (4.0.3)
+    psych (4.0.4)
       stringio
     public_suffix (4.0.6)
     racc (1.6.0)
-    rack (2.2.3)
+    rack (2.2.4)
     rack-cache (1.13.0)
       rack (>= 0.4)
     rack-test (1.1.0)
@@ -248,7 +248,7 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
+    rails-html-sanitizer (1.4.3)
       loofah (~> 2.3)
     rails-observers (0.1.5)
       activemodel (>= 4.0)
@@ -356,7 +356,7 @@ DEPENDENCIES
   mysql2
   poltergeist (~> 1.18.1)
   pry-byebug
-  psych (= 4.0.3)
+  psych (= 4.0.4)
   rails-observers
   rspec-rails
   simplecov

data/app/controllers/admin/assets_controller.rb

@@ -41,18 +41,23 @@ class Admin::AssetsController < Admin::ResourceController
       else
         uploaded_asset = compress(uploaded_asset) if $kraken.api_key.present? && COMPRESS_FILE_TYPE.include?(uploaded_asset.content_type) && compress
         @asset = Asset.create(asset: uploaded_asset, caption: asset_params[:asset][:caption])
-        set_owner_or_editor
-        if params[:for_attachment]
-          @page = Page.find_by_id(params[:page_id]) || Page.new
-          @page_attachments << @page_attachment = @asset.page_attachments.build(page: @page)
+        if @asset.valid?
+          set_owner_or_editor
+          if params[:for_attachment]
+            @page = Page.find_by_id(params[:page_id]) || Page.new
+            @page_attachments << @page_attachment = @asset.page_attachments.build(page: @page)
+          end
+          @assets << @asset
+        else
+          error = @asset.errors.first.message
+          flash[:error] = error
         end
-        @assets << @asset
       end
-    end
-    if asset_params[:for_attachment]
-      render partial: 'admin/page_attachments/attachment', collection: @page_attachments
-    else
-      response_for :create
+      if asset_params[:for_attachment]
+        render partial: 'admin/page_attachments/attachment', collection: @page_attachments
+      else
+        response_for :create
+      end
     end
   end
 

data/app/mailers/rad_social_mailer.rb

@@ -10,7 +10,7 @@ class RadSocialMailer < ApplicationMailer
     @from_name = from_address.display_name
     @from_email = from_address
     @message = options[:message]
-    @actual_from = ENV['RAD_SOCIAL_FROM_EMAIL']
+    @actual_from = ENV.fetch('RAD_SOCIAL_FROM_EMAIL')
     @actual_from = from_address if @actual_from.nil?
 
     mail({

data/app/models/asset.rb

@@ -37,7 +37,7 @@ class Asset < ActiveRecord::Base
             blob:
               {
                 content_type: %w[application/zip image/jpg image/jpeg image/png image/gif application/pdf text/css],
-                size_range: 1..5.megabytes,
+                size_range: 1..10.megabytes,
               }
   before_save :assign_title
   before_save :assign_uuid

data/app/models/standard_tags.rb

@@ -362,7 +362,7 @@ module StandardTags
       tag.locals.page = aggregate_page
       aggregates << tag.expand
     end
-    aggregates.flatten.join('')
+    aggregates.flatten.join
   end
 
   tag 'aggregate:each:children' do |tag|
@@ -380,7 +380,7 @@ module StandardTags
       tag.locals.page = item
       result << tag.expand
     end
-    result.flatten.join('')
+    result.flatten.join
   end
 
   tag 'aggregate:children' do |tag|
@@ -976,7 +976,7 @@ module StandardTags
       tag.locals.paginated_list = displayed_children
       result << tag.render('pagination', tag.attr.dup)
     end
-    result.flatten.join('')
+    result.flatten.join
   end
 
   def children_find_options(tag)

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

@@ -1,8 +1,8 @@
 unless defined? TRUSTY_CMS_ROOT
   ENV["Rails.env"] = "test"
   case
-  when ENV["RADIANT_ENV_FILE"]
-    require ENV["RADIANT_ENV_FILE"]
+  when ENV.fetch('RADIANT_ENV_FILE')
+    require ENV.fetch('RADIANT_ENV_FILE')
   when File.dirname(__FILE__) =~ %r{vendor/trusty_cms/vendor/extensions}
     require "#{File.expand_path(File.dirname(__FILE__) + "/../../../../../../")}/config/environment"
   else

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

@@ -3,8 +3,8 @@ require 'test/unit'
 unless defined? TRUSTY_CMS_ROOT
   ENV['Rails.env'] = 'test'
   case
-  when ENV['RADIANT_ENV_FILE']
-    require ENV['RADIANT_ENV_FILE']
+  when ENV.fetch('RADIANT_ENV_FILE')
+    require ENV.fetch('RADIANT_ENV_FILE')
   when File.dirname(__FILE__) =~ %r{vendor/trusty_cms/vendor/extensions}
     require "#{File.expand_path(File.dirname(__FILE__) + '/../../../../../../')}/config/environment"
   else

data/lib/generators/instance/templates/instance_boot.rb

@@ -2,7 +2,7 @@
 # Configure your app in config/environment.rb and config/environments/*.rb
 
 Rails.root = "#{File.dirname(__FILE__)}/.." unless defined?(Rails.root)
-Rails.env = (ENV['RAILS_ENV'] || 'development').dup unless defined?(Rails.env)
+Rails.env = ENV.fetch('RAILS_ENV', 'development').dup unless defined?(Rails.env)
 
 module Rails
   class << self

data/lib/generators/instance/templates/instance_environment.rb

@@ -59,8 +59,7 @@ TrustyCms::Initializer.run do |config|
                         :verbose => false,
                         :allow_reload => false,
                         :allow_revalidate => false
-  # TODO: There's got to be a better place for this, but in order for assets to work fornow, we need ConditionalGet
-  # TODO: Workaround from: https://github.com/rtomayko/rack-cache/issues/80
+
   config.middleware.insert_before(Rack::ConditionalGet, Rack::Cache)
   config.assets.enabled = true
 

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

@@ -1,8 +1,8 @@
 unless defined? TRUSTY_CMS_ROOT
   ENV["Rails.env"] = "test"
   case
-  when ENV["RADIANT_ENV_FILE"]
-    require ENV["RADIANT_ENV_FILE"]
+  when ENV.fetch('RADIANT_ENV_FILE')
+    require ENV.fetch('RADIANT_ENV_FILE')
   when File.dirname(__FILE__) =~ %r{vendor/trusty_cms/vendor/extensions}
     require "#{File.expand_path(File.dirname(__FILE__) + "/../../../../../../")}/config/environment"
   else

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

@@ -3,8 +3,8 @@ require 'test/unit'
 unless defined? TRUSTY_CMS_ROOT
   ENV["Rails.env"] = "test"
   case
-  when ENV["RADIANT_ENV_FILE"]
-    require ENV["RADIANT_ENV_FILE"]
+  when ENV.fetch('RADIANT_ENV_FILE')
+    require ENV.fetch('RADIANT_ENV_FILE')
   when File.dirname(__FILE__) =~ %r{vendor/trusty_cms/vendor/extensions}
     require "#{File.expand_path(File.dirname(__FILE__) + "/../../../../../../")}/config/environment"
   else

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

@@ -86,7 +86,6 @@ module TrustyCms
     #    radiant: since this will enable manual expiration and acceleration headers.
 
 
-    # TODO: We're not sure this is actually working, but we can't really test this until the app initializes.
     config.middleware.use Rack::Cache,
                           :private_headers => ['Authorization'],
                           :entitystore => "radiant:tmp/cache/entity",
@@ -94,8 +93,7 @@ module TrustyCms
                           :verbose => false,
                           :allow_reload => false,
                           :allow_revalidate => false
-    # TODO: There's got to be a better place for this, but in order for assets to work fornow, we need ConditionalGet
-    # TODO: Workaround from: https://github.com/rtomayko/rack-cache/issues/80
+
     config.middleware.insert_before(Rack::ConditionalGet, Rack::Cache)
     config.assets.enabled = true
 

data/lib/tasks/database.rake

@@ -59,10 +59,10 @@ namespace :db do
   task bootstrap: :initialize do
     require 'trusty_cms/setup'
     TrustyCms::Setup.bootstrap(
-      admin_name: ENV['ADMIN_NAME'],
-      admin_username: ENV['ADMIN_USERNAME'],
-      admin_password: ENV['ADMIN_PASSWORD'],
-      database_template: ENV['DATABASE_TEMPLATE'],
+      admin_name: ENV.fetch('ADMIN_NAME'),
+      admin_username: ENV.fetch('ADMIN_USERNAME'),
+      admin_password: ENV.fetch('ADMIN_PASSWORD'),
+      database_template: ENV.fetch('DATABASE_TEMPLATE'),
     )
     puts %{
 Your TrustyCms application is ready to use. Run `rails s -e production` to

data/lib/tasks/framework.rake

@@ -7,7 +7,7 @@ unless File.directory? "#{Rails.root}/app"
         require 'rubygems'
         require 'rubygems/gem_runner'
 
-        trusty = (version = ENV['VERSION']) ?
+        trusty = (version = ENV.fetch('VERSION')) ?
           Gem.cache.search('trusty-cms', "= #{version}").first :
           Gem.cache.search('trusty-cms').max_by { |g| g.version }
 

data/lib/tasks/radiant_config.rake

@@ -3,15 +3,15 @@ namespace :trusty_cms do
   namespace :config do
     desc 'Export TrustyCms::Config to Rails.root/config/trusty_config.yml. Specify a path with TRUSTY_CONFIG_PATH - defaults to Rails.root/config/trusty_config.yml'
     task export: :environment do
-      config_path = ENV['TRUSTY_CONFIG_PATH'] || "#{Rails.root}/config/trusty_config.yml"
-      clear = ENV['CLEAR_CONFIG'] || nil
+      config_path = ENV.fetch('TRUSTY_CONFIG_PATH') { "#{Rails.root}/config/trusty_config.yml" }
+      clear = ENV.fetch('CLEAR_CONFIG', nil)
       TrustyCms::TaskSupport.config_export(config_path)
     end
 
     desc 'Import TrustyCms::Config from Rails.root/config/trusty_config.yml. Specify a path with TRUSTY_CONFIG_PATH - defaults to Rails.root/config/trusty_config.yml Set CLEAR_CONFIG=true to delete all existing settings before import'
     task import: :environment do
-      config_path = ENV['TRUSTY_CONFIG_PATH'] || "#{Rails.root}/config/trusty_config.yml"
-      clear = ENV['CLEAR_CONFIG'] || nil
+      config_path = ENV('TRUSTY_CONFIG_PATH') { "#{Rails.root}/config/trusty_config.yml" }
+      clear = ENV.fetch('CLEAR_CONFIG', nil)
       TrustyCms::TaskSupport.config_import(config_path, clear)
     end
   end

data/lib/tasks/upgrade_to_devise.rake

@@ -10,8 +10,8 @@ namespace :import do
     LegacyUser.all.each do |legacy|
       u = User.new(
         email: legacy.email,
-        first_name: legacy.name.split(' ')[0],
-        last_name: legacy.name.split(' ')[1],
+        first_name: legacy.name.split[0],
+        last_name: legacy.name.split[1],
         password: password,
         password_confirmation: password,
         admin: legacy.admin,

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.3.2'.freeze
+    VERSION = '5.3.5'.freeze
   end
 end

data/package.json

@@ -13,7 +13,7 @@
     "jquery-treetable": "^3.2.0-1",
     "jquery-ui-bundle": "^1.12.1",
     "jquery-ujs": "^1.2.2",
-    "jquery-validation": "^1.19.3",
+    "jquery-validation": "^1.19.5",
     "js-cookie": "^3.0.1",
     "tablesaw": "^3.1.2"
   },

data/yarn.lock

@@ -974,10 +974,10 @@ jquery-ujs@^1.2.2:
   dependencies:
     jquery ">=1.8.0"
 
-jquery-validation@^1.19.3:
-  version "1.19.3"
-  resolved "https://registry.yarnpkg.com/jquery-validation/-/jquery-validation-1.19.3.tgz#50b350eba8b02bcfd119ba15f199487b7eb64086"
-  integrity sha512-iXxCS5W7STthSTMFX/NDZfWHBLbJ1behVK3eAgHXAV8/0vRa9M4tiqHvJMr39VGWHMGdlkhrtrkBuaL2UlE8yw==
+jquery-validation@^1.19.5:
+  version "1.19.5"
+  resolved "https://registry.yarnpkg.com/jquery-validation/-/jquery-validation-1.19.5.tgz#557495b7cad79716897057c4447ad3cd76fda811"
+  integrity sha512-X2SmnPq1mRiDecVYL8edWx+yTBZDyC8ohWXFhXdtqFHgU9Wd4KHkvcbCoIZ0JaSaumzS8s2gXSkP8F7ivg/8ZQ==
 
 jquery@>=1.6:
   version "3.6.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 5.3.2
+  version: 5.3.5
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-08 00:00:00.000000000 Z
+date: 2022-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-validator
@@ -1169,51 +1169,51 @@ specification_version: 4
 summary: A no-fluff content management system designed for small teams.
 test_files:
 - spec/fixtures/users.yml
-- spec/dummy/public/500.html
-- spec/dummy/public/422.html
-- spec/dummy/public/404.html
-- spec/dummy/public/favicon.ico
-- spec/dummy/app/assets/config/manifest.js
-- spec/dummy/db/schema.rb
+- spec/models/layout_spec.rb
+- spec/spec_helper.rb
 - spec/dummy/config.ru
-- spec/dummy/package.json
 - spec/dummy/bin/rake
-- spec/dummy/bin/rails
 - spec/dummy/bin/setup
 - spec/dummy/bin/bundle
+- spec/dummy/bin/rails
+- spec/dummy/public/422.html
+- spec/dummy/public/500.html
+- spec/dummy/public/favicon.ico
+- spec/dummy/public/404.html
 - spec/dummy/README.rdoc
-- spec/dummy/Rakefile
-- spec/dummy/config/application.rb
-- spec/dummy/config/routes.rb
+- spec/dummy/yarn.lock
+- spec/dummy/config/secrets.yml
+- spec/dummy/config/locales/en.yml
 - spec/dummy/config/environments/test.rb
-- spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
-- spec/dummy/config/initializers/assets.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/application.rb
+- spec/dummy/config/boot.rb
+- spec/dummy/config/environment.rb
+- spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/cookies_serializer.rb
+- spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/trusty_cms_config.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/secrets.yml
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/yarn.lock
-- spec/ci/database.mysql.yml
-- spec/support/custom_actions.rb
-- spec/rails_helper.rb
-- spec/factories/user.rb
-- spec/factories/page_part.rb
-- spec/factories/layout.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
+- spec/dummy/config/routes.rb
+- spec/dummy/app/assets/config/manifest.js
+- spec/dummy/package.json
+- spec/dummy/db/schema.rb
+- spec/dummy/Rakefile
 - spec/factories/page.rb
+- spec/factories/layout.rb
+- spec/factories/page_part.rb
+- spec/factories/user.rb
+- spec/features/config_spec.rb
+- spec/features/pages_spec.rb
+- spec/features/layouts_spec.rb
+- spec/support/custom_actions.rb
 - spec/controllers/users_controller_spec.rb
 - spec/controllers/application_controller_spec.rb
-- spec/spec_helper.rb
-- spec/features/layouts_spec.rb
-- spec/features/pages_spec.rb
-- spec/features/config_spec.rb
-- spec/models/layout_spec.rb
+- spec/ci/database.mysql.yml
+- spec/rails_helper.rb