1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* lib/rexml/output.rb (REXML::Output): Don't output BOM in middle

Browse Source 
of the output string.
* test/rexml/test_document.rb: Add a test for the above change.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37450 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
kou 2012-11-03 05:42:40 +00:00
parent 15a743b3ff
commit ac9a8ac624
3 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Sat Nov 3 14:41:17 2012 Kouhei Sutou <kou@cozmixng.org>
* lib/rexml/output.rb (REXML::Output): Don't output BOM in middle
of the output string.
* test/rexml/test_document.rb: Add a test for the above change.
Sat Nov 3 14:09:55 2012 Kouhei Sutou <kou@cozmixng.org> Sat Nov 3 14:09:55 2012 Kouhei Sutou <kou@cozmixng.org>
* NEWS: Add an item about REXML::Document#write. * NEWS: Add an item about REXML::Document#write.

5
lib/rexml/output.rb
View File

@ -11,6 +11,11 @@ module REXML
self.encoding = encd self.encoding = encd
@to_utf = encd != 'UTF-8' @to_utf = encd != 'UTF-8'
if encoding == "UTF-16"
@output << "\ufeff".encode("UTF-16BE")
self.encoding = "UTF-16BE"
end
end end
def <<( content ) def <<( content )

19
test/rexml/test_document.rb
View File

@ -296,5 +296,24 @@ EOX
assert_equal("UTF-16", document.encoding) assert_equal("UTF-16", document.encoding)
end end
end end
class WriteTest < self
def test_utf_16
xml = <<-EOX.encode("UTF-16LE").force_encoding("ASCII-8BIT")
<?xml version="1.0"?>
<message>Hello world!</message>
EOX
bom = "\ufeff".encode("UTF-16LE").force_encoding("ASCII-8BIT")
document = REXML::Document.new(bom + xml)
actual_xml = ""
document.write(actual_xml)
expected_xml = <<-EOX.encode("UTF-16BE")
\ufeff<?xml version='1.0' encoding='UTF-16'?>
<message>Hello world!</message>
EOX
assert_equal(expected_xml, actual_xml)
end
end
end end
end end