trusty-cms 5.2.3 → 5.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47f1958b702fa213e0ed7be3725d9e846c619a966bdc614c3e30cac3e4cd190e
-  data.tar.gz: 9ae273f919dd49d71b3288de4d797578c74684b071648b1ee9ad70abdf89b2a5
+  metadata.gz: be4e9c02223ff0d0f060b7ea9b941c3e031df71f942c31898e4cc936e7575e1d
+  data.tar.gz: 0c7d82d1e442acb98d4d69814d11539f27d28fe8282129b2fc3358f6893de43a
 SHA512:
-  metadata.gz: 0acfc01a195112e57d8297268c86c4da2773e781b7bb76f16b07606a78f631fe6213906ed4288aa7a17e1bd09b73d4f2cc77cbd34db1853b096078d22e283e97
-  data.tar.gz: 452fea2947b5fddc0e1c4522d30f67d4bb8ec30c4770e9d5c09aa7837799e91ac9959fe6ff95fd7ae783c418d2b2898ab8afb620046e40c7c7ca221e0fd14f60
+  metadata.gz: b4d5bb952c13cbab60c3985a395ddc1d71b263e55504898ead1f69b17279cb5c430c55f013b246c9d60c2c9fa99adddb1de48df259e2d1b2e340c6e19ae50156
+  data.tar.gz: 384d7c0727f28d4c68396e95d8c0ea8a418964f6551f858ac7aeaf1abe4539db4f8385260b7537b3f7c0ed492fd951131d562fd748ac4e866af21232651a616d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (5.2.3)
+    trusty-cms (5.3)
       RedCloth (= 4.3.2)
       activestorage-validator
       acts_as_list (>= 0.9.5, < 1.1.0)
@@ -198,7 +198,6 @@ GEM
     mime-types-data (3.2021.0225)
     mini_magick (4.11.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.6.1)
     mini_racer (0.6.2)
       libv8-node (~> 16.10.0.0)
     minitest (5.15.0)
@@ -206,8 +205,9 @@ GEM
     multipart-post (2.1.1)
     mysql2 (0.5.3)
     nio4r (2.5.8)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.12.5-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.12.5-x86_64-linux)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     poltergeist (1.18.1)
@@ -364,4 +364,4 @@ DEPENDENCIES
   trustygems (~> 0.2.0)
 
 BUNDLED WITH
-   2.2.31
+   2.3.4

data/app/controllers/admin/assets_controller.rb

@@ -34,7 +34,7 @@ class Admin::AssetsController < Admin::ResourceController
   def create
     @assets = []
     @page_attachments = []
-    compress = current_site.try(:compress) ? current_site.compress : true
+    compress = current_site.try(:compress).nil? ? true : current_site.compress
     asset_params[:asset][:asset].to_a.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.'
@@ -72,7 +72,8 @@ class Admin::AssetsController < Admin::ResourceController
   def compress(uploaded_asset)
     require 'open-uri'
     data = $kraken.upload(uploaded_asset.tempfile.path, 'lossy' => true)
-    File.write(uploaded_asset.tempfile, URI.open(data.kraked_url).read, mode: 'wb')
+    new_asset = data.success ? data.kraked_url : uploaded_asset.tempfile.path
+    File.write(uploaded_asset.tempfile, URI.open(new_asset).read, mode: 'wb')
     uploaded_asset
   end
 

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.2.3'.freeze
+    VERSION = '5.3.2'.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>",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 5.2.3
+  version: 5.3.2
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-18 00:00:00.000000000 Z
+date: 2022-06-08 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/spec_helper.rb
-- spec/support/custom_actions.rb
 - 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/dummy/config.ru
 - spec/dummy/package.json
-- spec/dummy/yarn.lock
 - spec/dummy/bin/rake
-- spec/dummy/bin/bundle
 - spec/dummy/bin/rails
 - spec/dummy/bin/setup
+- spec/dummy/bin/bundle
+- spec/dummy/README.rdoc
 - spec/dummy/Rakefile
-- spec/dummy/config/boot.rb
-- spec/dummy/config/secrets.yml
 - spec/dummy/config/application.rb
 - spec/dummy/config/routes.rb
-- spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/test.rb
+- spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/locales/en.yml
 - spec/dummy/config/initializers/assets.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/initializers/trusty_cms_config.rb
-- spec/dummy/config/initializers/backtrace_silencers.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/README.rdoc
-- spec/dummy/app/assets/config/manifest.js
-- spec/dummy/db/schema.rb
-- spec/dummy/public/422.html
-- spec/dummy/public/500.html
-- spec/dummy/public/favicon.ico
-- spec/dummy/public/404.html
-- spec/dummy/config.ru
+- spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/inflections.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/factories/page.rb
-- spec/factories/page_part.rb
-- spec/factories/user.rb
-- spec/controllers/application_controller_spec.rb
 - spec/controllers/users_controller_spec.rb
-- spec/rails_helper.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