trusty-cms 5.3.3 → 5.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c591245f6321610691f2d9342e479eb1b4debdd6db8c9954716487d0ae858f2
-  data.tar.gz: 33c8cdeca0c6ca6cce01bda86a2ad35305659b6170e95420aac4418df219aa35
+  metadata.gz: cf01f0ff82114eed61c1833bae22ab040a78551980250f7beb00ab90c0fda9c6
+  data.tar.gz: 4ebc73d4737c0933aed84ccd95d24421fc222a0968ae572b08688da6913a7437
 SHA512:
-  metadata.gz: ebcefc1ffbceb9e91b955eb531f3e6b034605b29c705a11c602c844c5ceaad43ca5178d995f82a09a35db10ca16edb4c453b8c5a45e017b894b5de3f4b417b9f
-  data.tar.gz: e9df006914845d2d435815ffe12d76d80b47c26ba8e0887d8d2b9aba6b9ce6e9141178f9bceb61d6798148d17624d8830e8267c03a157ff9a28efd9e1af14c31
+  metadata.gz: e20bf4b915b8bbe3b8e2085c011518dfbf1f961dc2db3a8255ce8239710abb20689fe1980cb15b94eacd0a2628f649c47a231069eee966939870c231729bd5ba
+  data.tar.gz: b0f0e9baa3ae7e7929c0c218676d1d0a57dfa3f5873c8907cd19fb1b17c8fcb4214ba7a165ce2ed400527a9b9939fd4437d4ca5693a0764b69deb751f3cdcc08

data/Gemfile.lock

@@ -202,11 +202,8 @@ GEM
       libv8-node (~> 16.10.0.0)
     minitest (5.15.0)
     multi_xml (0.6.0)
-
     multipart-post (2.2.2)
-
     mysql2 (0.5.4)
-
     nio4r (2.5.8)
     nokogiri (1.12.5-x86_64-darwin)
       racc (~> 1.4)

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/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/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/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

@@ -4,14 +4,14 @@ namespace :trusty_cms 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
+      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
+      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.3'.freeze
+    VERSION = '5.3.4'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 5.3.3
+  version: 5.3.4
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-10 00:00:00.000000000 Z
+date: 2022-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-validator