trusty-cms 6.2.1 → 6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc701ab13e1dfe0e97a430d54df2e91ea0b9be912fd22deb10a4c5390508d941
-  data.tar.gz: 363c0ca66279a03051923a0fe03d0ae82a37dd472f132e972e2a80cc358c1c8c
+  metadata.gz: 5c4f73e3a3abf514d52886a6eb71386cbb3786ad3a3b0848f9e34ccd931f2425
+  data.tar.gz: 4d9e6b0b2b561ed0f95f7efc887647d7fc28562ece114e0acc2efb920d361346
 SHA512:
-  metadata.gz: 5097166a24eddf72936da93b4bc16a508eccc288e18454fac8c07bafebc497330d4e4bdc4d13c260a2b94867d5f05b6da5cdd5b8e1e8f2f4e0a57337ab05f4fb
-  data.tar.gz: 362d5fd993f2373e9163250dfe2d03a072f773b1005453b2f3cef1c4a8d3acb90aa39af35645b1b4adfb38ddb783b8d3a01bf712aa6efcf915f7f68876607eef
+  metadata.gz: b482105054e3aa23a9fad042d75a1449d0a27ae91d3109e34ad1b279befb8197e56e4dba3a8d8144b2049652678190b4ad015b9ac1ed78165c3c284075b4ced3
+  data.tar.gz: 880494f40cb2ae15cc08b31122e372007aec9f23a81dc0fc2eb950beb05571741e53870a8d8d977b943d0b9701de4d3d44428295676e921d14ca13295a02af6e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (6.2.1)
+    trusty-cms (6.3)
       RedCloth (= 4.3.3)
       activestorage-validator
       acts_as_list (>= 0.9.5, < 1.3.0)
@@ -12,7 +12,7 @@ PATH
       execjs (~> 2.7)
       haml (>= 5.0, < 6.0)
       haml-rails
-      highline (>= 1.7.8, < 3.1.0)
+      highline (>= 1.7.8, < 3.2.0)
       image_processing
       kraken-io
       mini_racer
@@ -153,6 +153,7 @@ GEM
       factory_bot (~> 6.4)
       railties (>= 5.0.0)
     ffi (1.17.0-x86_64-darwin)
+    ffi (1.17.0-x86_64-linux-gnu)
     file_validators (3.0.0)
       activemodel (>= 3.2)
       mime-types (>= 1.0)
@@ -166,7 +167,8 @@ GEM
       activesupport (>= 5.1)
       haml (>= 4.0.6)
       railties (>= 5.1)
-    highline (3.0.1)
+    highline (3.1.1)
+      reline
     httparty (0.22.0)
       csv
       mini_mime (>= 1.0.0)
@@ -176,6 +178,7 @@ GEM
     image_processing (1.13.0)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
+    io-console (0.7.2)
     json (2.7.2)
     kraken-io (0.1.3)
       activesupport
@@ -186,6 +189,7 @@ GEM
       addressable (~> 2.8)
       childprocess (~> 5.0)
     libv8-node (18.19.0.0-x86_64-darwin)
+    libv8-node (18.19.0.0-x86_64-linux)
     logger (1.6.1)
     loofah (2.22.0)
       crass (~> 1.0.2)
@@ -221,6 +225,8 @@ GEM
     nio4r (2.7.3)
     nokogiri (1.16.7-x86_64-darwin)
       racc (~> 1.4)
+    nokogiri (1.16.7-x86_64-linux)
+      racc (~> 1.4)
     orm_adapter (0.5.0)
     poltergeist (1.18.1)
       capybara (>= 2.1, < 4)
@@ -280,6 +286,8 @@ GEM
     rdoc (6.7.0)
       psych (>= 4.0.0)
     regexp_parser (2.9.2)
+    reline (0.5.10)
+      io-console (~> 0.5)
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
@@ -358,6 +366,8 @@ GEM
 
 PLATFORMS
   x86_64-darwin-21
+  x86_64-darwin-23
+  x86_64-linux
 
 DEPENDENCIES
   activestorage-validator

data/config/application.rb

@@ -76,9 +76,10 @@ module TrustyCms
         html
       end
     end
-    config.after_initialize do
-      # extension_loader.load_extensions
-      # extension_loader.load_extension_initializers
+    config.to_prepare do
+      extension_loader.deactivate_extensions
+      extension_loader.load_extensions
+      extension_loader.load_extension_initializers
 
       extension_loader.activate_extensions # also calls initialize_views
       # config.add_controller_paths(extension_loader.paths(:controller))

data/lib/active_record_extensions/active_record_extensions.rb

@@ -1,5 +1,3 @@
-require 'active_record'
-
 class ActiveRecord::Base
   def self.validates_path(*args)
     configuration = args.extract_options!

data/lib/trusty_cms/extension_loader.rb

@@ -65,7 +65,7 @@ module TrustyCms
     #
     def load_extensions
       configuration = TrustyCms::Application.config
-      @observer ||= DependenciesObserver.new(configuration).observe(::ActiveSupport::Dependencies)
+      # @observer ||= DependenciesObserver.new(configuration).observe(::ActiveSupport::Dependencies)
       self.extensions = configuration.enabled_extensions.map { |ext| load_extension(ext) }.compact
     end
 

data/lib/trusty_cms/initializer.rb

@@ -9,15 +9,6 @@ require 'trusty_cms/extension_loader'
 require 'string_extensions/string_extensions'
 require 'trusty_cms/engine'
 
-# This is a wild and probably terrible hack built to initialize extension engines.
-# I have no idea what the repercussions will be. Revisit later.
-Gem.loaded_specs.each_with_object([]) do |(gemname, gemspec), _found|
-  if gemname =~ /trusty-.*-extension$/
-    ep = TrustyCms::ExtensionLoader.record_path(gemspec.full_gem_path, gemname)
-    require "#{ep.name}/engine"
-  end
-end
-
 module TrustyCms
   module Initializer
     # Rails::Initializer is essentially a list of startup steps and we extend it here by:

data/lib/trusty_cms/version.rb

@@ -1,4 +1,4 @@
 module TrustyCms
-  VERSION = '6.2.1'.freeze
+  VERSION = '6.3'.freeze
 end
 

data/spec/dummy/config/application.rb

@@ -139,4 +139,4 @@ module TrustyCms
 
     end
   end
-end
+end

data/trusty_cms.gemspec

@@ -34,7 +34,7 @@ a general purpose content management system--not merely a blogging engine.'
   s.add_dependency 'execjs', '~> 2.7'
   s.add_dependency 'haml', '>= 5.0', '< 6.0'
   s.add_dependency 'haml-rails'
-  s.add_dependency 'highline', '>= 1.7.8', '< 3.1.0'
+  s.add_dependency 'highline', '>= 1.7.8', '< 3.2.0'
   s.add_dependency 'image_processing'
   s.add_dependency 'kraken-io'
   s.add_dependency 'mini_racer'

data/vendor/extensions/layouts-extension/layouts_extension.rb

@@ -8,11 +8,11 @@ class LayoutsExtension < TrustyCms::Extension
     ActionView::Base.send :include, ShareLayouts::Helpers::ActionView
 
     # Nested Layouts
-    Page.send   :include, NestedLayouts::Tags::Core
+    Page.send :include, NestedLayouts::Tags::Core
 
     # HAML Layouts
-    Layout.send  :include, HamlLayouts::Models::Layout
-    Page.send    :include, HamlLayouts::Models::Page
+    Layout.send :include, HamlLayouts::Models::Layout
+    Page.send :include, HamlLayouts::Models::Page
     HamlFilter
   end
 

data/vendor/extensions/multi-site-extension/lib/multi_site/scoped_validation.rb

@@ -1,43 +1,33 @@
 module MultiSite::ScopedValidation
+  # scoping validations to the site should be very simple
+  # all you would normally need is something like this:
+  #
+  #   validates_uniqueness_of :email, :scope => :site_id
+  #
+  # but if you want to scope core trusty classes, you have a problem:
+  # their uniqueness validations have already been declared
+  # The only answer is to reach right back and change the validates_uniqueness_of method
+  # and to make it more awkward, that has to happen so early that we can't reflect on the site association.
+  # Hence the check for a site_id column. It's a hack, but a fairly harmless one.
 
-  def self.included(base)
-
-    base.class_eval do
-      # scoping validations to the site should be very simple
-      # all you would normally need is something like this:
-      #
-      #   validates_uniqueness_of :email, :scope => :site_id
-      #
-      # but if you want to scope core trusty classes, you have a problem:
-      # their uniqueness validations have already been declared
-      # The only answer is to reach right back and change the validates_uniqueness_of method
-      # and to make it more awkward, that has to happen so early that we can't reflect on the site association.
-      # Hence the check for a site_id column. It's a hack, but a fairly harmless one.
-
-      def validates_uniqueness_of_with_site(*attr)
-        if database_exists?
-          if table_exists? && column_names.include?('site_id')
-            configuration = attr.extract_options!
-            configuration[:scope] ||= :site_id
-            attr.push(configuration)
-          end
-          validates_uniqueness_of_without_site(*attr)
-        end
-      end
-
-      alias_method :validates_uniqueness_of_without_site, :validates_uniqueness_of
-      alias_method :validates_uniqueness_of, :validates_uniqueness_of_with_site
-
-      def database_exists?
-        ActiveRecord::Base.connection
-      rescue ActiveRecord::NoDatabaseError
-        false
-      else
-        true
+  def validates_uniqueness_of(*attr)
+    if database_exists?
+      if table_exists? && column_names.include?('site_id')
+        configuration = attr.extract_options!
+        configuration[:scope] ||= :site_id
+        attr.push(configuration)
       end
+      super(*attr)
     end
+  end
 
+  def database_exists?
+    ActiveRecord::Base.connection
+  rescue ActiveRecord::NoDatabaseError
+    false
+  else
+    true
   end
 end
 
-ActiveRecord::Validations::ClassMethods.send :include, MultiSite::ScopedValidation
+ActiveRecord::Validations::ClassMethods.prepend MultiSite::ScopedValidation

data/vendor/extensions/multi-site-extension/multi_site_extension.rb

@@ -6,7 +6,6 @@ class MultiSiteExtension < TrustyCms::Extension
   url "http://trustarts.org/"
 
   def activate
-
     # Model extensions
     ActiveRecord::Base.send :include, MultiSite::ScopedModel
     Page.send :include, MultiSite::PageExtensions

data/vendor/extensions/snippets-extension/snippets_extension.rb

@@ -34,7 +34,7 @@ class SnippetsExtension < TrustyCms::Extension
       end
     end
 
-    admin.snippet       ||= TrustyCms::AdminUI.load_default_snippet_regions
+    admin.snippet ||= TrustyCms::AdminUI.load_default_snippet_regions
 
     tab 'Design' do
       add_item "Snippets", "/admin/snippets"

data/yarn.lock

@@ -427,12 +427,12 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-braces@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+braces@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
   dependencies:
-    fill-range "^7.0.1"
+    fill-range "^7.1.1"
 
 browserslist@^4.12.0, browserslist@^4.21.9:
   version "4.21.10"
@@ -701,10 +701,10 @@ file-entry-cache@^6.0.1:
   dependencies:
     flat-cache "^3.0.4"
 
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
   dependencies:
     to-regex-range "^5.0.1"
 
@@ -1225,11 +1225,11 @@ micromark@~2.11.0:
     parse-entities "^2.0.0"
 
 micromatch@^4.0.4:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
-  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
+  integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
   dependencies:
-    braces "^3.0.2"
+    braces "^3.0.3"
     picomatch "^2.3.1"
 
 min-indent@^1.0.0:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 6.2.1
+  version: '6.3'
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-16 00:00:00.000000000 Z
+date: 2024-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-validator
@@ -169,7 +169,7 @@ dependencies:
         version: 1.7.8
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -179,7 +179,7 @@ dependencies:
         version: 1.7.8
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: image_processing
   requirement: !ruby/object:Gem::Requirement
@@ -1030,6 +1030,7 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
+- spec/dummy/config/storage.yml
 - spec/dummy/db/schema.rb
 - spec/dummy/package.json
 - spec/dummy/public/404.html
@@ -1179,6 +1180,7 @@ test_files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
+- spec/dummy/config/storage.yml
 - spec/dummy/config.ru
 - spec/dummy/db/schema.rb
 - spec/dummy/package.json