trusty-cms 7.0.36 → 7.0.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6a6f3f8b6b9fd77775f2521305e11a3a169c8c08e7e172c7643c29fde3af26d
-  data.tar.gz: 1bd84fedb2dcc33f0f39c666ca0fd0538ba585cffe13a961c68ab0339acfb82c
+  metadata.gz: d15d46c0df9c95abfe4756107927cd07292d858bb53bd9609b401f5418975645
+  data.tar.gz: 297d32e49736be1356e4d4e09df29a9228a4a14e20799f88be88210e787cb52a
 SHA512:
-  metadata.gz: 6c79a42c4d3ea0ba34d2dbb6fa7286ef1fa4658a7f55100bf5bb66ee3e5515723d7fe7ef02e71f2233dbebe5dba8ddaf8ba99e90604050ba38aa575c7da0896b
-  data.tar.gz: 4f76a6df46d7b4f892c1af0c464183954ad89356c9bd32966d62d3a520ee3b30a848e9a48b5f70fce0300c70658f23c21621d1812f91b1de4752928b02f1859f
+  metadata.gz: 972493d46231c3280b06cfb7253666771092c43eaf8264e89d508db3a94ae9698835b63e8f716e83a9fe3409d04032bd1e58630e1a574b1d269edda5ea671b5b
+  data.tar.gz: 51cceebeb998b5a7fb2da507dbc1f24abbfa5b323b2d0ab098bbfee33b993b5ef3c337f967581758e642729334234e04b1d8994a666004ac4e40bc925c9319c6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (7.0.36)
+    trusty-cms (7.0.38)
       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/controllers/admin/assets_controller.rb

@@ -1,9 +1,6 @@
 class Admin::AssetsController < Admin::ResourceController
   paginate_models(per_page: 50)
   COMPRESS_FILE_TYPE = ['image/jpeg', 'image/png', 'image/gif', 'image/svg+xml'].freeze
-  before_action do
-    ActiveStorage::Current.host = request.base_url
-  end
 
   def index
     assets = Asset.order('created_at DESC')

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/models/standard_tags.rb

@@ -794,7 +794,6 @@ module StandardTags
     tag.expand
     raise TagError.new("`navigation' tag must include a `normal' tag") unless hash.has_key? :normal
 
-    # ActiveSupport::Deprecation.warn("The 'urls' attribute of the r:navigation tag has been deprecated in favour of 'paths'. Please update your site.") if tag.attr['urls']
     result = []
     pairs = (tag.attr['paths'] || tag.attr['urls']).to_s.split('|').map do |pair|
       parts = pair.split(':')
@@ -835,7 +834,6 @@ module StandardTags
   end
   tag 'navigation:path' do |tag|
     hash = tag.locals.navigation
-    # ActiveSupport::Deprecation.warn("The 'r:navigation:url' tag has been deprecated in favour of 'r:navigation:path'. Please update your site.")
     hash[:path]
   end
 

data/lib/configuration_extensions/configuration_extensions.rb

@@ -222,13 +222,19 @@ class Rails::Application::Configuration
   # Old extension-dependency mechanism now deprecated
   #
   def extension(ext)
-    ::ActiveSupport::Deprecation.warn("Extension dependencies have been deprecated and are no longer supported in trusty 1.0. Extensions with dependencies should be packaged as gems and use the .gemspec to declare them.", caller)
+    deprecation = ActiveSupport::Deprecation.new('1.0', 'trusty-cms')
+    deprecation.warn(
+      'Extension dependencies have been deprecated and are no longer supported in trusty 1.0. ' +
+      'Extensions with dependencies should be packaged as gems and use the .gemspec to declare them.',
+      caller
+    )
   end
 
-  # Old gem-invogation method now deprecated
+  # Old gem-invocation method now deprecated
   #
-  def gem(name, options = {})
-    ::ActiveSupport::Deprecation.warn("Please declare gem dependencies in your Gemfile (or for an extension, in the .gemspec file).", caller)
+  def gem(name, options = {})    
+    deprecation = ActiveSupport::Deprecation.new
+    deprecation.warn('Please declare gem dependencies in your Gemfile (or for an extension, in the .gemspec file).', caller)
     super
   end
 

data/lib/trusty_cms/admin_ui.rb

@@ -70,8 +70,8 @@ module TrustyCms
       end
 
       def deprecated_add(name, url, caller)
-        ActiveSupport::Deprecation.warn("admin.tabs.add is no longer supported in TrustyCms 0.9.x.  Please update your code to use: \ntab \"Content\" do\n\tadd_item(...)\nend",
-                                        caller)
+        deprecation = ActiveSupport::Deprecation.new('0.9', 'trusty-cms')
+        deprecation.warn('admin.tabs.add is no longer supported in TrustyCms 0.9.x.  Please update your code to use: \ntab \"Content\" do\n\tadd_item(...)\nend', caller)
         NavSubItem.new(name, url)
       end
     end

data/lib/trusty_cms/deprecation.rb

@@ -2,12 +2,14 @@ require 'active_support'
 
 class AssetType
   def paperclip_processors
-    ActiveSupport::Deprecation.warn('Paperclip processors will be deprecated soon in favor of ActiveStorage.')
+    deprecation = ActiveSupport::Deprecation.new
+    deprecation.warn('Paperclip processors will be deprecated soon in favor of ActiveStorage.')
 
     active_storage_styles
   end
 
   def paperclip_styles
-    ActiveSupport::Deprecation.warn('Paperclip styles will be deprecated soon in favor of ActiveStorage.')
+    deprecation = ActiveSupport::Deprecation.new
+    deprecation.warn('Paperclip styles will be deprecated soon in favor of ActiveStorage.')
   end
-end
+end

data/lib/trusty_cms/extension_loader.rb

@@ -138,7 +138,8 @@ module TrustyCms
           paths(type)
         end
         define_method("add_#{type}_paths".to_sym) do |additional_paths|
-          ::ActiveSupport::Deprecation.warn("ExtensionLoader.add_#{type}_paths is has been moved and is deprecated. Please use TrustyCms.configuration.add_#{type}_paths", caller)
+          deprecation = ActiveSupport::Deprecation.new('1.0', 'trusty-cms')
+          deprecation.warn("ExtensionLoader.add_#{type}_paths is has been moved and is deprecated. Please use TrustyCms.configuration.add_#{type}_paths", caller)
           initializer.configuration.send("add_#{type}_paths".to_sym, additional_paths)
         end
       end

data/lib/trusty_cms/taggable.rb

@@ -53,7 +53,10 @@ module TrustyCms::Taggable
     message = "Deprecated radius tag <r:#{tag_name}>"
     message << " will be removed or significantly changed in trusty #{options[:deadline]}." if options[:deadline]
     message << " Please use <r:#{options[:substitute]}> instead." if options[:substitute]
-    ActiveSupport::Deprecation.warn(message)
+
+    deprecation_horizon = options[:deadline] || '1.0'
+    deprecation = ActiveSupport::Deprecation.new(deprecation_horizon, 'trusty-cms')
+    deprecation.warn(message)
   end
 
   module ClassMethods

data/lib/trusty_cms/version.rb

@@ -1,3 +1,3 @@
 module TrustyCms
-  VERSION = '7.0.36'.freeze
+  VERSION = '7.0.38'.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.36
+  version: 7.0.38
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-16 00:00:00.000000000 Z
+date: 2025-07-22 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