trusty-cms 6.0.2 → 6.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9a506b6d8dcc10704d9af6b892ec31452d932ea55c6789c1600d1d1b1471801
-  data.tar.gz: 3f2a502afc4eca30639dde053f62179f0079c06a391158b9000b5e648d349241
+  metadata.gz: d9a7903adc14b08abf648ccd87795af51fb168a5ea987ead0c98ae2a6103379f
+  data.tar.gz: bee09d86dddbf8efab14f644b20a480c22d37af51849390b0acbc433409517bd
 SHA512:
-  metadata.gz: b782bdebc44588ed1efed8d380b41c4e6044f9f3b9d24b0fbff467a43339086040f2b81abcf7e03b5bfe22a9435e1de452fc9d1b9890587061bf77dca2270a39
-  data.tar.gz: 9bdaafe9f55890fcfa99e3966162a97440606a130bebbf9761cffb0631cd560a1a37e818b8254e09ce9e2ccd5243131b01225c37b3c42f0f565bc918e496d3cd
+  metadata.gz: e3804b9cf359022ec5784276c19fb6dfb2c1e033fe283736635b040372f6424b5c775d64e2987d287955e29f5fcb4e3419d76c4ee41fc0c50bec36168c3f6d63
+  data.tar.gz: a39c179f2af842278fdd70f84b4da756473fa6f36bd47f6014b5f7191ac46f1972d11127d84f31ef350fb657de6bb9634d876095680248a6ca4dc029909fc839

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (6.0.2)
+    trusty-cms (6.0.4)
       RedCloth (= 4.3.2)
       activestorage-validator
       acts_as_list (>= 0.9.5, < 1.2.0)
@@ -28,7 +28,6 @@ PATH
       stringex (>= 2.7.1, < 2.9.0)
       tzinfo (>= 1.2.3, < 2.1.0)
       uglifier (>= 3.2, < 5.0)
-      uuidtools (>= 2.1.5, < 2.3.0)
       will_paginate (>= 3, < 5)
 
 GEM
@@ -341,7 +340,6 @@ GEM
       concurrent-ruby (~> 1.0)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
-    uuidtools (2.2.0)
     warden (1.2.9)
       rack (>= 2.0.9)
     websocket-driver (0.7.6)

data/app/controllers/admin/pages_controller.rb

@@ -17,7 +17,7 @@ class Admin::PagesController < Admin::ResourceController
       @template_name = 'index'
       self.models = Page.find(params[:page_id]).children.all
       response.headers['Content-Type'] = 'text/html;charset=utf-8'
-      render action: 'children.html.haml', layout: false
+      render action: 'children', layout: false
     end
   end
 

data/app/models/asset.rb

@@ -186,7 +186,7 @@ class Asset < ActiveRecord::Base
   end
 
   def assign_uuid
-    self.uuid = UUIDTools::UUID.timestamp_create.to_s unless uuid?
+    self.uuid = SecureRandom.uuid unless uuid?
   end
 
   class << self

data/config/initializers/zeitwerk.rb

@@ -2,6 +2,7 @@ Rails.autoloaders.each do |autoloader|
   autoloader.inflector.inflect(
     'clipped_admin_ui' => 'ClippedAdminUI',
     'admin_ui' => 'AdminUI',
+    'ostruct' => 'OpenStruct',
   # Add more inflections as needed
   )
 end

data/lib/trusty_cms/task_support.rb

@@ -44,7 +44,7 @@ module TrustyCms
       def cache_files(dir, files, cache_file)
         cache_content = files.collect do |f|
           File.read(File.join(dir, f))
-        end .join("\n\n")
+        end.join("\n\n")
 
         cache_path = File.join(dir, cache_file)
         File.delete(cache_path) if File.exists?(cache_path)
@@ -54,7 +54,7 @@ module TrustyCms
       # Reads through the layout file and returns an array of JS filenames
       #
       def find_admin_js
-        layout = "#{TRUSTY_CMS_ROOT}/app/views/layouts/application.html.haml"
+        layout = "#{TRUSTY_CMS_ROOT}/app/views/layouts/application"
         js_regexp = /javascript_include_tag %w\((.*)\), :cache => 'admin\/all/
         files = File.open(layout) { |f| f.read.match(js_regexp)[1].split }
         files.collect { |f| f.split('/').last + '.js' }

data/lib/trusty_cms.rb

@@ -2,7 +2,7 @@ TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..')) unle
 
 unless defined? TrustyCms::VERSION
   module TrustyCms
-    VERSION = '6.0.2'.freeze
+    VERSION = '6.0.4'.freeze
   end
 end
 

data/trusty_cms.gemspec

@@ -50,6 +50,5 @@ a general purpose content management system--not merely a blogging engine.'
   s.add_dependency 'stringex', '>= 2.7.1', '< 2.9.0'
   s.add_dependency 'tzinfo', '>= 1.2.3', '< 2.1.0'
   s.add_dependency 'uglifier', '>= 3.2', '< 5.0'
-  s.add_dependency 'uuidtools', '>= 2.1.5', '< 2.3.0'
   s.add_dependency 'will_paginate', '>= 3', '< 5'
 end

data/vendor/extensions/clipped-extension/lib/clipped/engine.rb

@@ -1,5 +1,4 @@
 require 'acts_as_list'
-require 'uuidtools'
 require 'trusty_cms_clipped_extension/cloud'
 require 'active_storage/engine'
 require 'will_paginate/array'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 6.0.2
+  version: 6.0.4
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-26 00:00:00.000000000 Z
+date: 2023-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-validator
@@ -434,26 +434,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: uuidtools
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement