diff options
author | ser <ser@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-12-09 02:41:33 +0000 |
---|---|---|
committer | ser <ser@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-12-09 02:41:33 +0000 |
commit | e6636fe890ab7cf8f8f1b86ca54a3e10f98d43e6 (patch) | |
tree | 97264c7f6a6c1eb2af6909f8432a6631b4d2ccbb /lib/rexml/encodings/ICONV.rb | |
parent | 31963249b96e11ea1df66be8a91f016af4364d14 (diff) | |
download | ruby-e6636fe890ab7cf8f8f1b86ca54a3e10f98d43e6.tar.gz |
* Added the lower-case Shift-JIS files to the manifest. The upper-case ones
should be deprecated, but I need a Shift-JIS encoded XML file to test
against, first.
* Added support for maintaining external entity occurances in DTDs
* Deprecated the use of Document::DECLARATION. The new default declaration
can be gotten with XMLDecl::default()
* Refactored the encoding support code. It should be more robust now,
and fixes a few bugs.
* The XPath string() function now deals with Element nodes properly.
* Serialization with Output objects now works as would be expected.
* Various code cleanups, some reducing the number of warnings that Ruby 1.8.x
produces with REXML.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5144 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rexml/encodings/ICONV.rb')
-rw-r--r-- | lib/rexml/encodings/ICONV.rb | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/lib/rexml/encodings/ICONV.rb b/lib/rexml/encodings/ICONV.rb index f1b5c80b87..384758d7b2 100644 --- a/lib/rexml/encodings/ICONV.rb +++ b/lib/rexml/encodings/ICONV.rb @@ -2,13 +2,15 @@ require "iconv" raise LoadError unless defined? Iconv module REXML - module Encoding - def decode( str ) - return Iconv::iconv(UTF_8, @encoding, str)[0] - end + module Encoding + @@__REXML_encoding_methods =<<-EOL + def decode( str ) + return Iconv::iconv("utf-8", @encoding, str)[0] + end - def encode( content ) - return Iconv::iconv(@encoding, UTF_8, content)[0] - end - end + def encode( content ) + return Iconv::iconv(@encoding, "utf-8", content)[0] + end + EOL + end end |