haml 6.1.3-java → 6.1.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7da897e6ef824a17684d84279f66aa5a21323899f34225bdc0851b99c14c76e
-  data.tar.gz: 9af0a48cd7c535df7828c2143cd2efa0b14b8b9c97a46412b28043735c9e251e
+  metadata.gz: d9a3d0a5f479a93186f048c7467eced2d5fe68aaba59e455841258a10c3f037d
+  data.tar.gz: 4083a8e54a1f8f4a3b3d5507af60d631603c15c566f9e1542f60241f6cfdd5b2
 SHA512:
-  metadata.gz: 579bb896c3393bc7622168aca11c52859c0e4c412d38b00bdecc6741cefe91d25d9d2477956893cc6b039bb46bac4c1170cc0f7cfe435d89beebc766619225e7
-  data.tar.gz: 89aa428f24ebbc96b95ffb4ef17e51db31930fa397e3e7b7d9730c6a62b4b27b5a22548431a6e82ebd3a93c1594221d8f13b5a9360119784f2a72f3221be355a
+  metadata.gz: 6ee57fe5ab33daa2314916d8289a4a092723984f0fe9d41c8da0c1cb5a75aed41168e274ada0294a560a599c81001ca8b43fa8d1d27eeaeb80acc7aaf55fffdd
+  data.tar.gz: df697dbdaa314e331708fb27781a9511766169b609484e026b5632d76948e6ed95fc0412d2d4b89dd01577516377f6ec2c0c805d4ae640797cd413634d36bcb9

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: java
 authors:
 - Natalie Weizenbaum