padrino-helpers 0.16.1 → 0.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 655fa0ee7cfdda2b4995b7d969b3f07ba49a272c4dd94d4ed4dcd02f1b7fca27
-  data.tar.gz: 728495da5d52e95523b5e11b221bb30ee9e8739bf0d3105cc42ba5b8316bf083
+  metadata.gz: 12402f16964cbfb4911bf7488933f4b378f949dea6e7f6e30013ea2e16f5ab03
+  data.tar.gz: 19bad50f4edfeb5cf13d3c9052806ee450841134cd9335eddcdc70f77b88ecf3
 SHA512:
-  metadata.gz: a0d307c2fad85a4c66d427b1e9235d4187f851722276fb4fe957d08f7d9db004996901604f396f62b7232d02361f6ec04f6759af1dce44cc8986e83c6c7de8ec
-  data.tar.gz: c2489ef6b14acd5f9ff554cef375bff3d05d2043706594bb91933ed525ffc887cc246f120f6e3374b812ffdac0c966db82d079c9846eeb72d14f523534a7e266
+  metadata.gz: dec2dd1bf508adb4c26dfc9c95fcb898ea3567f0ed236187dd904af754dfa893111a1e6eaa4731212ea6b92c853c615d6aa7f4a303d0a0bb2db49d7496609539
+  data.tar.gz: 4ef70dfe8ac251e5759685abcc9c648d3e24cc46378420a84ba58bc5150f8cd3398a038723d1c8cd5c8b9caf23a40a10be77af41a0b8fba3e920c327742079b8

data/lib/padrino/rendering/haml_template.rb

@@ -1,5 +1,4 @@
 begin
-  using_modern_haml = false
   require 'haml/helpers/xss_mods'
   require 'haml/helpers/action_view_extensions'
 
@@ -12,11 +11,29 @@ begin
     end
   end
 rescue LoadError
-  using_modern_haml = true
+  # 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
@@ -26,9 +43,10 @@ end
 Tilt.prefer(Padrino::Rendering::HamlTemplate, :haml)
 
 Padrino::Rendering.engine_configurations[:haml] =
-  if using_modern_haml
+  if defined?(Haml::VERSION) && Gem::Version.new(Haml::VERSION) >= Gem::Version.new('6')
     {
-      buffer_class: 'SafeBuffer.new',
+      generator: Padrino::Rendering::HamlOutputBuffer,
+      buffer: '@_out_buf',
       use_html_safe: true,
       disable_capture: true
     }

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.1
+  version: 0.16.2
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-27 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.1
+        version: 0.16.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.16.2
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement