Template can handle its own escaping, thanks

mustache · Oct 11, 2009 · 27a0c18 · 27a0c18
1 parent d545a3e
commit 27a0c18
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/lib/mustache.rb b/lib/mustache.rb
@@ -1,4 +1,3 @@
-require 'cgi'
 require 'mustache/template'
 require 'mustache/context'
 
@@ -128,11 +127,6 @@ def self.underscore(classified)
     string.gsub(/[A-Z]/) { |s| "_#{s.downcase}"}
   end
 
-  # Escape HTML.
-  def self.escape(string)
-    CGI.escapeHTML(string.to_s)
-  end
-
   # Turns a string into a Mustache::Template. If passed a Template,
   # returns it.
   def self.templateify(obj)

diff --git a/lib/mustache/template.rb b/lib/mustache/template.rb
@@ -1,3 +1,5 @@
+require 'cgi'
+
 class Mustache
   # A Template is a compiled version of a Mustache template.
   #
@@ -105,7 +107,7 @@ def str(s)
 
     # {{}} - an escaped tag
     def etag(s)
-      ev("Mustache.escape(ctx[#{s.strip.to_sym.inspect}])")
+      ev("CGI.escapeHTML(ctx[#{s.strip.to_sym.inspect}].to_s)")
     end
 
     # {{{}}} - an unescaped tag