Use #prepend for HAML patches

Author: makmic

lib/angular_xss/erb.rb

@@ -1,5 +1,5 @@
 if ERB::Util.private_method_defined? :unwrapped_html_escape
-  # Rails 4.2 +
+  # Rails 4.2+
   # https://github.com/rails/rails/blob/main/activesupport/lib/active_support/core_ext/erb/util.rb
   module ERBUtilExt
     def html_escape_once(s)
@@ -9,7 +9,7 @@ def html_escape_once(s)
     def unwrapped_html_escape(s)
       super(AngularXss::Escaper.escape_if_unsafe(s))
     end
-    # Note that html_escape() and h() are passively fixed as they are calling the new methods.
+    # Note that html_escape() and h() are passively fixed as they are calling the two methods above
   end
   ERB::Util.prepend ERBUtilExt
   ERB::Util.singleton_class.prepend ERBUtilExt

lib/angular_xss/haml.rb

@@ -14,26 +14,25 @@ def html_escape_with_escaping_angular_expressions(s)
   # Haml 5.0 and 5.1 fall back to erb
 elsif haml_version < Gem::Version.new(6)
   # HAML 5.2+
-  Haml::Helpers.module_eval do
-    def html_escape_without_haml_xss_with_escaping_angular_expressions(s)
-      html_escape_without_haml_xss_without_escaping_angular_expressions(AngularXss::Escaper.escape_if_unsafe(s))
+  module HTMLEscapeWithoutHAMLWithAngularXSS
+    def html_escape_without_haml_xss(html)
+      super(AngularXss::Escaper.escape_if_unsafe(html))
     end
-
-    alias_method :html_escape_without_haml_xss_without_escaping_angular_expressions, :html_escape_without_haml_xss
-    alias_method :html_escape_without_haml_xss, :html_escape_without_haml_xss_with_escaping_angular_expressions
   end
+
+  Haml::Helpers.singleton_class.prepend HTMLEscapeWithoutHAMLWithAngularXSS
 else
   # Haml 6+
   # It ditched most of is own helpers in favor of Haml::Util.escape_html
   # https://github.com/haml/haml/blob/main/CHANGELOG.md#600
   # https://github.com/haml/haml/compare/v5.2.2...v6.3.0
   # https://github.com/haml/haml/blob/v6.3.0/lib/haml/util.rb
 
-  module HamlUtilExt
+  module EscapeHTMLWithAngularXSS
     def escape_html(html)
       super(AngularXss::Escaper.escape_if_unsafe(html))
     end
   end
 
-  Haml::Util.singleton_class.prepend HamlUtilExt
+  Haml::Util.singleton_class.prepend EscapeHTMLWithAngularXSS
 end