deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

Browse source
This commit is contained in:
Jacques Distler 2011-02-18 13:13:43 -06:00
parent 363d72524b 3843fa608d
commit f9628a3f19
2 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/instiki_stringsupport.rb
View file

@ -2329,25 +2329,17 @@ end
when /\Aquot\z/ni then '"' when /\Aquot\z/ni then '"'
when /\Aapos\z/ni then "'" when /\Aapos\z/ni then "'"
when /\A#0*(\d+)\z/n then when /\A#0*(\d+)\z/n then
if Integer($1) < 256
Integer($1).chr
else
if Integer($1) < 1114111 if Integer($1) < 1114111
[Integer($1)].pack("U") [Integer($1)].pack("U")
else else
"&##{$1};" "&##{$1};"
end end
end
when /\A#x([0-9a-f]+)\z/ni then when /\A#x([0-9a-f]+)\z/ni then
if $1.hex < 256
[$1.hex].pack("U")
else
if $1.hex < 1114111 if $1.hex < 1114111
[$1.hex].pack("U") [$1.hex].pack("U")
else else
"&#x#{$1};" "&#x#{$1};"
end end
end
else else
"&#{match};" "&#{match};"
end end

6
test/unit/sanitizer_test.rb
View file

@ -23,9 +23,9 @@ class SanitizerTest < Test::Unit::TestCase
end end
def test_sanitize_named_entities def test_sanitize_named_entities
input = '<p>Greek &phis; &phi;, double-struck &Aopf;, numeric &#x1D538; &#8279;, uppercase &TRADE; &LT;</p>' input = '<p>Greek &phis; &phi;, double-struck &Aopf;, numeric &nbsp; &#xA0; &#x1D538; &#8279;, uppercase &TRADE; &LT;</p>'
output = "<p>Greek \317\225 \317\206, double-struck \360\235\224\270, numeric \360\235\224\270 \342\201\227, uppercase \342\204\242 &lt;</p>" output = "<p>Greek \317\225 \317\206, double-struck \360\235\224\270, numeric \302\240 \302\240 \360\235\224\270 \342\201\227, uppercase \342\204\242 &lt;</p>"
output2 = "<p>Greek \317\225 \317\206, double-struck \360\235\224\270, numeric &#x1D538; &#8279;, uppercase \342\204\242 &lt;</p>" output2 = "<p>Greek \317\225 \317\206, double-struck \360\235\224\270, numeric \302\240 &#xA0; &#x1D538; &#8279;, uppercase \342\204\242 &lt;</p>"
check_sanitization(input, output, output, output) check_sanitization(input, output, output, output)
assert_equal(output2, input.to_utf8.as_bytes) assert_equal(output2, input.to_utf8.as_bytes)
end end