trusty-cms 4.2.3 → 4.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52cf02d801b74acdecb1e9e86ed217a1670ffad05bb213a32c7c2bd591a83987
-  data.tar.gz: 7b896f7719317c52daad8aea07b08c984016ca0d02a156db0ccbff8d536c3f08
+  metadata.gz: fe654730f50bc3d6dcf534e6b6ae0fcd06bd8e759135a163de32feb11ec0ab23
+  data.tar.gz: c20b4f267e75c28277d1dc8bcef25747bc83968db299db619627be31f900be01
 SHA512:
-  metadata.gz: f6c35dab44ba4baf6a68b5bbdd6fd8981e07131e77f5841458187f44b3dab5721442787e7681a0abc19bde3151e07605997ca1e9c09883aa8c35234f542c8a91
-  data.tar.gz: c24a677077c96834ab38baf5b5441e97be4f678b21aa3c24244141328941ece257fd279a5fc8a6d155aa609e9c9e973d620eb1b3ac1ef7b61dcdb1ab2d74e66a
+  metadata.gz: d5aa38a6368417f11189653dc11449cf715720ee664f841ad0532b5112e4603a34d72a3b03b3ba5093b02b86d0229395aa268d8bd61755779d42c63a8dba87f3
+  data.tar.gz: 526aabb67a9b33ef5897e48c21aa88d29313f9733c77f0efc21bc1075563e1fd21d4f04b2547621ee158307a0ed85806eb7677a558447c9c1acac36797ed5f98

data/Gemfile

@@ -15,6 +15,7 @@ group :development, :test do
   gem 'acts_as_list'
   gem 'database_cleaner'
   gem 'factory_bot_rails', '6.2.0'
+  gem 'kt-paperclip', '~> 7.0.0'
   gem 'launchy', '~> 2.5.0'
   gem 'mysql2'
   gem 'poltergeist', '~> 1.18.1'

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    trusty-cms (4.2.3)
+    trusty-cms (4.3.3)
       RedCloth (= 4.3.2)
       acts_as_list (>= 0.9.5, < 1.1.0)
-      acts_as_tree (>= 2.6.1, < 2.10.0)
+      acts_as_tree (~> 2.9.1)
       ckeditor (>= 4.2.2, < 4.4.0)
       delocalize (>= 0.2, < 2.0)
       devise
@@ -33,60 +33,60 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    actioncable (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actioncable (6.1.4)
+      actionpack (= 6.1.4)
+      activesupport (= 6.1.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activejob (= 6.1.3.2)
-      activerecord (= 6.1.3.2)
-      activestorage (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actionmailbox (6.1.4)
+      actionpack (= 6.1.4)
+      activejob (= 6.1.4)
+      activerecord (= 6.1.4)
+      activestorage (= 6.1.4)
+      activesupport (= 6.1.4)
       mail (>= 2.7.1)
-    actionmailer (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      actionview (= 6.1.3.2)
-      activejob (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actionmailer (6.1.4)
+      actionpack (= 6.1.4)
+      actionview (= 6.1.4)
+      activejob (= 6.1.4)
+      activesupport (= 6.1.4)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.3.2)
-      actionview (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actionpack (6.1.4)
+      actionview (= 6.1.4)
+      activesupport (= 6.1.4)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activerecord (= 6.1.3.2)
-      activestorage (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actiontext (6.1.4)
+      actionpack (= 6.1.4)
+      activerecord (= 6.1.4)
+      activestorage (= 6.1.4)
+      activesupport (= 6.1.4)
       nokogiri (>= 1.8.5)
-    actionview (6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actionview (6.1.4)
+      activesupport (= 6.1.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.3.2)
-      activesupport (= 6.1.3.2)
+    activejob (6.1.4)
+      activesupport (= 6.1.4)
       globalid (>= 0.3.6)
-    activemodel (6.1.3.2)
-      activesupport (= 6.1.3.2)
-    activerecord (6.1.3.2)
-      activemodel (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
-    activestorage (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activejob (= 6.1.3.2)
-      activerecord (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    activemodel (6.1.4)
+      activesupport (= 6.1.4)
+    activerecord (6.1.4)
+      activemodel (= 6.1.4)
+      activesupport (= 6.1.4)
+    activestorage (6.1.4)
+      actionpack (= 6.1.4)
+      activejob (= 6.1.4)
+      activerecord (= 6.1.4)
+      activesupport (= 6.1.4)
       marcel (~> 1.0.0)
-      mini_mime (~> 1.0.2)
-    activesupport (6.1.3.2)
+      mini_mime (>= 1.1.0)
+    activesupport (6.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -96,7 +96,7 @@ GEM
       activerecord (>= 4.2)
     acts_as_tree (2.9.1)
       activerecord (>= 3.0.0)
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     bcrypt (3.1.16)
     builder (3.2.4)
@@ -115,13 +115,13 @@ GEM
     climate_control (0.2.0)
     cliver (0.3.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     crass (1.0.6)
-    css_parser (1.9.0)
+    css_parser (1.10.0)
       addressable
     database_cleaner (2.0.1)
       database_cleaner-active_record (~> 2.0.0)
-    database_cleaner-active_record (2.0.0)
+    database_cleaner-active_record (2.0.1)
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
@@ -134,7 +134,7 @@ GEM
       responders
       warden (~> 1.2.3)
     diff-lcs (1.4.4)
-    docile (1.3.5)
+    docile (1.4.0)
     erubi (1.10.0)
     erubis (2.7.0)
     execjs (2.8.1)
@@ -143,10 +143,10 @@ GEM
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    ffi (1.15.1)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    haml (5.2.1)
+    ffi (1.15.3)
+    globalid (0.5.1)
+      activesupport (>= 5.0)
+    haml (5.2.2)
       temple (>= 0.8.0)
       tilt
     haml-rails (2.0.1)
@@ -172,12 +172,17 @@ GEM
       httparty
       json
       multipart-post
+    kt-paperclip (7.0.0)
+      activemodel (>= 4.2.0)
+      activesupport (>= 4.2.0)
+      marcel (~> 1.0.1)
+      mime-types
+      terrapin (~> 0.6.0)
     launchy (2.5.0)
       addressable (~> 2.7)
     libv8-node (15.14.0.1-x86_64-darwin-18)
-    libv8-node (15.14.0.1-x86_64-darwin-20)
     libv8-node (15.14.0.1-x86_64-linux)
-    loofah (2.9.1)
+    loofah (2.10.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -187,7 +192,7 @@ GEM
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2021.0225)
-    mini_mime (1.0.3)
+    mini_mime (1.1.0)
     mini_racer (0.4.0)
       libv8-node (~> 15.14.0.0)
     minitest (5.14.4)
@@ -195,9 +200,9 @@ GEM
     multipart-post (2.1.1)
     mysql2 (0.5.3)
     nio4r (2.5.7)
-    nokogiri (1.11.3-x86_64-darwin)
+    nokogiri (1.11.7-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.11.3-x86_64-linux)
+    nokogiri (1.11.7-x86_64-linux)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     poltergeist (1.18.1)
@@ -218,20 +223,20 @@ GEM
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     radius (0.7.5)
-    rails (6.1.3.2)
-      actioncable (= 6.1.3.2)
-      actionmailbox (= 6.1.3.2)
-      actionmailer (= 6.1.3.2)
-      actionpack (= 6.1.3.2)
-      actiontext (= 6.1.3.2)
-      actionview (= 6.1.3.2)
-      activejob (= 6.1.3.2)
-      activemodel (= 6.1.3.2)
-      activerecord (= 6.1.3.2)
-      activestorage (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    rails (6.1.4)
+      actioncable (= 6.1.4)
+      actionmailbox (= 6.1.4)
+      actionmailer (= 6.1.4)
+      actionpack (= 6.1.4)
+      actiontext (= 6.1.4)
+      actionview (= 6.1.4)
+      activejob (= 6.1.4)
+      activemodel (= 6.1.4)
+      activerecord (= 6.1.4)
+      activestorage (= 6.1.4)
+      activesupport (= 6.1.4)
       bundler (>= 1.15.0)
-      railties (= 6.1.3.2)
+      railties (= 6.1.4)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
@@ -240,14 +245,14 @@ GEM
       loofah (~> 2.3)
     rails-observers (0.1.5)
       activemodel (>= 4.0)
-    railties (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    railties (6.1.4)
+      actionpack (= 6.1.4)
+      activesupport (= 6.1.4)
       method_source
-      rake (>= 0.8.7)
+      rake (>= 0.13)
       thor (~> 1.0)
     rake (13.0.3)
-    rdoc (6.3.1)
+    rdoc (6.3.2)
     regexp_parser (2.1.1)
     responders (3.0.1)
       actionpack (>= 5.0)
@@ -293,7 +298,7 @@ GEM
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.2)
+    simplecov_json_formatter (0.1.3)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -316,7 +321,7 @@ GEM
     uuidtools (2.2.0)
     warden (1.2.9)
       rack (>= 2.0.9)
-    websocket-driver (0.7.3)
+    websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     will_paginate (3.3.0)
@@ -326,13 +331,13 @@ GEM
 
 PLATFORMS
   x86_64-darwin-18
-  x86_64-darwin-20
   x86_64-linux
 
 DEPENDENCIES
   acts_as_list
   database_cleaner
   factory_bot_rails (= 6.2.0)
+  kt-paperclip (~> 7.0.0)
   launchy (~> 2.5.0)
   mysql2
   poltergeist (~> 1.18.1)
@@ -344,4 +349,4 @@ DEPENDENCIES
   trustygems (~> 0.2.0)
 
 BUNDLED WITH
-   2.2.15
+   2.2.19

data/app/assets/config/trusty-cms-manifest.js

@@ -0,0 +1,6 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css
+//= link admin/assets.css
+//= link admin/assets_admin.js
+//= link admin/custom_file_upload.js

data/app/controllers/admin/assets_controller.rb

@@ -68,7 +68,7 @@ class Admin::AssetsController < Admin::ResourceController
 
   def compress(uploaded_asset)
     data = $kraken.upload(uploaded_asset.tempfile.path, 'lossy' => true)
-    File.write(uploaded_asset.tempfile, open(data.kraked_url).read, { mode: 'wb' })
+    File.write(uploaded_asset.tempfile, URI.open(data.kraked_url).read, mode: 'wb')
     uploaded_asset
   end
 

data/app/models/page.rb

@@ -264,8 +264,8 @@ class Page < ActiveRecord::Base
       else
         @display_name ||= begin
           n = name.to_s
-          n.sub!(/^(.+?)Page$/, '\1')
-          n.gsub!(/([A-Z])/, ' \1')
+          n.sub(/^(.+?)Page$/, '\1')
+          n.gsub(/([A-Z])/, ' \1')
           n.strip
         end
       end

data/config/initializers/assets.rb

@@ -1,5 +1 @@
 Rails.application.config.assets.paths << Rails.root.join('node_modules')
-Rails.application.config.assets.precompile += ['*.png',
-                                               '*.gif',
-                                               '*.svg']
-Rails.application.config.assets.precompile += %w(admin/assets.css admin/assets_admin.js)

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 = '4.2.3'.freeze
+    VERSION = '4.3.3'.freeze
   end
 end

data/trusty_cms.gemspec

@@ -2,6 +2,7 @@
 
 require File.expand_path(__FILE__ + '/../lib/trusty_cms.rb')
 Gem::Specification.new do |s|
+  s.required_ruby_version = '>=2.5.3'
   s.name = 'trusty-cms'
   s.version = TrustyCms::VERSION
   s.platform = Gem::Platform::RUBY
@@ -24,7 +25,7 @@ a general purpose content managment system--not merely a blogging engine.'
   s.test_files = Dir['spec/**/*']
 
   s.add_dependency 'acts_as_list',    '>= 0.9.5', '< 1.1.0'
-  s.add_dependency 'acts_as_tree',    '>= 2.6.1', '< 2.10.0'
+  s.add_dependency 'acts_as_tree',    '~> 2.9.1'
   s.add_dependency 'ckeditor',        '>= 4.2.2', '< 4.4.0'
   s.add_dependency 'delocalize',      '>= 0.2', '< 2.0'
   s.add_dependency 'devise'

data/yarn.lock

@@ -1360,9 +1360,9 @@ postcss-value-parser@^4.0.2, postcss-value-parser@^4.0.3:
   integrity sha512-N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg==
 
 postcss@^7.0.0, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.7:
-  version "7.0.27"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.27.tgz#cc67cdc6b0daa375105b7c424a85567345fc54d9"
-  integrity sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==
+  version "7.0.36"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.36.tgz#056f8cffa939662a8f5905950c07d5285644dfcb"
+  integrity sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==
   dependencies:
     chalk "^2.4.2"
     source-map "^0.6.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 4.2.3
+  version: 4.3.3
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-26 00:00:00.000000000 Z
+date: 2021-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -34,22 +34,16 @@ dependencies:
   name: acts_as_tree
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.6.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.6.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.9.1
 - !ruby/object:Gem::Dependency
   name: ckeditor
   requirement: !ruby/object:Gem::Requirement
@@ -461,6 +455,7 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
+- app/assets/config/trusty-cms-manifest.js
 - app/assets/images/admin/add.png
 - app/assets/images/admin/add_tab.png
 - app/assets/images/admin/animated-overlay.gif
@@ -8787,7 +8782,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"