trusty-cms 5.2.2 → 5.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0873cdea83c6d22b3d8fc20f35721d99a21de43f6bc6b7e19c4939ca8f7f8d4f'
-  data.tar.gz: 76e92c2d55993cf8a75d1cfd3af2e8e273b49a3b84c1c3020af6111a6de0a2e3
+  metadata.gz: 0db12a9ef02b41ed7f72023d47359e2d09ba6ee251d6a6b2df8d128742ce17ad
+  data.tar.gz: b227c357bf7c52bd7c9bb4fa4dd369d039f0aa422e1bf1dcaac446a24ea151c7
 SHA512:
-  metadata.gz: 6ab046ad79cae4a2e785065295392e55d47e6365a4ca7889b993c034e9d61d6df9834e175fcb179f05964d1d898d33a285df75e268622ed54f72793e4129ca65
-  data.tar.gz: 31897515f17878210022247f17db5bd84b870cc5285c07b4ab750d4449b2cafeea541ca9a779a690a78a792f099f7ff3669c9caf0e4e6e5fda8d0f910e77d278
+  metadata.gz: ea4ae2569c7703a5fadbe8da6b6dc94fe10f7e46cc52f7cfc51df874e164ff0916c78f3f0cc1c82c8175c2d6b4e71a650f8b4c2c5a86761e03d50ec40f6bbd38
+  data.tar.gz: 6bacfa11732c89241179a97accbb018f37a5d164ae86011ad4f7df4cf5e7d2be3328e57211f4cbb68dcdf49e23367b81a30bc06909cbf363f25c6ef889f0fa82

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (5.2.2)
+    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)
@@ -220,7 +220,7 @@ GEM
     pry-byebug (3.9.0)
       byebug (~> 11.0)
       pry (~> 0.13.0)
-    psych (4.0.4)
+    psych (4.0.3)
       stringio
     public_suffix (4.0.6)
     racc (1.6.0)
@@ -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.2'.freeze
+    VERSION = '5.3.1'.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>",

data/spec/dummy/package.json

@@ -5,6 +5,7 @@
   "license": "MIT",
   "dependencies": {
     "jquery": "^3.5.0",
+    "jquery-treetable": "^3.2.0-1",
     "jquery-ui-bundle": "^1.12.1",
     "jquery-ujs": "^1.2.2"
   }

data/spec/dummy/yarn.lock

@@ -2,6 +2,13 @@
 # yarn lockfile v1
 
 
+jquery-treetable@^3.2.0-1:
+  version "3.2.0-1"
+  resolved "https://registry.yarnpkg.com/jquery-treetable/-/jquery-treetable-3.2.0-1.tgz#2a844f59396f764f71747a5087ee555d360aaed7"
+  integrity sha1-KoRPWTlvdk9xdHpQh+5VXTYKrtc=
+  dependencies:
+    jquery ">=1.6"
+
 jquery-ui-bundle@^1.12.1:
   version "1.12.1"
   resolved "https://registry.yarnpkg.com/jquery-ui-bundle/-/jquery-ui-bundle-1.12.1.tgz#d6be2e4c377494e2378b1cae2920a91d1182d8c4"
@@ -12,6 +19,11 @@ jquery-ujs@^1.2.2:
   dependencies:
     jquery ">=1.8.0"
 
+jquery@>=1.6:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
+  integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
+
 jquery@>=1.8.0, jquery@^3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 5.2.2
+  version: 5.3.1
 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