kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

cgi/util.rb: use alias

Browse source 
* lib/cgi/util.rb (escape_html, unescape_html): make synonyms
  aliases instead of wrapper methods.
* lib/cgi/util.rb (escape_element, unescape_element): ditto.
  [Fixes GH-573]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45382 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-03-21 21:46:17 +00:00
parent 6ea03277b1
commit af1da410ca
3 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Sat Mar 22 06:46:16 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/cgi/util.rb (escape_html, unescape_html): make synonyms
aliases instead of wrapper methods.
* lib/cgi/util.rb (escape_element, unescape_element): ditto.
[Fixes GH-573]
Fri Mar 21 21:57:34 2014 Akinori MUSHA <knu@iDaemons.org>
* configure.in: Fix a build problem with clang and --with-opt-dir.

16
lib/cgi/util.rb
View file

@ -90,14 +90,10 @@ module CGI::Util
end
# Synonym for CGI::escapeHTML(str)
def escape_html(str)
escapeHTML(str)
end
alias escape_html escapeHTML
# Synonym for CGI::unescapeHTML(str)
def unescape_html(str)
unescapeHTML(str)
end
alias unescape_html unescapeHTML
# Escape only the tags of certain HTML elements in +string+.
#
@ -144,14 +140,10 @@ module CGI::Util
end
# Synonym for CGI::escapeElement(str)
def escape_element(str)
escapeElement(str)
end
alias escape_element escapeElement
# Synonym for CGI::unescapeElement(str)
def unescape_element(str)
unescapeElement(str)
end
alias unescape_element unescapeElement
# Abbreviated day-of-week names specified by RFC 822
RFC822_DAYS = %w[ Sun Mon Tue Wed Thu Fri Sat ]

15
test/cgi/test_cgi_util.rb
View file

@ -86,4 +86,19 @@ class CGIUtilTest < Test::Unit::TestCase
def test_cgi_include_unescapeHTML
assert_equal(unescapeHTML("&#39;&amp;&quot;&gt;&lt;"),"'&\"><")
end
def test_cgi_escapeElement
assert_equal("<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt;", escapeElement('<BR><A HREF="url"></A>', "A", "IMG"))
assert_equal("<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt;", escapeElement('<BR><A HREF="url"></A>', ["A", "IMG"]))
assert_equal("<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt;", escape_element('<BR><A HREF="url"></A>', "A", "IMG"))
assert_equal("<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt;", escape_element('<BR><A HREF="url"></A>', ["A", "IMG"]))
end
def test_cgi_unescapeElement
assert_equal('&lt;BR&gt;<A HREF="url"></A>', unescapeElement(escapeHTML('<BR><A HREF="url"></A>'), "A", "IMG"))
assert_equal('&lt;BR&gt;<A HREF="url"></A>', unescapeElement(escapeHTML('<BR><A HREF="url"></A>'), ["A", "IMG"]))
assert_equal('&lt;BR&gt;<A HREF="url"></A>', unescape_element(escapeHTML('<BR><A HREF="url"></A>'), "A", "IMG"))
assert_equal('&lt;BR&gt;<A HREF="url"></A>', unescape_element(escapeHTML('<BR><A HREF="url"></A>'), ["A", "IMG"]))
end
end