trusty-cms 7.0.0 → 7.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b3802881abb33e2454e530e6b1aa7838cab378ba6ac81b1d31d4e297a9ae081
-  data.tar.gz: 3c72c52104564e1e710efcebbd613c4be325e449a2ac40a10dee6d0c6b80e5af
+  metadata.gz: 12bc34679296612788dd5e4b30cc2bd2c454c326d4a309016e720f770770b1a3
+  data.tar.gz: 71f1f47c70c2a0dd3173248563847d77c25f394d0bcc29cf643dceccb35a51eb
 SHA512:
-  metadata.gz: c6126687648d0a06c411260365aff15bd8c20cbd3f33ff948bbd9deed7306dbd2b05d8b77c42c9b964d8319ff21001e94cd056790ceed4bdbef70ea4090b14fa
-  data.tar.gz: de66fd547414f87175a969b081b490af5c10966f37c4604cfb2aa84cfce70dffd3c11645231ba7bea7b68bfae53081e8206eaf605a48125e600c6d8142e445f8
+  metadata.gz: b292c598d59fbdcee257afb6967f6d0b614d5522894eb0702ca308ef5f77d0ea8580796bad3f9adad3ae70d6f979ff9e4e7f99ce9d339c3644f8f0fece180d90
+  data.tar.gz: 0f0f56c552540bb1997a82764722033b6ca66652af6a341a352c695ccd6a6900acba8a783210d0931a881804d1991e6b437ef6c9cc48a004bafc3132a184a380

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (7.0.0)
+    trusty-cms (7.0.1)
       RedCloth (= 4.3.3)
       activestorage-validator
       acts_as_list (>= 0.9.5, < 1.3.0)

data/app/assets/javascripts/admin/custom_file_upload.js

@@ -1,7 +1,7 @@
 $(function () {
-  var fileUpload = $('#asset_asset');
-  var fileChosen = $('#file-chosen');
-  fileUpload.on('change', function() {
-    fileChosen.text(this.files[0].name)
-  })
+    const fileUpload = $('#asset_asset');
+    const fileChosen = $('#file-chosen');
+    fileUpload.on('change', function () {
+        fileChosen.text(this.files[0].name)
+    })
 });

data/app/controllers/admin/assets_controller.rb

@@ -35,7 +35,7 @@ class Admin::AssetsController < Admin::ResourceController
     @assets = []
     @page_attachments = []
     compress = current_site.try(:compress).nil? ? true : current_site.compress
-    asset_params[:asset][:asset].to_a.each do |uploaded_asset|
+    asset_params[:asset][:asset].reject(&:blank?).each do |uploaded_asset|
       if uploaded_asset.content_type == 'application/octet-stream'
         flash[:notice] = 'Please only upload assets that have a valid extension in the name.'
       else
@@ -90,6 +90,6 @@ class Admin::AssetsController < Admin::ResourceController
   end
 
   def asset_params
-    params.permit(:id, :for_attachment, asset: [:caption, :for_attachment, asset: []])
+    params.permit(:id, :for_attachment, asset: [:for_attachment, { asset: [] }])
   end
 end

data/app/helpers/admin/references_helper.rb

@@ -5,7 +5,7 @@ module Admin::ReferencesHelper
     String.new.tap do |output|
       class_of_page.tag_descriptions.sort.each do |tag_name, description|
         value = t("desc.#{tag_name.gsub(':', '-')}").match('desc') ? description : t("desc.#{tag_name.gsub(':', '-')}")
-        output << render(partial: 'admin/references/tag_reference.haml',
+        output << render(partial: 'admin/references/tag_reference',
                          locals: { tag_name: tag_name,
                                    description: RedCloth.new(TrustyCms::Taggable::Util.strip_leading_whitespace(value)).to_html })
       end
@@ -35,8 +35,8 @@ module Admin::ReferencesHelper
 
   def filter
     @filter ||= begin
-      TextFilter.find_descendant(params[:filter_name])
-    end
+                  TextFilter.find_descendant(params[:filter_name])
+                end
   end
 
   def class_of_page

data/app/views/admin/assets/new.html.haml

@@ -8,7 +8,6 @@
 
     - main.edit_form do
       - form_for :asset, :url => admin_assets_path, :html => { :method => "post", :multipart => true } do |f|
-        = render :partial => "form", :locals => { :f => f }
         %fieldset
           %label.custom-file-upload
             = t("clipped_extension.choose_file")

data/config/boot.rb

@@ -4,4 +4,4 @@
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])

data/lib/generators/extension_controller/extension_controller_generator.rb

@@ -71,7 +71,7 @@ class ExtensionControllerGenerator < ControllerGenerator
   end
 
   def extension_uses_rspec?
-    File.exists?(File.join(destination_root, 'spec')) && !options[:with_test_unit]
+    File.exist?(File.join(destination_root, 'spec')) && !options[:with_test_unit]
   end
 
   def add_options!(opt)

data/lib/generators/extension_mailer/extension_mailer_generator.rb

@@ -55,7 +55,7 @@ class ExtensionMailerGenerator < MailerGenerator
   end
 
   def extension_uses_rspec?
-    File.exists?(File.join(destination_root, 'spec')) && !options[:with_test_unit]
+    File.exist?(File.join(destination_root, 'spec')) && !options[:with_test_unit]
   end
 
   def add_options!(opt)

data/lib/generators/extension_model/extension_model_generator.rb

@@ -55,7 +55,7 @@ class ExtensionModelGenerator < ModelGenerator
   end
 
   def extension_uses_rspec?
-    File.exists?(File.join(destination_root, 'spec')) && !options[:with_test_unit]
+    File.exist?(File.join(destination_root, 'spec')) && !options[:with_test_unit]
   end
 
   def add_options!(opt)

data/lib/generators/instance/instance_generator.rb

@@ -120,28 +120,32 @@ class InstanceGenerator < Rails::Generator::Base
 
   protected
 
-    def banner
-      "Usage: #{$0} /path/to/trusty_cms/app [options]"
-    end
+  def banner
+    "Usage: #{$0} /path/to/trusty_cms/app [options]"
+  end
 
-    def add_options!(opt)
-      opt.separator ''
-      opt.separator 'Options:'
-      opt.on("-r", "--ruby=path", String,
-             "Path to the Ruby binary of your choice (otherwise scripts use env, dispatchers current path).",
-             "Default: #{DEFAULT_SHEBANG}") { |v| options[:shebang] = v }
-      opt.on("-d", "--database=name", String,
-            "Preconfigure for selected database (options: #{DATABASES.join(", ")}).",
-            "Default: sqlite3") { |v| options[:db] = v }
-    end
+  def add_options!(opt)
+    opt.separator ''
+    opt.separator 'Options:'
+    opt.on(
+      "-r", "--ruby=path", String,
+      "Path to the Ruby binary of your choice (otherwise scripts use env, dispatchers current path).",
+      "Default: #{DEFAULT_SHEBANG}"
+    ) { |v| options[:shebang] = v }
+    opt.on(
+      "-d", "--database=name", String,
+      "Preconfigure for selected database (options: #{DATABASES.join(", ")}).",
+      "Default: sqlite3"
+    ) { |v| options[:db] = v }
+  end
 
-    def mysql_socket_location
-      RUBY_PLATFORM =~ /mswin32/ ? MYSQL_SOCKET_LOCATIONS.find { |f| File.exists?(f) } : nil
-    end
+  def mysql_socket_location
+    RUBY_PLATFORM =~ /mswin32/ ? MYSQL_SOCKET_LOCATIONS.find { |f| File.exist?(f) } : nil
+  end
 
   private
 
-    def radiant_root(filename = '')
-      File.join("..", "..", "..", "..", filename)
-    end
-end
+  def radiant_root(filename = '')
+    File.join("..", "..", "..", "..", filename)
+  end
+end

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

@@ -6,4 +6,4 @@ require 'rubygems'
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])

data/lib/tasks/framework.rake

@@ -98,7 +98,7 @@ unless File.directory? "#{Rails.root}/app"
       task :javascripts do
         FileUtils.mkdir_p("#{Rails.root}/public/javascripts/admin/")
         copy_javascripts = proc do |project_dir, scripts|
-          scripts.reject! { |s| File.basename(s) == 'overrides.js' } if File.exists?(project_dir + 'overrides.js')
+          scripts.reject! { |s| File.basename(s) == 'overrides.js' } if File.exist?(project_dir + 'overrides.js')
           FileUtils.cp(scripts, project_dir)
         end
         copy_javascripts[Rails.root + '/public/javascripts/', Dir["#{File.dirname(__FILE__)}/../../public/javascripts/*.js"]]
@@ -228,7 +228,7 @@ the new files: #{warning}"
         project_dir = Rails.root + '/public/stylesheets/admin/'
 
         copy_stylesheets = proc do |project_dir, styles|
-          styles.reject! { |s| File.basename(s) == 'overrides.css' } if File.exists?(project_dir + 'overrides.css')
+          styles.reject! { |s| File.basename(s) == 'overrides.css' } if File.exist?(project_dir + 'overrides.css')
           FileUtils.cp(styles, project_dir)
         end
         copy_stylesheets[Rails.root + '/public/stylesheets/admin/', Dir["#{File.dirname(__FILE__)}/../../public/stylesheets/admin/*.css"]]
@@ -237,7 +237,7 @@ the new files: #{warning}"
       desc 'Update admin sass files from your current trusty install'
       task :sass do
         copy_sass = proc do |project_dir, sass_files|
-          sass_files.reject! { |s| File.basename(s) == 'overrides.sass' } if File.exists?(project_dir + 'overrides.sass') || File.exists?(project_dir + '../overrides.css')
+          sass_files.reject! { |s| File.basename(s) == 'overrides.sass' } if File.exist?(project_dir + 'overrides.sass') || File.exist?(project_dir + '../overrides.css')
           sass_files.reject! { |s| File.directory?(s) }
           FileUtils.mkpath(project_dir)
           FileUtils.cp(sass_files, project_dir)

data/lib/trusty_cms/available_locales.rb

@@ -4,7 +4,7 @@ module TrustyCms::AvailableLocales
   def self.locales
     available_locales = {}
     TrustyCms.configuration.i18n.load_path.each do |path|
-      if File.exists?(path) && path !~ /_available_tags/
+      if File.exist?(path) && path !~ /_available_tags/
         locale_yaml = YAML.load_file(path)
         stem = File.basename(path, '.yml')
         if locale_yaml[stem] && lang = locale_yaml[stem]['this_file_language']

data/lib/trusty_cms/task_support.rb

@@ -47,7 +47,7 @@ module TrustyCms
         end.join("\n\n")
 
         cache_path = File.join(dir, cache_file)
-        File.delete(cache_path) if File.exists?(cache_path)
+        File.delete(cache_path) if File.exist?(cache_path)
         File.open(cache_path, 'w+') { |f| f.write(cache_content) }
       end
 

data/lib/trusty_cms/version.rb

@@ -1,4 +1,4 @@
 module TrustyCms
-  VERSION = '7.0.0'.freeze
+  VERSION = '7.0.2'.freeze
 end
 

metadata

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