trusty-cms 7.0.37 → 7.0.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07a47c7288dba4245ca9bd8567ef11cd068cea5826e790e55ca04e0a42b4621a
-  data.tar.gz: 8e4a49f4924461fdba634926cc56eb25f77ccbda7c3112787a14e36d7c3c9582
+  metadata.gz: e5bdddc2ede5bb07ee468212f116fbf5c6f37b0e7ec0c78b4d7f20a8b484cbd4
+  data.tar.gz: c420a5bcab50ef80184174aebcb84329d997870305286195b28497bd56e4c52a
 SHA512:
-  metadata.gz: 13d97825e4a9f65ac88ada70c7e545dd465819bbe24bf0ea37c814f5cd8187aafc5b2d3f5185b28c9dd21a21c39fc322ee723430e6079c57722f16d5204d4ff5
-  data.tar.gz: f8b70c6d8337f22a5ce277624dd55afbf6b4f7048bb03668aa2a37df883335f254f3cea2d5466e76f86da807b45c8ce81e5ce7c539535a5677a53994492b667f
+  metadata.gz: dedfba1988b017e6d1c132ae101193da96df696033cc6f09c2fe994be25014b5adbb1d0c18af9690770590d9016a7ff200684813d3d8924abe0ff77a6d2cd218
+  data.tar.gz: 1f94424bbf66982d03ea9c2e74ee3d378c118cdf5b1a58bf49db971374798a56cea1395875b599374fc83fdebb537a38dd0c040d7b0b5342e6053ffd1368ab7c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (7.0.37)
+    trusty-cms (7.0.39)
       RedCloth (= 4.3.3)
       activestorage-validator
       acts_as_list (>= 0.9.5, < 1.3.0)
@@ -16,7 +16,7 @@ PATH
       drb
       execjs (~> 2.7)
       haml (~> 6.3.0)
-      haml-rails
+      haml-rails (~> 2.1)
       highline (>= 1.7.8, < 3.2.0)
       image_processing
       kraken-io
@@ -28,7 +28,7 @@ PATH
       psych (= 5.2.2)
       rack (>= 2.0.1, < 3.2.0)
       rack-cache (~> 1.7)
-      radius (~> 0.7)
+      radius (~> 0.8)
       rails (~> 7.2.2.1)
       rake (< 14.0)
       ransack (~> 4.2.1)

data/app/models/haml_filter.rb

@@ -1,5 +1,6 @@
 class HamlFilter < TextFilter
   def filter(text)
-    Haml::Engine.new(text).render.gsub(/&lt;(\/)?r:(.+?)\s*(\/?\\?)&gt;/m, '<\\1r:\\2\\3>')
+    html = Haml::Template.new { text }.render
+    html.gsub(/&lt;(\/)?r:(.+?)\s*(\/?\\?)&gt;/m, '<\\1r:\\2\\3>')
   end
-end
+end

data/app/views/admin/changes/show.html.haml

@@ -1,9 +1,9 @@
 - @page_title = 'Changes - ' + default_page_title
 - single_change = params[:version_id].present?
 
-.outset
-  = render_region :top
+= render_region :top
 
+.outset
   %table#recent-changes
     %thead
       %tr

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

@@ -1,7 +1,8 @@
 - @page_title = 'layouts -  ' + default_page_title
 
+= render_region :top
+
 .outset
-  = render_region :top
   %table.index#layouts
     %thead
       %tr

data/app/views/admin/pages/index.html.haml

@@ -1,7 +1,8 @@
 - @page_title = t('pages') + ' - ' + default_page_title
 
+= render_region :top
+
 .outset
-  = render_region :top
   = render 'search_form', title: nil, show_view_all_button: false
   %table.index.tablesaw#pages{ :summary => t('page_hierarchy') }
     %thead

data/app/views/admin/pages/search.html.haml

@@ -1,7 +1,8 @@
 - @page_title = t('search') + ' - ' + default_page_title
 
+= render_region :top
+
 .outset
-  = render_region :top
   = render 'search_form', query: @query, show_view_all_button: true
   %table.index.tablesaw#pages{ :summary => t('page_hierarchy') }
     %thead

data/app/views/admin/snippets/index.html.haml

@@ -1,7 +1,8 @@
 - @page_title = t('snippets') + ' - ' + default_page_title
 
+= render_region :top
+
 .outset
-  = render_region :top
   %table.index#snippets
     %thead
       %tr

data/config/application.rb

@@ -11,12 +11,14 @@ require 'trustygems'
 require 'devise'
 
 if defined?(Bundler)
-  Bundler.require(*Rails.groups(assets: %w(development test)))
+  Bundler.require(*Rails.groups)
 end
 
 module TrustyCms
   class Application < Rails::Application
     include TrustyCms::Initializer
+    config.load_defaults 7.2
+
     Rails.autoloaders.log!
     # Enable the asset pipeline
     config.assets.enabled = true
@@ -48,7 +50,6 @@ module TrustyCms
                           allow_reload: false,
                           allow_revalidate: false
     config.middleware.insert_before(Rack::ConditionalGet, Rack::Cache)
-    config.assets.enabled = true
 
     config.filter_parameters += %i[password password_confirmation]
 

data/lib/trusty_cms/version.rb

@@ -1,3 +1,3 @@
 module TrustyCms
-  VERSION = '7.0.37'.freeze
+  VERSION = '7.0.39'.freeze
 end

data/trusty_cms.gemspec

@@ -38,7 +38,7 @@ a general purpose content management system--not merely a blogging engine.'
   s.add_dependency 'drb'
   s.add_dependency 'execjs', '~> 2.7'
   s.add_dependency 'haml', '~> 6.3.0'
-  s.add_dependency 'haml-rails'
+  s.add_dependency 'haml-rails', '~> 2.1'
   s.add_dependency 'highline', '>= 1.7.8', '< 3.2.0'
   s.add_dependency 'image_processing'
   s.add_dependency 'kraken-io'
@@ -50,7 +50,7 @@ a general purpose content management system--not merely a blogging engine.'
   s.add_dependency 'psych', '5.2.2'
   s.add_dependency 'rack', '>= 2.0.1', '< 3.2.0'
   s.add_dependency 'rack-cache', '~> 1.7'
-  s.add_dependency 'radius', '~> 0.7'
+  s.add_dependency 'radius', '~> 0.8'
   s.add_dependency 'rails', '~> 7.2.2.1'
   s.add_dependency 'rake', '< 14.0'
   s.add_dependency 'ransack', '~> 4.2.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 7.0.37
+  version: 7.0.39
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-21 00:00:00.000000000 Z
+date: 2025-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-validator
@@ -214,16 +214,16 @@ dependencies:
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -396,14 +396,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement