trusty-cms 7.0.35 → 7.0.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ca244b4507317a42d9515312799e54a50b4bd0eb38cfb9d23f1721a0e87ce8e
-  data.tar.gz: 8a6facfa1efe892c29dc8ffcc4ffa05c1ac355f3b296aa14bba44192bf0a6311
+  metadata.gz: 07a47c7288dba4245ca9bd8567ef11cd068cea5826e790e55ca04e0a42b4621a
+  data.tar.gz: 8e4a49f4924461fdba634926cc56eb25f77ccbda7c3112787a14e36d7c3c9582
 SHA512:
-  metadata.gz: 97b54ea35702c9215033f022d004907b285fe8ac3ebb3708cad3cb368091bdda41fd54c67c8f155d02d5ab87f72cc50c104f59b5de43052ca068913df43dacf0
-  data.tar.gz: f5d54ede3730f8e4e6cdd4be4190913a7c639ebebd55f2d937d4823e97ce1dd062d2a370017f7e456d15e4609f534d55efd62be71db6ceb617c4d89da7141406
+  metadata.gz: 13d97825e4a9f65ac88ada70c7e545dd465819bbe24bf0ea37c814f5cd8187aafc5b2d3f5185b28c9dd21a21c39fc322ee723430e6079c57722f16d5204d4ff5
+  data.tar.gz: f8b70c6d8337f22a5ce277624dd55afbf6b4f7048bb03668aa2a37df883335f254f3cea2d5466e76f86da807b45c8ce81e5ce7c539535a5677a53994492b667f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (7.0.35)
+    trusty-cms (7.0.37)
       RedCloth (= 4.3.3)
       activestorage-validator
       acts_as_list (>= 0.9.5, < 1.3.0)
@@ -15,7 +15,7 @@ PATH
       diffy
       drb
       execjs (~> 2.7)
-      haml (>= 5.0, < 6.0)
+      haml (~> 6.3.0)
       haml-rails
       highline (>= 1.7.8, < 3.2.0)
       image_processing
@@ -202,8 +202,9 @@ GEM
       mime-types (>= 1.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    haml (5.2.2)
-      temple (>= 0.8.0)
+    haml (6.3.0)
+      temple (>= 0.8.2)
+      thor
       tilt
     haml-rails (2.1.0)
       actionpack (>= 5.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/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.35'.freeze
+  VERSION = '7.0.37'.freeze
 end

data/trusty_cms.gemspec

@@ -37,7 +37,7 @@ a general purpose content management system--not merely a blogging engine.'
   s.add_dependency 'diffy'
   s.add_dependency 'drb'
   s.add_dependency 'execjs', '~> 2.7'
-  s.add_dependency 'haml', '>= 5.0', '< 6.0'
+  s.add_dependency 'haml', '~> 6.3.0'
   s.add_dependency 'haml-rails'
   s.add_dependency 'highline', '>= 1.7.8', '< 3.2.0'
   s.add_dependency 'image_processing'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 7.0.35
+  version: 7.0.37
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-16 00:00:00.000000000 Z
+date: 2025-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-validator
@@ -200,22 +200,16 @@ dependencies:
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 6.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 6.3.0
 - !ruby/object:Gem::Dependency
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement