trusty-cms 5.3 → 5.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38fabf49ce5ba5526134087066b03104bffd2068b1cae9fff879905e67ce1185
-  data.tar.gz: 8272cba43aef447d20d5e7320998c7f61a081cd2194f59d12419a8047f33f87d
+  metadata.gz: 4c591245f6321610691f2d9342e479eb1b4debdd6db8c9954716487d0ae858f2
+  data.tar.gz: 33c8cdeca0c6ca6cce01bda86a2ad35305659b6170e95420aac4418df219aa35
 SHA512:
-  metadata.gz: c907cb268f754852fa624b73be17dfb7d428b00aa9259b5557a3050ca7809ff618f37375b6876c085bc44b4ae6df981d84ae2943ba0d2b9e8a7f1fe33fb13620
-  data.tar.gz: 9986b6a5c0873b5f6b51581be2028146e3c98a5f0994de24d90a607377bb68d99ff554e9b7dbbbc3e891baf5ddbe88e1aeda5e7aa8c33317e3c1b65f3c4b6d1d
+  metadata.gz: ebcefc1ffbceb9e91b955eb531f3e6b034605b29c705a11c602c844c5ceaad43ca5178d995f82a09a35db10ca16edb4c453b8c5a45e017b894b5de3f4b417b9f
+  data.tar.gz: e9df006914845d2d435815ffe12d76d80b47c26ba8e0887d8d2b9aba6b9ce6e9141178f9bceb61d6798148d17624d8830e8267c03a157ff9a28efd9e1af14c31

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,11 @@ 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 +223,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.3.1)
     rack-cache (1.13.0)
       rack (>= 0.4)
     rack-test (1.1.0)
@@ -356,7 +359,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/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/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'.freeze
+    VERSION = '5.3.3'.freeze
   end
 end

data/package.json

@@ -1,7 +1,7 @@
 {
   "name": "trusty-cms",
-  "version": "3.1.6",
-  "description": "TrustyCMS is a branch of Radiant CMS. Its goal is to pull the Radiant framework into Rails 5 with minimal changes to its infrastructure.",
+  "version": "5.3.1",
+  "description": "TrustyCMS is a branch of Radiant CMS. Its goal is to pull the Radiant framework into Rails 6 with minimal changes to its infrastructure.",
   "main": "index.js",
   "repository": "https://github.com/pgharts/trusty-cms.git",
   "author": "Danielle Greaves <danigreaves@gmail.com>",
@@ -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.4",
     "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.4:
+  version "1.19.4"
+  resolved "https://registry.yarnpkg.com/jquery-validation/-/jquery-validation-1.19.4.tgz#a765781d954e5876fa437d5c75b7a9440bfa37a8"
+  integrity sha512-PcwKcATCR+JL77m9kkWd84NAHAunJP9iasF6IbMxUgl73xDAimxjt5oYFmYHDXBmTZM4rpkXxMNR/jGI5TlSjA==
 
 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'
+  version: 5.3.3
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-01 00:00:00.000000000 Z
+date: 2022-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-validator
@@ -1168,52 +1168,52 @@ signing_key:
 specification_version: 4
 summary: A no-fluff content management system designed for small teams.
 test_files:
-- spec/dummy/db/schema.rb
-- spec/dummy/yarn.lock
-- spec/dummy/public/422.html
+- 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/package.json
+- spec/dummy/db/schema.rb
 - spec/dummy/config.ru
-- spec/dummy/config/environments/production.rb
+- spec/dummy/package.json
+- spec/dummy/bin/rake
+- spec/dummy/bin/rails
+- spec/dummy/bin/setup
+- spec/dummy/bin/bundle
+- spec/dummy/README.rdoc
+- spec/dummy/Rakefile
+- spec/dummy/config/application.rb
+- spec/dummy/config/routes.rb
 - spec/dummy/config/environments/test.rb
 - spec/dummy/config/environments/development.rb
-- spec/dummy/config/environment.rb
-- spec/dummy/config/secrets.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/config/application.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/environments/production.rb
+- spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/initializers/cookies_serializer.rb
+- spec/dummy/config/initializers/filter_parameter_logging.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/trusty_cms_config.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/assets.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/Rakefile
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rake
-- spec/dummy/bin/rails
-- spec/dummy/bin/setup
-- spec/dummy/README.rdoc
-- spec/features/pages_spec.rb
-- spec/features/config_spec.rb
-- spec/features/layouts_spec.rb
+- spec/dummy/yarn.lock
+- spec/ci/database.mysql.yml
+- spec/support/custom_actions.rb
 - spec/rails_helper.rb
-- spec/controllers/users_controller_spec.rb
-- spec/controllers/application_controller_spec.rb
-- spec/fixtures/users.yml
-- spec/models/layout_spec.rb
-- spec/factories/layout.rb
 - spec/factories/user.rb
-- spec/factories/page.rb
 - spec/factories/page_part.rb
-- spec/support/custom_actions.rb
-- spec/ci/database.mysql.yml
+- spec/factories/layout.rb
+- spec/factories/page.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