trusty-cms 5.1.0 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 761f760da72908d490cd0d42ea5af3e245c27f8574353848943d8c8d5f976814
-  data.tar.gz: e8b2179bf2104873a132273f878db58c6f5ee09572d0eff22708b195f9ace657
+  metadata.gz: ef01db17864b39bd25d87227e0d6b78995df3a784e6ef4fc1416919d7effe180
+  data.tar.gz: 6b66fad628f8bac4f030edda68a33d403de8530ea41f86ca3fae78ed6921f785
 SHA512:
-  metadata.gz: 24cd254a3c1e3e65a546cbef84f0ec121c2d2e1c981d65a76a97e652bdf34fa91cd244b83bac08ea5331c23c9d9585c3db0cb5c24a15631f242bb0e09a50d813
-  data.tar.gz: cea472ad852bc0000ae171bc8451f93daa6c60949b427cb4fbdbf3bec95c1d7c46b965040cc3a3305e59b8e26733a220d7ec632c47f4f44f52c8aa3ec8abbf42
+  metadata.gz: e57ba7b714ba22b4a493a2f6616bcab50658f3c53647aa997e7e6b75c218db5f994a351bc352314ff8f42ddf65c0e148a2a787f6bc540fb9287414e8f2fadc7e
+  data.tar.gz: 98915375ec4787f9ead33fe204a01ec15508d8eac073ebc1ea3ab4d34b3d17142899fa071f6fcd7b73b3fd8f3673072e930b5d0dc600359202ef6378b88919ff

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (5.1.0)
+    trusty-cms (5.2.0)
       RedCloth (= 4.3.2)
       activestorage-validator
       acts_as_list (>= 0.9.5, < 1.1.0)
@@ -186,7 +186,6 @@ GEM
       addressable (~> 2.7)
     libv8-node (16.10.0.0-x86_64-darwin)
     libv8-node (16.10.0.0-x86_64-linux)
-    libv8-node (16.10.0.0-x86_64-linux-musl)
     loofah (2.15.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -318,7 +317,7 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     stringex (2.8.5)
-    stringio (3.0.1)
+    stringio (3.0.2)
     temple (0.8.2)
     terrapin (0.6.0)
       climate_control (>= 0.0.3, < 1.0)
@@ -344,6 +343,7 @@ GEM
 PLATFORMS
   x86_64-darwin-18
   x86_64-darwin-20
+  x86_64-darwin-21
   x86_64-linux
 
 DEPENDENCIES

data/app/assets/javascripts/admin/assets_admin.js

@@ -10,6 +10,5 @@
 // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
 // GO AFTER THE REQUIRES BELOW.
 //
-//= require 'admin/jquery.iframe-transport'
-//= require 'admin/jquery.fileupload'
+//= require 'blueimp-file-upload/js/jquery.fileupload.js'
 //= require 'admin/assets'

data/app/assets/javascripts/admin.js

@@ -13,9 +13,9 @@
 //= require jquery/dist/jquery.js
 //= require jquery-ujs/src/rails.js
 //= require jquery-ui-bundle/jquery-ui
-//= require 'admin/jquery.cookie'
-//= require 'admin/jquery.validate.min'
-//= require 'admin/jquery.treetable'
+//= require js-cookie/dist/js.cookie
+//= require 'jquery-validation/dist/jquery.validate.min'
+//= require 'jquery-treetable/jquery.treetable'
 //= require_tree './admin/validations'
 //= require ckeditor/init
 //= require 'admin/persist.min'

data/app/assets/javascripts/ckeditor/config.js

@@ -1,21 +1,21 @@
-CKEDITOR.editorConfig = function( config ) {
-  config.allowedContent = true;
-  config.removeFormatTags = "";
-  config.protectedSource.push(/<r:([\S]+).*<\/r:\1>/g);
-  config.protectedSource.push(/<r:[^>/]*\/>/g);
-  //let paste from word be available
-  // config.forcePasteAsPlainText = false;
-  // if you want to remove clipboard, you have to remove all of these:
-  // clipboard, pastetext, pastefromword
-  config.removePlugins = "save, newpage, preview, print, templates, forms, flash, smiley, language, pagebreak, iframe, bidi";
+CKEDITOR.editorConfig = function (config) {
+    config.allowedContent = true;
+    config.removeFormatTags = "";
+    config.protectedSource.push(/<r:([\S]+).*<\/r:\1>/g);
+    config.protectedSource.push(/<r:[^>/]*\/>/g);
+    //let paste from word be available
+    // config.forcePasteAsPlainText = false;
+    // if you want to remove clipboard, you have to remove all of these:
+    // clipboard, pastetext, pastefromword
+    config.removePlugins = "save, newpage, preview, print, templates, forms, flash, smiley, language, pagebreak, iframe, bidi";
 
-  var startupMode = $.cookie('ckeditor.startupMode');
-  if (startupMode == 'source' || startupMode == 'wysiwyg' ) {
-    config.startupMode = startupMode;
-  }
+    var startupMode = Cookies.get('ckeditor.startupMode');
+    if (startupMode == 'source' || startupMode == 'wysiwyg') {
+        config.startupMode = startupMode;
+    }
 
-  this.on('mode', function(){
-    $.cookie('ckeditor.startupMode', this.mode);
-  })
+    this.on('mode', function () {
+        Cookies.set('ckeditor.startupMode', this.mode);
+    })
 
 };

data/lib/generators/extension/templates/cucumber_paths.rb

@@ -1,5 +1,4 @@
 module NavigationHelpers
-
   # Extend the standard PathMatchers with your own paths
   # to be used in your features.
   #
@@ -16,7 +15,6 @@ module NavigationHelpers
   PathMatchers.merge!({
     # /<%= file_name %>/i => 'admin_<%= file_name %>_path'
   })
-
 end
 
 World(NavigationHelpers)

data/lib/generators/extension_controller/extension_controller_generator.rb

@@ -2,7 +2,6 @@ require 'rails_generator/base'
 require 'rails_generator/generators/components/controller/controller_generator'
 
 class ExtensionControllerGenerator < ControllerGenerator
-
   attr_accessor :extension_name
   default_options :with_test_unit => false
 

data/lib/generators/extension_mailer/extension_mailer_generator.rb

@@ -2,7 +2,6 @@ require 'rails_generator/base'
 require 'rails_generator/generators/components/mailer/mailer_generator'
 
 class ExtensionMailerGenerator < MailerGenerator
-
   attr_accessor :extension_name
   default_options :with_test_unit => false
 

data/lib/generators/extension_migration/extension_migration_generator.rb

@@ -2,7 +2,6 @@ require 'rails_generator/base'
 require 'rails_generator/generators/components/migration/migration_generator'
 
 class ExtensionMigrationGenerator < MigrationGenerator
-
   attr_accessor :extension_name
 
   def initialize(runtime_args, runtime_options = {})

data/lib/generators/extension_model/extension_model_generator.rb

@@ -2,7 +2,6 @@ require 'rails_generator/base'
 require 'rails_generator/generators/components/model/model_generator'
 
 class ExtensionModelGenerator < ModelGenerator
-
   attr_accessor :extension_name
   default_options :with_test_unit => false
 

data/lib/generators/instance/instance_generator.rb

@@ -144,5 +144,4 @@ class InstanceGenerator < Rails::Generator::Base
     def radiant_root(filename = '')
       File.join("..", "..", "..", "..", filename)
     end
-
 end

data/lib/generators/language_extension/templates/test_helper.rb

@@ -14,7 +14,6 @@ end
 require "#{TRUSTY_CMS_ROOT}/test/test_helper"
 
 class Test::Unit::TestCase
-
   # Include a helper to make testing Radius tags easier
   test_helper :extension_tags
 

data/lib/generators/trusty_cms/trusty_cms_generator.rb

@@ -3,7 +3,6 @@ class TrustyCmsGenerator < Rails::Generators::Base
   argument :project_name, type: :string, default: "trusty"
 
   def generate_config
-
     template "Rakefile.erb", "Rakefile"
     template "config.ru.erb", "config.ru"
 

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.1.0'.freeze
+    VERSION = '5.2.0'.freeze
   end
 end

data/package.json

@@ -8,9 +8,13 @@
   "license": "MIT",
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.13.0",
+    "blueimp-file-upload": "^10.32.0",
     "jquery": "^3.5.0",
+    "jquery-treetable": "^3.2.0-1",
     "jquery-ui-bundle": "^1.12.1",
     "jquery-ujs": "^1.2.2",
+    "jquery-validation": "^1.19.3",
+    "js-cookie": "^3.0.1",
     "tablesaw": "^3.1.2"
   },
   "devDependencies": {

data/yarn.lock

@@ -323,6 +323,30 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
   integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
+blueimp-canvas-to-blob@3:
+  version "3.29.0"
+  resolved "https://registry.yarnpkg.com/blueimp-canvas-to-blob/-/blueimp-canvas-to-blob-3.29.0.tgz#d965f06cb1a67fdae207a2be56683f55ef531466"
+  integrity sha512-0pcSSGxC0QxT+yVkivxIqW0Y4VlO2XSDPofBAqoJ1qJxgH9eiUDLv50Rixij2cDuEfx4M6DpD9UGZpRhT5Q8qg==
+
+blueimp-file-upload@^10.32.0:
+  version "10.32.0"
+  resolved "https://registry.yarnpkg.com/blueimp-file-upload/-/blueimp-file-upload-10.32.0.tgz#897c91f813ccf4b6cd14db2da3da237ce433e04e"
+  integrity sha512-3WMJw5Cbfz94Adl1OeyH+rRpGwHiNHzja+CR6aRWPoAtwrUwvP5gXKo0XdX+sdPE+iCU63Xmba88hoHQmzY8RQ==
+  optionalDependencies:
+    blueimp-canvas-to-blob "3"
+    blueimp-load-image "5"
+    blueimp-tmpl "3"
+
+blueimp-load-image@5:
+  version "5.16.0"
+  resolved "https://registry.yarnpkg.com/blueimp-load-image/-/blueimp-load-image-5.16.0.tgz#16b763f57e6725f8865517bca8eb7c3dc7d41e09"
+  integrity sha512-3DUSVdOtlfNRk7moRZuTwDmA3NnG8KIJuLcq3c0J7/BIr6X3Vb/EpX3kUH1joxUhmoVF4uCpDfz7wHkz8pQajA==
+
+blueimp-tmpl@3:
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/blueimp-tmpl/-/blueimp-tmpl-3.20.0.tgz#bed897db362c70d3740e0ad1020ce84bfa15ceaa"
+  integrity sha512-g6ln9L+VX8ZA4WA8mgKMethYH+5teroJ2uOkCvcthy9Y9d9LrQ42OAMn+r3ECKu9CB+xe9GOChlIUJBSxwkI6g==
+
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -931,6 +955,13 @@ javascript-natural-sort@^0.7.1:
   resolved "https://registry.yarnpkg.com/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz#f9e2303d4507f6d74355a73664d1440fb5a0ef59"
   integrity sha1-+eIwPUUH9tdDVac2ZNFED7Wg71k=
 
+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"
@@ -943,11 +974,26 @@ jquery-ujs@^1.2.2:
   dependencies:
     jquery ">=1.8.0"
 
+jquery-validation@^1.19.3:
+  version "1.19.3"
+  resolved "https://registry.yarnpkg.com/jquery-validation/-/jquery-validation-1.19.3.tgz#50b350eba8b02bcfd119ba15f199487b7eb64086"
+  integrity sha512-iXxCS5W7STthSTMFX/NDZfWHBLbJ1behVK3eAgHXAV8/0vRa9M4tiqHvJMr39VGWHMGdlkhrtrkBuaL2UlE8yw==
+
+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"
   integrity sha512-Xb7SVYMvygPxbFMpTFQiHh1J7HClEaThguL15N/Gg37Lri/qKyhRGZYzHRyLH8Stq3Aow0LsHO2O2ci86fCrNQ==
 
+js-cookie@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.1.tgz#9e39b4c6c2f56563708d7d31f6f5f21873a92414"
+  integrity sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw==
+
 js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.2.0
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-20 00:00:00.000000000 Z
+date: 2022-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-validator
@@ -601,10 +601,6 @@ files:
 - app/assets/javascripts/admin/custom_file_upload.js
 - app/assets/javascripts/admin/datecheck.js
 - app/assets/javascripts/admin/dropdown.js
-- app/assets/javascripts/admin/jquery.cookie.js
-- app/assets/javascripts/admin/jquery.fileupload.js
-- app/assets/javascripts/admin/jquery.iframe-transport.js
-- app/assets/javascripts/admin/jquery.treetable.js
 - app/assets/javascripts/admin/jquery.validate.min.js
 - app/assets/javascripts/admin/modernizr.js
 - app/assets/javascripts/admin/more-or-less.js
@@ -1174,51 +1170,51 @@ specification_version: 4
 summary: A no-fluff content management system designed for small teams.
 test_files:
 - spec/spec_helper.rb
-- spec/controllers/application_controller_spec.rb
-- spec/controllers/users_controller_spec.rb
-- spec/models/layout_spec.rb
-- spec/ci/database.mysql.yml
+- spec/support/custom_actions.rb
 - spec/fixtures/users.yml
-- spec/features/config_spec.rb
-- spec/features/layouts_spec.rb
-- spec/features/pages_spec.rb
-- spec/dummy/db/schema.rb
-- spec/dummy/config/application.rb
-- spec/dummy/config/secrets.yml
-- spec/dummy/config/environment.rb
+- 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/Rakefile
 - spec/dummy/config/boot.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/locales/en.yml
+- 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/production.rb
 - spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/backtrace_silencers.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/wrap_parameters.rb
-- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/trusty_cms_config.rb
-- spec/dummy/config/routes.rb
+- spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/README.rdoc
-- spec/dummy/yarn.lock
-- spec/dummy/public/404.html
-- spec/dummy/public/500.html
+- 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/Rakefile
-- spec/dummy/package.json
+- spec/dummy/public/404.html
 - spec/dummy/config.ru
-- spec/dummy/bin/setup
-- spec/dummy/bin/rails
-- spec/dummy/bin/rake
-- spec/dummy/bin/bundle
-- spec/dummy/app/assets/config/manifest.js
-- spec/factories/page_part.rb
+- spec/factories/layout.rb
 - spec/factories/page.rb
+- spec/factories/page_part.rb
 - spec/factories/user.rb
-- spec/factories/layout.rb
+- spec/controllers/application_controller_spec.rb
+- spec/controllers/users_controller_spec.rb
 - spec/rails_helper.rb
-- spec/support/custom_actions.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

data/app/assets/javascripts/admin/jquery.cookie.js

@@ -1,117 +0,0 @@
-/*!
- * jQuery Cookie Plugin v1.4.1
- * https://github.com/carhartl/jquery-cookie
- *
- * Copyright 2006, 2014 Klaus Hartl
- * Released under the MIT license
- */
-(function (factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD
-    define(['jquery'], factory);
-  } else if (typeof exports === 'object') {
-    // CommonJS
-    factory(require('jquery'));
-  } else {
-    // Browser globals
-    factory(jQuery);
-  }
-}(function ($) {
-
-  var pluses = /\+/g;
-
-  function encode(s) {
-    return config.raw ? s : encodeURIComponent(s);
-  }
-
-  function decode(s) {
-    return config.raw ? s : decodeURIComponent(s);
-  }
-
-  function stringifyCookieValue(value) {
-    return encode(config.json ? JSON.stringify(value) : String(value));
-  }
-
-  function parseCookieValue(s) {
-    if (s.indexOf('"') === 0) {
-      // This is a quoted cookie as according to RFC2068, unescape...
-      s = s.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\');
-    }
-
-    try {
-      // Replace server-side written pluses with spaces.
-      // If we can't decode the cookie, ignore it, it's unusable.
-      // If we can't parse the cookie, ignore it, it's unusable.
-      s = decodeURIComponent(s.replace(pluses, ' '));
-      return config.json ? JSON.parse(s) : s;
-    } catch(e) {}
-  }
-
-  function read(s, converter) {
-    var value = config.raw ? s : parseCookieValue(s);
-    return $.isFunction(converter) ? converter(value) : value;
-  }
-
-  var config = $.cookie = function (key, value, options) {
-
-    // Write
-
-    if (arguments.length > 1 && !$.isFunction(value)) {
-      options = $.extend({}, config.defaults, options);
-
-      if (typeof options.expires === 'number') {
-        var days = options.expires, t = options.expires = new Date();
-        t.setTime(+t + days * 864e+5);
-      }
-
-      return (document.cookie = [
-        encode(key), '=', stringifyCookieValue(value),
-        options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
-        options.path    ? '; path=' + options.path : '',
-        options.domain  ? '; domain=' + options.domain : '',
-        options.secure  ? '; secure' : ''
-      ].join(''));
-    }
-
-    // Read
-
-    var result = key ? undefined : {};
-
-    // To prevent the for loop in the first place assign an empty array
-    // in case there are no cookies at all. Also prevents odd result when
-    // calling $.cookie().
-    var cookies = document.cookie ? document.cookie.split('; ') : [];
-
-    for (var i = 0, l = cookies.length; i < l; i++) {
-      var parts = cookies[i].split('=');
-      var name = decode(parts.shift());
-      var cookie = parts.join('=');
-
-      if (key && key === name) {
-        // If second argument (value) is a function it's a converter...
-        result = read(cookie, value);
-        break;
-      }
-
-      // Prevent storing a cookie that we couldn't decode.
-      if (!key && (cookie = read(cookie)) !== undefined) {
-        result[name] = cookie;
-      }
-    }
-
-    return result;
-  };
-
-  config.defaults = {};
-
-  $.removeCookie = function (key, options) {
-    if ($.cookie(key) === undefined) {
-      return false;
-    }
-
-    // Must not alter options, thus extending a fresh object...
-    $.cookie(key, '', $.extend({}, options, { expires: -1 }));
-    return !$.cookie(key);
-  };
-
-}));