haml 6.1.3-java → 6.1.4-java
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +4 -0
- data/ext/haml/haml.c +1 -9
- data/lib/haml/util.rb +5 -4
- data/lib/haml/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: d9a3d0a5f479a93186f048c7467eced2d5fe68aaba59e455841258a10c3f037d
|
|
4
|
+
data.tar.gz: 4083a8e54a1f8f4a3b3d5507af60d631603c15c566f9e1542f60241f6cfdd5b2
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 6ee57fe5ab33daa2314916d8289a4a092723984f0fe9d41c8da0c1cb5a75aed41168e274ada0294a560a599c81001ca8b43fa8d1d27eeaeb80acc7aaf55fffdd
|
|
7
|
+
data.tar.gz: df697dbdaa314e331708fb27781a9511766169b609484e026b5632d76948e6ed95fc0412d2d4b89dd01577516377f6ec2c0c805d4ae640797cd413634d36bcb9
|
data/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
# Haml Changelog
|
|
2
2
|
|
|
3
|
+
## 6.1.4
|
|
4
|
+
|
|
5
|
+
* Let `Haml::Util.escape_html` use `ERB::Escape` if available [#1145](https://github.com/haml/haml/issues/1145)
|
|
6
|
+
|
|
3
7
|
## 6.1.3
|
|
4
8
|
|
|
5
9
|
* Add `Haml::RailsTemplate#default_format` for Turbo compatibility [#1144](https://github.com/haml/haml/issues/1144)
|
data/ext/haml/haml.c
CHANGED
|
@@ -77,12 +77,6 @@ escape_attribute(VALUE escape_attrs, VALUE str)
|
|
|
77
77
|
}
|
|
78
78
|
}
|
|
79
79
|
|
|
80
|
-
static VALUE
|
|
81
|
-
rb_escape_html(RB_UNUSED_VAR(VALUE self), VALUE value)
|
|
82
|
-
{
|
|
83
|
-
return escape_html(to_s(value));
|
|
84
|
-
}
|
|
85
|
-
|
|
86
80
|
static VALUE
|
|
87
81
|
haml_build_id(VALUE escape_attrs, VALUE values)
|
|
88
82
|
{
|
|
@@ -504,14 +498,12 @@ rb_haml_build(int argc, VALUE *argv, RB_UNUSED_VAR(VALUE self))
|
|
|
504
498
|
void
|
|
505
499
|
Init_haml(void)
|
|
506
500
|
{
|
|
507
|
-
VALUE mHaml
|
|
501
|
+
VALUE mHaml;
|
|
508
502
|
|
|
509
503
|
mHaml = rb_define_module("Haml");
|
|
510
504
|
mObjectRef = rb_define_module_under(mHaml, "ObjectRef");
|
|
511
|
-
mUtil = rb_define_module_under(mHaml, "Util");
|
|
512
505
|
mAttributeBuilder = rb_define_module_under(mHaml, "AttributeBuilder");
|
|
513
506
|
|
|
514
|
-
rb_define_singleton_method(mUtil, "escape_html", rb_escape_html, 1);
|
|
515
507
|
rb_define_singleton_method(mAttributeBuilder, "build", rb_haml_build, -1);
|
|
516
508
|
rb_define_singleton_method(mAttributeBuilder, "build_id", rb_haml_build_id, -1);
|
|
517
509
|
rb_define_singleton_method(mAttributeBuilder, "build_class", rb_haml_build_class, -1);
|
data/lib/haml/util.rb
CHANGED
|
@@ -14,15 +14,16 @@ module Haml
|
|
|
14
14
|
module Util
|
|
15
15
|
extend self
|
|
16
16
|
|
|
17
|
-
#
|
|
18
|
-
|
|
17
|
+
begin # Ruby 3.2+ or ERB 4+
|
|
18
|
+
require 'erb/escape'
|
|
19
|
+
|
|
20
|
+
define_singleton_method(:escape_html, ERB::Escape.instance_method(:html_escape))
|
|
21
|
+
rescue LoadError
|
|
19
22
|
require 'cgi/escape'
|
|
20
23
|
|
|
21
24
|
def self.escape_html(html)
|
|
22
25
|
CGI.escapeHTML(html.to_s)
|
|
23
26
|
end
|
|
24
|
-
else
|
|
25
|
-
require 'haml/haml' # Haml::Util.escape_html
|
|
26
27
|
end
|
|
27
28
|
|
|
28
29
|
# TODO: Remove unescape_interpolation's workaround and get rid of `respond_to?`.
|
data/lib/haml/version.rb
CHANGED