padrino-helpers 0.16.0 → 0.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c443286ea7c2e047d727b3b844dcf35bfe75997fde2b2310485ab1c39003c4d
-  data.tar.gz: eb4829b196a0b7c9d2a32e8aeaad09b91d7479af9e23c26bf6e2adcf4fa266dc
+  metadata.gz: 12402f16964cbfb4911bf7488933f4b378f949dea6e7f6e30013ea2e16f5ab03
+  data.tar.gz: 19bad50f4edfeb5cf13d3c9052806ee450841134cd9335eddcdc70f77b88ecf3
 SHA512:
-  metadata.gz: 50ba74a40763da8b07ee23455b22366d7776be020b7b96694f666f17120f67fe503ac08dda6e328baa69d7a2d64c08baea0534333d05f299901b43fe91a6a826
-  data.tar.gz: 9a6177f039e74e912974025842326f7ac96268efdc441ecc46fe3be3795d0d8a4ad098f7ebacb850a360622be644d9fd19144b3d29255a715b71d3566edd5f71
+  metadata.gz: dec2dd1bf508adb4c26dfc9c95fcb898ea3567f0ed236187dd904af754dfa893111a1e6eaa4731212ea6b92c853c615d6aa7f4a303d0a0bb2db49d7496609539
+  data.tar.gz: 4ef70dfe8ac251e5759685abcc9c648d3e24cc46378420a84ba58bc5150f8cd3398a038723d1c8cd5c8b9caf23a40a10be77af41a0b8fba3e920c327742079b8

data/lib/padrino/rendering/haml_template.rb

@@ -1,18 +1,39 @@
-module Haml
-  module Helpers
-    include XssMods
-    include ActionViewExtensions
-  end
+begin
+  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
+  # Haml 6+ does not have these modules
 end
 
 module Padrino
   module Rendering
+    if defined?(Haml::VERSION) && Gem::Version.new(Haml::VERSION) >= Gem::Version.new('6')
+      class HamlOutputBuffer < Temple::Generators::StringBuffer
+        define_options buffer_class: 'SafeBuffer'
+
+        def call(exp)
+          [preamble, compile(exp), postamble].flatten.compact.join('; '.freeze)
+        end
+
+        def create_buffer
+          "__in_hamlit_template = true; #{buffer} = #{options[:buffer_class]}.new"
+        end
+
+        def concat(str)
+          "#{buffer}.safe_concat((#{str}))"
+        end
+      end
+    end
+
     class HamlTemplate < Tilt::HamlTemplate
       include SafeTemplate
     end
@@ -21,6 +42,14 @@ end
 
 Tilt.prefer(Padrino::Rendering::HamlTemplate, :haml)
 
-Padrino::Rendering.engine_configurations[:haml] = {
-  escape_html: true
-}
+Padrino::Rendering.engine_configurations[:haml] =
+  if defined?(Haml::VERSION) && Gem::Version.new(Haml::VERSION) >= Gem::Version.new('6')
+    {
+      generator: Padrino::Rendering::HamlOutputBuffer,
+      buffer: '@_out_buf',
+      use_html_safe: true,
+      disable_capture: true
+    }
+  else
+    { escape_html: true }
+  end

data/lib/padrino/rendering.rb

@@ -405,8 +405,6 @@ end
 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

data/lib/padrino-helpers/output_helpers/haml_handler.rb

@@ -1,10 +1,22 @@
 module Padrino
   module Helpers
     module OutputHelpers
-      # Haml and Hamlit require different detection code
-      if defined?(Haml) && Tilt.template_for('.haml').to_s == 'Padrino::Rendering::HamlTemplate'
+      if defined?(Haml) && defined?(Haml::VERSION) && Gem::Version.new(Haml::VERSION) >= Gem::Version.new('6')
         ##
-        # Handler for Haml templates.
+        # Handler for Haml 6+ templates (uses Hamlit internally).
+        #
+        class HamlitHandler < AbstractHandler
+          ##
+          # Returns true if the block is for Hamlit.
+          #
+          def engine_matches?(block)
+            block.binding.eval('defined? __in_hamlit_template')
+          end
+        end
+        OutputHelpers.register(:haml, HamlitHandler)
+      elsif defined?(Haml) && Tilt.template_for('.haml').to_s == 'Padrino::Rendering::HamlTemplate'
+        ##
+        # Handler for Haml 5 templates.
         #
         class HamlHandler < AbstractHandler
           ##
@@ -24,7 +36,7 @@ module Padrino
         OutputHelpers.register(:haml, HamlHandler)
       else
         ##
-        # Handler for Haml templates.
+        # Handler for standalone Hamlit templates.
         #
         class HamlitHandler < AbstractHandler
           ##

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-helpers
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.2
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-02 00:00:00.000000000 Z
+date: 2026-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-support
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.16.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.16.2
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -251,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.23
 signing_key:
 specification_version: 4
 summary: Helpers for padrino