trusty-cms 6.0.3 → 6.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd070d2a1f939233a8e702c0bca79d3642bbc42968b0f8ec119cd7da09f443be
-  data.tar.gz: b2da94658488d9005dfa919f1be59296f691cd65143b7badb2878118909e351c
+  metadata.gz: 5e18272551dce1a329a35f2392d27ab7db0a2b5add8a97817675566af694c574
+  data.tar.gz: eceba4ff32ac87ce60d9a3a09d4293bc8c5b492ca4054a377ffa9cf80839b1c8
 SHA512:
-  metadata.gz: 57aa2f3b55e1f1c45396ba0ad1d7d0fba25d0fa48a2bf9da705b90ee28bc4764174bc5ee977fe814cb8b4c33df50f13082f96e837b8ae8feba3bf4d1ce3f5f10
-  data.tar.gz: a2451eda0132fce61f848c770dd066c3b28451fc6d3336984221a19cc209504d591a7ba041aaccb3453743c00703e3c09be37eafa6f25dfce5a5fa5d9a67c22b
+  metadata.gz: 42b6a79322a0316b30e3b47f8fcb59854fa5b9aff6c93c6fe0bbdf07191cb38887cc70b46461cc5dd9a51443c0f41f08d0f8900a5fdea360cd7cc2e8f8d24252
+  data.tar.gz: 29a6abd9a87189113fe66ca8680e26bcddea84af5582eafd991c5de2cd7ee581553308ff259249e52100cc456e45f461adadc5af90971b4b425f258b7a20e32a

data/Gemfile

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (6.0.3)
+    trusty-cms (6.0.4)
       RedCloth (= 4.3.2)
       activestorage-validator
       acts_as_list (>= 0.9.5, < 1.2.0)
@@ -28,87 +28,80 @@ 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
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    actioncable (7.0.8)
-      actionpack (= 7.0.8)
-      activesupport (= 7.0.8)
+    actioncable (6.1.7.6)
+      actionpack (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.8)
-      actionpack (= 7.0.8)
-      activejob (= 7.0.8)
-      activerecord (= 7.0.8)
-      activestorage (= 7.0.8)
-      activesupport (= 7.0.8)
+    actionmailbox (6.1.7.6)
+      actionpack (= 6.1.7.6)
+      activejob (= 6.1.7.6)
+      activerecord (= 6.1.7.6)
+      activestorage (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
       mail (>= 2.7.1)
-      net-imap
-      net-pop
-      net-smtp
-    actionmailer (7.0.8)
-      actionpack (= 7.0.8)
-      actionview (= 7.0.8)
-      activejob (= 7.0.8)
-      activesupport (= 7.0.8)
+    actionmailer (6.1.7.6)
+      actionpack (= 6.1.7.6)
+      actionview (= 6.1.7.6)
+      activejob (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
       mail (~> 2.5, >= 2.5.4)
-      net-imap
-      net-pop
-      net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (7.0.8)
-      actionview (= 7.0.8)
-      activesupport (= 7.0.8)
-      rack (~> 2.0, >= 2.2.4)
+    actionpack (6.1.7.6)
+      actionview (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
+      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 (7.0.8)
-      actionpack (= 7.0.8)
-      activerecord (= 7.0.8)
-      activestorage (= 7.0.8)
-      activesupport (= 7.0.8)
-      globalid (>= 0.6.0)
+    actiontext (6.1.7.6)
+      actionpack (= 6.1.7.6)
+      activerecord (= 6.1.7.6)
+      activestorage (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
       nokogiri (>= 1.8.5)
-    actionview (7.0.8)
-      activesupport (= 7.0.8)
+    actionview (6.1.7.6)
+      activesupport (= 6.1.7.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.8)
-      activesupport (= 7.0.8)
+    activejob (6.1.7.6)
+      activesupport (= 6.1.7.6)
       globalid (>= 0.3.6)
-    activemodel (7.0.8)
-      activesupport (= 7.0.8)
-    activerecord (7.0.8)
-      activemodel (= 7.0.8)
-      activesupport (= 7.0.8)
-    activestorage (7.0.8)
-      actionpack (= 7.0.8)
-      activejob (= 7.0.8)
-      activerecord (= 7.0.8)
-      activesupport (= 7.0.8)
+    activemodel (6.1.7.6)
+      activesupport (= 6.1.7.6)
+    activerecord (6.1.7.6)
+      activemodel (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
+    activestorage (6.1.7.6)
+      actionpack (= 6.1.7.6)
+      activejob (= 6.1.7.6)
+      activerecord (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
     activestorage-validator (0.3.0)
       rails (>= 6.1.0)
-    activesupport (7.0.8)
+    activesupport (6.1.7.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     acts_as_list (1.1.0)
       activerecord (>= 4.2)
     acts_as_tree (2.9.1)
       activerecord (>= 3.0.0)
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
-    bcrypt (3.1.18)
+    bcrypt (3.1.19)
     builder (3.2.4)
     byebug (11.1.3)
     capybara (3.35.3)
@@ -138,7 +131,7 @@ GEM
     date (3.3.3)
     delocalize (1.2.0)
       rails (>= 2)
-    devise (4.9.2)
+    devise (4.9.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -203,7 +196,7 @@ GEM
     mini_mime (1.1.5)
     mini_racer (0.6.3)
       libv8-node (~> 16.10.0.0)
-    minitest (5.20.0)
+    minitest (5.15.0)
     multi_xml (0.6.0)
     multipart-post (2.2.3)
     mysql2 (0.5.5)
@@ -217,9 +210,9 @@ GEM
     net-smtp (0.4.0)
       net-protocol
     nio4r (2.5.9)
-    nokogiri (1.15.4-x86_64-darwin)
+    nokogiri (1.12.5-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.15.4-x86_64-linux)
+    nokogiri (1.12.5-x86_64-linux)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     poltergeist (1.18.1)
@@ -232,51 +225,50 @@ GEM
     pry-byebug (3.9.0)
       byebug (~> 11.0)
       pry (~> 0.13.0)
-    psych (5.1.0)
+    psych (5.1.1.1)
       stringio
     public_suffix (4.0.7)
-    racc (1.7.1)
+    racc (1.7.2)
     rack (2.2.8)
     rack-cache (1.14.0)
       rack (>= 0.4)
     rack-test (2.1.0)
       rack (>= 1.3)
     radius (0.7.5)
-    rails (7.0.8)
-      actioncable (= 7.0.8)
-      actionmailbox (= 7.0.8)
-      actionmailer (= 7.0.8)
-      actionpack (= 7.0.8)
-      actiontext (= 7.0.8)
-      actionview (= 7.0.8)
-      activejob (= 7.0.8)
-      activemodel (= 7.0.8)
-      activerecord (= 7.0.8)
-      activestorage (= 7.0.8)
-      activesupport (= 7.0.8)
+    rails (6.1.7.6)
+      actioncable (= 6.1.7.6)
+      actionmailbox (= 6.1.7.6)
+      actionmailer (= 6.1.7.6)
+      actionpack (= 6.1.7.6)
+      actiontext (= 6.1.7.6)
+      actionview (= 6.1.7.6)
+      activejob (= 6.1.7.6)
+      activemodel (= 6.1.7.6)
+      activerecord (= 6.1.7.6)
+      activestorage (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
       bundler (>= 1.15.0)
-      railties (= 7.0.8)
+      railties (= 6.1.7.6)
+      sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
-      loofah (~> 2.21)
-      nokogiri (~> 1.14)
+    rails-html-sanitizer (1.5.0)
+      loofah (~> 2.19, >= 2.19.1)
     rails-observers (0.1.5)
       activemodel (>= 4.0)
-    railties (7.0.8)
-      actionpack (= 7.0.8)
-      activesupport (= 7.0.8)
+    railties (6.1.7.6)
+      actionpack (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
-      zeitwerk (~> 2.5)
-    rake (13.0.6)
+    rake (13.1.0)
     rdoc (6.5.0)
       psych (>= 4.0.0)
     regexp_parser (2.1.1)
-    responders (3.1.0)
+    responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
     roadie (4.0.0)
@@ -328,7 +320,7 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     stringex (2.8.6)
-    stringio (3.0.5)
+    stringio (3.0.6)
     temple (0.10.0)
     terrapin (0.6.0)
       climate_control (>= 0.0.3, < 1.0)
@@ -341,7 +333,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)
@@ -369,7 +360,7 @@ DEPENDENCIES
   mysql2
   poltergeist (~> 1.18.1)
   pry-byebug
-  psych (= 5.1.0)
+  psych (= 5.1.1.1)
   rails-observers
   rspec-rails
   simplecov

data/app/controllers/admin/assets_controller.rb

@@ -53,11 +53,12 @@ class Admin::AssetsController < Admin::ResourceController
           flash[:error] = error
         end
       end
-      if asset_params[:for_attachment]
-        render partial: 'admin/page_attachments/attachment', collection: @page_attachments
-      else
-        response_for :create
-      end
+    end
+    
+    if asset_params[:for_attachment]
+      render partial: 'admin/page_attachments/attachment', collection: @page_attachments
+    else
+      response_for :create
     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/app/models/file_not_found_page.rb

@@ -1,4 +1,8 @@
 class FileNotFoundPage < Page
+  def cache_timeout
+    5.minutes
+  end
+
   def allowed_children
     []
   end
@@ -23,8 +27,4 @@ class FileNotFoundPage < Page
   def response_code
     404
   end
-
-  def cache?
-    false
-  end
 end

data/app/models/user.rb

@@ -44,6 +44,10 @@ class User < ActiveRecord::Base
     content_editor
   end
 
+  def scoped?
+    site_id.present?
+  end
+
   def locale
     'en'
   end

data/app/views/admin/layouts/_site_chooser.html.haml

@@ -1,4 +1,4 @@
-- if current_user.admin? && defined?(Site) && defined?(controller) && controller.sited_model? && controller.template_name == 'index' && Site.several?
+- if current_user.admin? && !current_user.scoped? && defined?(Site) && defined?(controller) && controller.sited_model? && controller.template_name == 'index' && Site.several?
   .site_chooser
     %ul.nav
       %li

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.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.3'.freeze
+    VERSION = '6.0.5'.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.3
+  version: 6.0.5
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-27 00:00:00.000000000 Z
+date: 2023-11-20 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
@@ -1153,51 +1133,51 @@ specification_version: 4
 summary: A no-fluff content management system designed for small teams.
 test_files:
 - spec/models/layout_spec.rb
-- spec/features/layouts_spec.rb
-- spec/features/config_spec.rb
-- spec/features/pages_spec.rb
-- spec/support/custom_actions.rb
-- spec/ci/database.mysql.yml
-- spec/controllers/users_controller_spec.rb
-- spec/controllers/application_controller_spec.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb
+- spec/controllers/users_controller_spec.rb
+- spec/controllers/application_controller_spec.rb
+- spec/support/custom_actions.rb
+- spec/dummy/db/schema.rb
+- spec/dummy/yarn.lock
+- spec/dummy/app/assets/config/manifest.js
+- spec/dummy/package.json
 - spec/dummy/config.ru
-- spec/dummy/config/application.rb
-- spec/dummy/config/routes.rb
-- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
+- 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/cookies_serializer.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/initializers/trusty_cms_config.rb
 - spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/trusty_cms_config.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/assets.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/secrets.yml
-- spec/dummy/config/environments/development.rb
+- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/application.rb
 - spec/dummy/config/environments/production.rb
+- spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/test.rb
+- spec/dummy/config/locales/en.yml
 - spec/dummy/config/database.yml
 - spec/dummy/config/boot.rb
-- spec/dummy/db/schema.rb
-- spec/dummy/yarn.lock
+- spec/dummy/config/routes.rb
+- spec/dummy/config/environment.rb
+- spec/dummy/config/secrets.yml
 - spec/dummy/README.rdoc
-- spec/dummy/bin/bundle
 - spec/dummy/bin/rails
+- spec/dummy/bin/bundle
 - spec/dummy/bin/setup
 - spec/dummy/bin/rake
-- spec/dummy/Rakefile
-- spec/dummy/app/assets/config/manifest.js
-- spec/dummy/package.json
 - spec/dummy/public/favicon.ico
-- spec/dummy/public/500.html
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
+- spec/dummy/public/500.html
+- spec/dummy/Rakefile
+- spec/fixtures/users.yml
 - spec/factories/page.rb
-- spec/factories/user.rb
-- spec/factories/layout.rb
 - spec/factories/page_part.rb
-- spec/fixtures/users.yml
+- spec/factories/layout.rb
+- spec/factories/user.rb
+- spec/features/pages_spec.rb
+- spec/features/config_spec.rb
+- spec/features/layouts_spec.rb
+- spec/ci/database.mysql.yml