trusty-cms 5.2.3 → 5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47f1958b702fa213e0ed7be3725d9e846c619a966bdc614c3e30cac3e4cd190e
-  data.tar.gz: 9ae273f919dd49d71b3288de4d797578c74684b071648b1ee9ad70abdf89b2a5
+  metadata.gz: 38fabf49ce5ba5526134087066b03104bffd2068b1cae9fff879905e67ce1185
+  data.tar.gz: 8272cba43aef447d20d5e7320998c7f61a081cd2194f59d12419a8047f33f87d
 SHA512:
-  metadata.gz: 0acfc01a195112e57d8297268c86c4da2773e781b7bb76f16b07606a78f631fe6213906ed4288aa7a17e1bd09b73d4f2cc77cbd34db1853b096078d22e283e97
-  data.tar.gz: 452fea2947b5fddc0e1c4522d30f67d4bb8ec30c4770e9d5c09aa7837799e91ac9959fe6ff95fd7ae783c418d2b2898ab8afb620046e40c7c7ca221e0fd14f60
+  metadata.gz: c907cb268f754852fa624b73be17dfb7d428b00aa9259b5557a3050ca7809ff618f37375b6876c085bc44b4ae6df981d84ae2943ba0d2b9e8a7f1fe33fb13620
+  data.tar.gz: 9986b6a5c0873b5f6b51581be2028146e3c98a5f0994de24d90a607377bb68d99ff554e9b7dbbbc3e891baf5ddbe88e1aeda5e7aa8c33317e3c1b65f3c4b6d1d

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'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 5.2.3
+  version: '5.3'
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-18 00:00:00.000000000 Z
+date: 2022-06-01 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/package.json
+- spec/dummy/db/schema.rb
 - spec/dummy/yarn.lock
-- spec/dummy/bin/rake
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rails
-- spec/dummy/bin/setup
-- 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/public/422.html
+- spec/dummy/public/500.html
+- spec/dummy/public/404.html
+- spec/dummy/public/favicon.ico
+- spec/dummy/app/assets/config/manifest.js
+- spec/dummy/package.json
+- spec/dummy/config.ru
 - spec/dummy/config/environments/production.rb
-- spec/dummy/config/database.yml
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/environments/development.rb
 - 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/secrets.yml
+- spec/dummy/config/routes.rb
+- spec/dummy/config/application.rb
+- spec/dummy/config/initializers/backtrace_silencers.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/trusty_cms_config.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/wrap_parameters.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/database.yml
+- 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/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/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/features/layouts_spec.rb
 - spec/features/pages_spec.rb
 - spec/features/config_spec.rb
+- spec/features/layouts_spec.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/spec_helper.rb