AtHeartEngineer/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-09 14:48:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Port over object allocation improvement

Browse Source 
See 8899503f62
This commit is contained in:
Dirkjan Bussink
2014-06-03 10:41:35 +02:00
parent 529749e01b
commit bd9d4ddb20
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
actionpack/lib/action_view/helpers/tag_helper.rb
View File

@@ -126,7 +126,8 @@ module ActionView
def content_tag_string(name, content, options, escape = true)
tag_options = tag_options(options, escape) if options
"<#{name}#{tag_options}>#{escape ? ERB::Util.html_escape(content) : content}</#{name}>".html_safe
content = ERB::Util.unwrapped_html_escape(content) if escape
"<#{name}#{tag_options}>#{content}</#{name}>".html_safe
end
def tag_options(options, escape = true)
@@ -137,7 +138,7 @@ module ActionView
attrs << %(#{key}="#{key}") if value
elsif !value.nil?
final_value = value.is_a?(Array) ? value.join(" ") : value
final_value = html_escape(final_value) if escape
final_value = ERB::Util.unwrapped_html_escape(final_value) if escape
attrs << %(#{key}="#{final_value}")
end
end

22
activesupport/lib/active_support/core_ext/string/output_safety.rb
View File

@@ -4,6 +4,7 @@ require 'active_support/core_ext/kernel/singleton_class'
class ERB
module Util
HTML_ESCAPE = { '&' => '&amp;', '>' => '&gt;', '<' => '&lt;', '"' => '&quot;', "'" => '&#39;' }
HTML_ESCAPE_REGEXP = /[&"'><]/
JSON_ESCAPE = { '&' => '\u0026', '>' => '\u003E', '<' => '\u003C' }
HTML_ESCAPE_ONCE_REGEXP = /["><']|&(?!([a-zA-Z]+|(#\d+));)/
JSON_ESCAPE_REGEXP = /[&"><]/
@@ -18,12 +19,7 @@ class ERB
# # => is a &gt; 0 &amp; a &lt; 10?
if RUBY_VERSION > '1.9'
def html_escape(s)
s = s.to_s
if s.html_safe?
s
else
s.gsub(/[&"'><]/, HTML_ESCAPE).html_safe
end
unwrapped_html_escape(s).html_safe
end
else
def html_escape(s)
@@ -31,7 +27,7 @@ class ERB
if s.html_safe?
s
else
s.gsub(/[&"'><]/){ |x| HTML_ESCAPE[x] }.html_safe
s.gsub(HTML_ESCAPE_REGEXP){ |x| HTML_ESCAPE[x] }.html_safe
end
end
end
@@ -45,6 +41,18 @@ class ERB
singleton_class.send(:remove_method, :html_escape)
module_function :html_escape
# HTML escapes strings but doesn't wrap them with an ActiveSupport::SafeBuffer.
# This method is not for public consumption! Seriously!
def unwrapped_html_escape(s) # :nodoc:
s = s.to_s
if s.html_safe?
s
else
s.gsub(HTML_ESCAPE_REGEXP, HTML_ESCAPE)
end
end
module_function :unwrapped_html_escape
# A utility method for escaping HTML without affecting existing escaped entities.
#
# html_escape_once('1 < 2 &amp; 3')