trusty-cms 5.2.1 → 5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3557cf6a591a541c692261c86d2f6d68f3890b4785606c5f0655a853bb58b984
-  data.tar.gz: 22626f585127b3155a8fa90cd2c0d37ea16a41ea91cad9f07cc1c5632c5b077b
+  metadata.gz: 38fabf49ce5ba5526134087066b03104bffd2068b1cae9fff879905e67ce1185
+  data.tar.gz: 8272cba43aef447d20d5e7320998c7f61a081cd2194f59d12419a8047f33f87d
 SHA512:
-  metadata.gz: db64d86a59f381bfd2bed0cea2febd51d8ccece3a306c9c4136bf44db62a36c90f77d19870a9c8c31f85467ae91e1101492c410b19e95be84e9b14cdd5549147
-  data.tar.gz: 4f626772569d3cda1a62c1657a466c4ad61677ff62f75baec957b011e668a5187aee4ad227ad34634275e135c81d436c11052efd35a12ff306395ce59efc9e35
+  metadata.gz: c907cb268f754852fa624b73be17dfb7d428b00aa9259b5557a3050ca7809ff618f37375b6876c085bc44b4ae6df981d84ae2943ba0d2b9e8a7f1fe33fb13620
+  data.tar.gz: 9986b6a5c0873b5f6b51581be2028146e3c98a5f0994de24d90a607377bb68d99ff554e9b7dbbbc3e891baf5ddbe88e1aeda5e7aa8c33317e3c1b65f3c4b6d1d

data/Gemfile

@@ -21,6 +21,7 @@ group :development, :test do
   gem 'mysql2'
   gem 'poltergeist', '~> 1.18.1'
   gem 'pry-byebug'
+  gem 'psych', '4.0.3'
   gem 'rails-observers'
   gem 'rspec-rails'
   gem 'simplecov'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (5.2.1)
+    trusty-cms (5.3)
       RedCloth (= 4.3.2)
       activestorage-validator
       acts_as_list (>= 0.9.5, < 1.1.0)
@@ -205,9 +205,9 @@ GEM
     multipart-post (2.1.1)
     mysql2 (0.5.3)
     nio4r (2.5.8)
-    nokogiri (1.13.6-x86_64-darwin)
+    nokogiri (1.12.5-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.6-x86_64-linux)
+    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)
@@ -356,6 +356,7 @@ DEPENDENCIES
   mysql2
   poltergeist (~> 1.18.1)
   pry-byebug
+  psych (= 4.0.3)
   rails-observers
   rspec-rails
   simplecov
@@ -363,4 +364,4 @@ DEPENDENCIES
   trustygems (~> 0.2.0)
 
 BUNDLED WITH
-   2.2.31
+   2.3.4

data/app/assets/javascripts/admin.js

@@ -15,7 +15,7 @@
 //= require jquery-ui-bundle/jquery-ui
 //= require js-cookie/dist/js.cookie
 //= require 'jquery-validation/dist/jquery.validate.min'
-//= require 'jquery-treetable/jquery.treetable'
+//= require jquery-treetable/jquery.treetable.js
 //= require_tree './admin/validations'
 //= require ckeditor/init
 //= require 'admin/persist.min'

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.1'.freeze
+    VERSION = '5.3'.freeze
   end
 end

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.1
+  version: '5.3'
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-17 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