Keep ERB::Util#html_escape private

k0kubun · k0kubun · commit e62210bf568f · 2022-11-25T00:53:38.000-08:00
ERB::Util.html_escape has been public, but ERB::Util#html_escape had
been private.
diff --git a/ext/erb/escape/escape.c b/ext/erb/escape/escape.c
@@ -88,7 +88,7 @@ Init_escape(void)
 {
     rb_cERB = rb_define_class("ERB", rb_cObject);
     rb_mUtil = rb_define_module_under(rb_cERB, "Util");
-    rb_define_method(rb_mUtil, "html_escape", erb_escape_html, 1);
+    rb_define_module_function(rb_mUtil, "html_escape", erb_escape_html, 1);
 
     rb_cCGI = rb_define_class("CGI", rb_cObject);
     id_escapeHTML = rb_intern("escapeHTML");
diff --git a/lib/erb/util.rb b/lib/erb/util.rb
@@ -21,14 +21,14 @@ module ERB::Util
   #
   #   is a &gt; 0 &amp; a &lt; 10?
   #
-  unless method_defined?(:html_escape) # for JRuby
+  unless defined?(ERB::Util.html_escape) # for JRuby
     def html_escape(s)
       CGI.escapeHTML(s.to_s)
     end
+    module_function :html_escape
   end
   alias h html_escape
   module_function :h
-  module_function :html_escape
 
   #
   # A utility method for encoding the String _s_ as a URL.

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ Init_escape(void)`
`88`	`88`	`{`
`89`	`89`	`rb_cERB = rb_define_class("ERB", rb_cObject);`
`90`	`90`	`rb_mUtil = rb_define_module_under(rb_cERB, "Util");`
`91`		`- rb_define_method(rb_mUtil, "html_escape", erb_escape_html, 1);`
	`91`	`+ rb_define_module_function(rb_mUtil, "html_escape", erb_escape_html, 1);`
`92`	`92`
`93`	`93`	`rb_cCGI = rb_define_class("CGI", rb_cObject);`
`94`	`94`	`id_escapeHTML = rb_intern("escapeHTML");`
Original file line number	Diff line number	Diff line change
`@@ -21,14 +21,14 @@ module ERB::Util`
`21`	`21`	`#`
`22`	`22`	`# is a > 0 & a < 10?`
`23`	`23`	`#`
`24`		`- unless method_defined?(:html_escape) # for JRuby`
	`24`	`+ unless defined?(ERB::Util.html_escape) # for JRuby`
`25`	`25`	`def html_escape(s)`
`26`	`26`	`CGI.escapeHTML(s.to_s)`
`27`	`27`	`end`
	`28`	`+ module_function :html_escape`
`28`	`29`	`end`
`29`	`30`	`alias h html_escape`
`30`	`31`	`module_function :h`
`31`		`- module_function :html_escape`
`32`	`32`
`33`	`33`	`#`
`34`	`34`	`# A utility method for encoding the String _s_ as a URL.`