@@ -43,7 +43,11 @@ class CGI
# # => "Usage: foo \"bar\" <baz>"
def self.unescapeHTML(string)
table = UNESCAPE_ENTITIES
- utf8_p = $KCODE[0] == ?u || $KCODE[0] == ?U
+ if "".respond_to?(:encoding) # Ruby1.9
+ utf8_p = true # really?
+ else
+ utf8_p = $KCODE[0] == ?u || $KCODE[0] == ?U
+ end
return string.gsub(/&#?[a-zA-F0-9]+;/n) do
match = $&
key = match[1..-2]
lib/cgialt/util.rb
@@ -2,6 +2,7 @@ require 'test/unit'
#require 'cgi'
require(ENV['CGI'] || 'cgialt')
+
if defined?(CGIExt)
def if_cgiext; yield if block_given?; true; end
def if_cgialt; false; end
@@ -10,6 +11,7 @@ else
def if_cgialt; yield if block_given?; true; end
end
+
class CGIUtilTest < Test::Unit::TestCase
def test_escape_html
@@ -38,7 +40,7 @@ class CGIUtilTest < Test::Unit::TestCase
end
-if_cgiext do
+if_cgiext {
def test_escape_html!
## escape html characters
input = '<>&"\''
@@ -62,22 +64,22 @@ if_cgiext do
actual = CGIExt.escape_html!(input)
assert_equal(expected, actual)
end
-end
+}
def test_unescape_html
## unescape html characters
tdata = [
## html entities ('<>&"')
-# ['<>&"', '<>&"'],
+ ['<>&"', '<>&"'],
## otehr html entities (ex. '©')
-# ['©&heart;', '©&heart;'],
+ ['©&heart;', '©&heart;'],
## 'c' format
['"&'<>', '"&\'<>'],
## '香' format
-# ['"&'<>', '"&\'<>'],
+ ['"&'<>', '"&\'<>'],
## invalid format
-# ['&<&>"&abcdefghijklmn', '&<&>"&abcdefghijklmn'],
+ ['&<&>"&abcdefghijklmn', '&<&>"&abcdefghijklmn'],
]
actual = nil
tdata.each do |input, expected|
@@ -116,6 +118,7 @@ end
["\244\242\244\244\244\246\244\250\244\252", "%A4%A2%A4%A4%A4%A6%A4%A8%A4%AA"],
]
+
def test_escape_url
## encode url string
testdata = TESTDATA_FOR_ESCAPE_URL + [
@@ -223,9 +226,14 @@ end
end
## default value is frozen empty array
assert_equal(actual['unknownkey'], [])
- assert_raise(TypeError) do
- actual['unknownkey'] << 'foo'
+ ex = nil
+ if "".respond_to?(:encoding) # Ruby1.9
+ errclass = RuntimeError
+ else
+ errclass = TypeError
end
+ ex = assert_raise(errclass) { actual['unknownkey'] << 'foo' }
+ assert_equal("can't modify frozen array", ex.message)
end
test/test_cgi_util.rb
01a7d7d6573c3b0f9393a45ef442413a73a7ae75
makoto kuwata
kwa@kuwata-lab.com
http://github.com/kwatch/cgialt/commit/0d1250b7ceda8ae8b49a28ff3769c80ef6947fa5
0d1250b7ceda8ae8b49a28ff3769c80ef6947fa5
2008-11-08T15:11:33-08:00
2008-11-08T15:11:33-08:00
[change] CGI.unescapeHTML(): changed not to use $KCODE when Ruby1.9.
c2fb86b44c95ff1005bebb5b3feda7fede99d0fa
makoto kuwata
kwa@kuwata-lab.com