haml 6.1.3 → 6.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fdb8a50c83ab63c697225ffc269dfcff134a8eac3d28f5b13c5b5a09257f849
-  data.tar.gz: f7027d35f57f74ece886ced333a6eefa2d5278086899ac1431b9ea81935c5cc2
+  metadata.gz: 3d737ee35f4f57bdbbedceeb61233e0b21818fee84a50e00a1e317b2a8efcb50
+  data.tar.gz: 6e8a41c9e3a9e8c9db478f0c5ea636a6eb8bb2fe811b609664808edfac204645
 SHA512:
-  metadata.gz: a72f386df2549eadf33e568fa2d33dba9f49fee6c9ef869a66c81a6d414f53fc0c1f6fc666a3434ca2df27cec89c4e7ed302336a009115ee678c426614b53b61
-  data.tar.gz: d9585240bf8cc82bb38d6f1dfad9f3c12f3b2654ada0fd7cf7972bf5018cc137917e522a3927510eab7aa90d923c0d5d1dc0352d98e1f586482e25c5f62f42b3
+  metadata.gz: b298a5a331bf81368054ac7fbae382a4ea739d9b24a8aa2db68ddf0e9595e116d3439ae75ddf73bd16dc943ee5e6fa0bdcd3f693ddf09c5abf54eaacbcfd9b14
+  data.tar.gz: b5ebe7e3ae7337224db692aad4c116674a6992e0880f46e96a4e9486d72bf22f57b3d1fb94396353d3b06d680387fbfb24f4dcc7ef0eb17dca4acbc7bc0336e9

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Haml Changelog
 
+## 6.1.4
+
+* Let `Haml::Util.escape_html` use `ERB::Escape` if available [#1145](https://github.com/haml/haml/issues/1145)
+
 ## 6.1.3
 
 * Add `Haml::RailsTemplate#default_format` for Turbo compatibility [#1144](https://github.com/haml/haml/issues/1144)

data/ext/haml/haml.c

@@ -77,12 +77,6 @@ escape_attribute(VALUE escape_attrs, VALUE str)
   }
 }
 
-static VALUE
-rb_escape_html(RB_UNUSED_VAR(VALUE self), VALUE value)
-{
-  return escape_html(to_s(value));
-}
-
 static VALUE
 haml_build_id(VALUE escape_attrs, VALUE values)
 {
@@ -504,14 +498,12 @@ rb_haml_build(int argc, VALUE *argv, RB_UNUSED_VAR(VALUE self))
 void
 Init_haml(void)
 {
-  VALUE mHaml, mUtil;
+  VALUE mHaml;
 
   mHaml             = rb_define_module("Haml");
   mObjectRef        = rb_define_module_under(mHaml, "ObjectRef");
-  mUtil             = rb_define_module_under(mHaml, "Util");
   mAttributeBuilder = rb_define_module_under(mHaml, "AttributeBuilder");
 
-  rb_define_singleton_method(mUtil, "escape_html", rb_escape_html, 1);
   rb_define_singleton_method(mAttributeBuilder, "build", rb_haml_build, -1);
   rb_define_singleton_method(mAttributeBuilder, "build_id", rb_haml_build_id, -1);
   rb_define_singleton_method(mAttributeBuilder, "build_class", rb_haml_build_class, -1);

data/lib/haml/util.rb

@@ -14,15 +14,16 @@ module Haml
   module Util
     extend self
 
-    # For JRuby, TruffleRuby, and Wasm, fallback to Ruby implementation.
-    if /java|wasm/ === RUBY_PLATFORM || RUBY_ENGINE == 'truffleruby'
+    begin # Ruby 3.2+ or ERB 4+
+      require 'erb/escape'
+
+      define_singleton_method(:escape_html, ERB::Escape.instance_method(:html_escape))
+    rescue LoadError
       require 'cgi/escape'
 
       def self.escape_html(html)
         CGI.escapeHTML(html.to_s)
       end
-    else
-      require 'haml/haml' # Haml::Util.escape_html
     end
 
     # TODO: Remove unescape_interpolation's workaround and get rid of `respond_to?`.

data/lib/haml/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Haml
-  VERSION = '6.1.3'
+  VERSION = '6.1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 6.1.3
+  version: 6.1.4
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -356,7 +356,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: An elegant, structured (X)HTML/XML templating engine.