Change HAML setup to support newer versions

Author: crashtech

CHANGES.rdoc

@@ -1,5 +1,10 @@
 = CHANGES
 
+== 0.16.1 (2025-12-12)
+
+- FIX #2312 Change HAML setup to support newer versions (@crashtech)
+- FIX #2311 Loosen bundler version pinning (achiurizo)
+
 == 0.16.0 (2025-12-02)
 
 - NEW Code modernization. Codebase is now passing Rubocop and generator's templates are using modern syntax (@crashtech)

padrino-helpers/lib/padrino/rendering.rb

@@ -405,8 +405,6 @@ def content_type_symbol(type)
 unless defined? Padrino::Rendering::HamlTemplate
   begin
     require 'haml'
-    require 'haml/helpers/xss_mods'
-    require 'haml/helpers/action_view_extensions'
   rescue LoadError
     # do nothing since haml is not available
   else

padrino-helpers/lib/padrino/rendering/haml_template.rb

@@ -1,14 +1,18 @@
-module Haml
-  module Helpers
-    include XssMods
-    include ActionViewExtensions
-  end
+begin
+  using_modern_haml = false
+  require 'haml/helpers/xss_mods'
+  require 'haml/helpers/action_view_extensions'
+
+  module Haml
+    Helpers.include(Helpers::XssMods)
+    Helpers.include(Helpers::ActionViewExtensions)
 
-  module Util
-    def self.rails_xss_safe?
+    def Util.rails_xss_safe?
       true
     end
   end
+rescue LoadError
+  using_modern_haml = true
 end
 
 module Padrino
@@ -21,6 +25,13 @@ class HamlTemplate < Tilt::HamlTemplate
 
 Tilt.prefer(Padrino::Rendering::HamlTemplate, :haml)
 
-Padrino::Rendering.engine_configurations[:haml] = {
-  escape_html: true
-}
+Padrino::Rendering.engine_configurations[:haml] =
+  if using_modern_haml
+    {
+      buffer_class: 'SafeBuffer.new',
+      use_html_safe: true,
+      disable_capture: true
+    }
+  else
+    { escape_html: true }
+  end