ruby-changes:28519
From: xibbar <ko1@a...>
Date: Fri, 3 May 2013 20:23:35 +0900 (JST)
Subject: [ruby-changes:28519] xibbar:r40571 (trunk): * lib/cgi/util.rb: class methods modulize for using like a function.
xibbar 2013-05-03 20:23:23 +0900 (Fri, 03 May 2013) New Revision: 40571 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=40571 Log: * lib/cgi/util.rb: class methods modulize for using like a function. [Feature #8354] Modified files: trunk/ChangeLog trunk/lib/cgi/util.rb trunk/test/cgi/test_cgi_util.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 40570) +++ ChangeLog (revision 40571) @@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1 +Fri May 3 19:32:13 2013 Takeyuki FUJIOKA <xibbar@r...> + + * lib/cgi/util.rb: All class methods moduleized. + We can use these methods like a function when "include CGI::Util". + [Feature #8354] + Fri May 3 14:09:45 2013 Tanaka Akira <akr@f...> * ext/socket/extconf.rb: Make default_ipv6 true for Cygwin. Index: lib/cgi/util.rb =================================================================== --- lib/cgi/util.rb (revision 40570) +++ lib/cgi/util.rb (revision 40571) @@ -1,9 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/lib/cgi/util.rb#L1 -class CGI +class CGI; module Util; end; extend Util; end +module CGI::Util @@accept_charset="UTF-8" unless defined?(@@accept_charset) # URL-encode a string. # url_encoded_string = CGI::escape("'Stop!' said Fred") # # => "%27Stop%21%27+said+Fred" - def CGI::escape(string) + def escape(string) encoding = string.encoding string.dup.force_encoding('ASCII-8BIT').gsub(/([^ a-zA-Z0-9_.-]+)/) do '%' + $1.unpack('H2' * $1.bytesize).join('%').upcase @@ -13,7 +14,7 @@ class CGI https://github.com/ruby/ruby/blob/trunk/lib/cgi/util.rb#L14 # URL-decode a string with encoding(optional). # string = CGI::unescape("%27Stop%21%27+said+Fred") # # => "'Stop!' said Fred" - def CGI::unescape(string,encoding=@@accept_charset) + def unescape(string,encoding=@@accept_charset) str=string.tr('+', ' ').force_encoding(Encoding::ASCII_8BIT).gsub(/((?:%[0-9a-fA-F]{2})+)/) do [$1.delete('%')].pack('H*') end.force_encoding(encoding) @@ -32,14 +33,14 @@ class CGI https://github.com/ruby/ruby/blob/trunk/lib/cgi/util.rb#L33 # Escape special characters in HTML, namely &\"<> # CGI::escapeHTML('Usage: foo "bar" <baz>') # # => "Usage: foo "bar" <baz>" - def CGI::escapeHTML(string) + def escapeHTML(string) string.gsub(/['&\"<>]/, TABLE_FOR_ESCAPE_HTML__) end # Unescape a string that has been HTML-escaped # CGI::unescapeHTML("Usage: foo "bar" <baz>") # # => "Usage: foo \"bar\" <baz>" - def CGI::unescapeHTML(string) + def unescapeHTML(string) enc = string.encoding if [Encoding::UTF_16BE, Encoding::UTF_16LE, Encoding::UTF_32BE, Encoding::UTF_32LE].include?(enc) return string.gsub(Regexp.new('&(apos|amp|quot|gt|lt|#[0-9]+|#x[0-9A-Fa-f]+);'.encode(enc))) do @@ -88,12 +89,12 @@ class CGI https://github.com/ruby/ruby/blob/trunk/lib/cgi/util.rb#L89 end # Synonym for CGI::escapeHTML(str) - def CGI::escape_html(str) + def escape_html(str) escapeHTML(str) end # Synonym for CGI::unescapeHTML(str) - def CGI::unescape_html(str) + def unescape_html(str) unescapeHTML(str) end @@ -110,7 +111,7 @@ class CGI https://github.com/ruby/ruby/blob/trunk/lib/cgi/util.rb#L111 # # print CGI::escapeElement('<BR><A HREF="url"></A>', ["A", "IMG"]) # # "<BR><A HREF="url"></A>" - def CGI::escapeElement(string, *elements) + def escapeElement(string, *elements) elements = elements[0] if elements[0].kind_of?(Array) unless elements.empty? string.gsub(/<\/?(?:#{elements.join("|")})(?!\w)(?:.|\n)*?>/i) do @@ -130,11 +131,11 @@ class CGI https://github.com/ruby/ruby/blob/trunk/lib/cgi/util.rb#L131 # print CGI::unescapeElement( # CGI::escapeHTML('<BR><A HREF="url"></A>'), ["A", "IMG"]) # # "<BR><A HREF="url"></A>" - def CGI::unescapeElement(string, *elements) + def unescapeElement(string, *elements) elements = elements[0] if elements[0].kind_of?(Array) unless elements.empty? string.gsub(/<\/?(?:#{elements.join("|")})(?!\w)(?:.|\n)*?>/i) do - CGI::unescapeHTML($&) + unescapeHTML($&) end else string @@ -142,12 +143,12 @@ class CGI https://github.com/ruby/ruby/blob/trunk/lib/cgi/util.rb#L143 end # Synonym for CGI::escapeElement(str) - def CGI::escape_element(str) + def escape_element(str) escapeElement(str) end # Synonym for CGI::unescapeElement(str) - def CGI::unescape_element(str) + def unescape_element(str) unescapeElement(str) end @@ -161,11 +162,11 @@ class CGI https://github.com/ruby/ruby/blob/trunk/lib/cgi/util.rb#L162 # # CGI::rfc1123_date(Time.now) # # Sat, 01 Jan 2000 00:00:00 GMT - def CGI::rfc1123_date(time) + def rfc1123_date(time) t = time.clone.gmtime return format("%s, %.2d %s %.4d %.2d:%.2d:%.2d GMT", - RFC822_DAYS[t.wday], t.day, RFC822_MONTHS[t.month-1], t.year, - t.hour, t.min, t.sec) + RFC822_DAYS[t.wday], t.day, RFC822_MONTHS[t.month-1], t.year, + t.hour, t.min, t.sec) end # Prettify (indent) an HTML string. @@ -185,7 +186,7 @@ class CGI https://github.com/ruby/ruby/blob/trunk/lib/cgi/util.rb#L186 # # </BODY> # # </HTML> # - def CGI::pretty(string, shift = " ") + def pretty(string, shift = " ") lines = string.gsub(/(?!\A)<.*?>/m, "\n\\0").gsub(/<.*?>(?!\n)/m, "\\0\n") end_pos = 0 while end_pos = lines.index(/^<\/(\w+)/, end_pos) @@ -195,4 +196,6 @@ class CGI https://github.com/ruby/ruby/blob/trunk/lib/cgi/util.rb#L196 end lines.gsub(/^((?:#{Regexp::quote(shift)})*)__(?=<\/?\w)/, '\1') end + + alias h escapeHTML end Index: test/cgi/test_cgi_util.rb =================================================================== --- test/cgi/test_cgi_util.rb (revision 40570) +++ test/cgi/test_cgi_util.rb (revision 40571) @@ -4,7 +4,7 @@ require 'stringio' https://github.com/ruby/ruby/blob/trunk/test/cgi/test_cgi_util.rb#L4 class CGIUtilTest < Test::Unit::TestCase - + include CGI::Util def setup ENV['REQUEST_METHOD'] = 'GET' @@ -65,4 +65,25 @@ class CGIUtilTest < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/cgi/test_cgi_util.rb#L65 assert_equal(CGI::unescapeHTML("あいう"),"\xE3\x81\x82\xE3\x81\x84\xE3\x81\x86") end + def test_cgi_include_escape + assert_equal('%26%3C%3E%22+%E3%82%86%E3%82%93%E3%82%86%E3%82%93', escape(@str1)) + end + + def test_cgi_include_escapeHTML + assert_equal(escapeHTML("'&\"><"),"'&"><") + end + + def test_cgi_include_h + assert_equal(h("'&\"><"),"'&"><") + end + + def test_cgi_include_unescape + assert_equal(@str1, unescape('%26%3C%3E%22+%E3%82%86%E3%82%93%E3%82%86%E3%82%93')) + assert_equal(@str1.encoding, unescape('%26%3C%3E%22+%E3%82%86%E3%82%93%E3%82%86%E3%82%93').encoding) if defined?(::Encoding) + assert_equal("\u{30E1 30E2 30EA 691C 7D22}", unescape("\u{30E1 30E2 30EA}%E6%A4%9C%E7%B4%A2")) + end + + def test_cgi_include_unescapeHTML + assert_equal(unescapeHTML("'&"><"),"'&\"><") + end end -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/