diff options
| -rw-r--r-- | MANIFEST | 2 | ||||
| -rw-r--r-- | lib/rexml/encodings/SHIFT-JIS.rb | 38 | ||||
| -rw-r--r-- | lib/rexml/encodings/Shift-JIS.rb | 37 | ||||
| -rw-r--r-- | lib/rexml/encodings/Shift_JIS.rb | 1 | ||||
| -rw-r--r-- | lib/rexml/encodings/UNILE.rb | 2 | ||||
| -rw-r--r-- | lib/rexml/encodings/US-ASCII.rb | 2 | ||||
| -rw-r--r-- | lib/rexml/encodings/UTF-16.rb | 2 | ||||
| -rw-r--r-- | lib/rexml/rexml.rb | 8 |
8 files changed, 44 insertions, 48 deletions
@@ -276,8 +276,6 @@ lib/rexml/encoding.rb lib/rexml/encodings/EUC-JP.rb lib/rexml/encodings/ICONV.rb lib/rexml/encodings/ISO-8859-1.rb -lib/rexml/encodings/Shift-JIS.rb -lib/rexml/encodings/Shift_JIS.rb lib/rexml/encodings/SHIFT-JIS.rb lib/rexml/encodings/SHIFT_JIS.rb lib/rexml/encodings/UNILE.rb diff --git a/lib/rexml/encodings/SHIFT-JIS.rb b/lib/rexml/encodings/SHIFT-JIS.rb index 2c2a6890c8..e7dc6339ae 100644 --- a/lib/rexml/encodings/SHIFT-JIS.rb +++ b/lib/rexml/encodings/SHIFT-JIS.rb @@ -1 +1,37 @@ -require 'rexml/encodings/SHIFT_JIS' +begin + require 'iconv' + + module REXML + module Encoding + @@__REXML_encoding_methods =<<-EOL + def decode(str) + return Iconv::iconv("utf-8", "shift-jis", str)[0] + end + + def encode content + return Iconv::iconv("shift-jis", "utf-8", content)[0] + end + EOL + end + end +rescue LoadError + begin + require 'uconv' + + module REXML + module Encoding + @@__REXML_encoding_methods =<<-EOL + def to_shift_jis content + Uconv::u8tosjis(content) + end + + def from_shift_jis(str) + Uconv::sjistou8(str) + end + EOL + end + end + rescue LoadError + raise "uconv or iconv is required for Japanese encoding support." + end +end diff --git a/lib/rexml/encodings/Shift-JIS.rb b/lib/rexml/encodings/Shift-JIS.rb deleted file mode 100644 index 32aa6450fe..0000000000 --- a/lib/rexml/encodings/Shift-JIS.rb +++ /dev/null @@ -1,37 +0,0 @@ -begin - require 'iconv' - - module REXML - module Encoding - @@__REXML_encoding =<<-EOL - def decode(str) - return Iconv::iconv("utf-8", "shift-jis", str)[0] - end - - def encode content - return Iconv::iconv("shift-jis", "utf-8", content)[0] - end - EOL - end - end -rescue LoadError - begin - require 'uconv' - - module REXML - module Encoding - @@__REXML_encoding_methods =<<-EOL - def to_shift_jis content - Uconv::u8tosjis(content) - end - - def from_shift_jis(str) - Uconv::sjistou8(str) - end - EOL - end - end - rescue LoadError - raise "uconv or iconv is required for Japanese encoding support." - end -end diff --git a/lib/rexml/encodings/Shift_JIS.rb b/lib/rexml/encodings/Shift_JIS.rb deleted file mode 100644 index 6e8f759373..0000000000 --- a/lib/rexml/encodings/Shift_JIS.rb +++ /dev/null @@ -1 +0,0 @@ -require 'rexml/encodings/Shift-JIS' diff --git a/lib/rexml/encodings/UNILE.rb b/lib/rexml/encodings/UNILE.rb index 3ff9b2b53c..95141093b5 100644 --- a/lib/rexml/encodings/UNILE.rb +++ b/lib/rexml/encodings/UNILE.rb @@ -1,6 +1,6 @@ module REXML module Encoding - @@__REXML_encoding_string =<<-EOL + @@__REXML_encoding_methods =<<-EOL def encode content array_utf8 = content.unpack("U*") array_enc = [] diff --git a/lib/rexml/encodings/US-ASCII.rb b/lib/rexml/encodings/US-ASCII.rb index 618e0ad613..5beefbd408 100644 --- a/lib/rexml/encodings/US-ASCII.rb +++ b/lib/rexml/encodings/US-ASCII.rb @@ -1,6 +1,6 @@ module REXML module Encoding - @@__REXML_encoding_string =<<-EOL + @@__REXML_encoding_methods =<<-EOL # Convert from UTF-8 def encode content array_utf8 = content.unpack('U*') diff --git a/lib/rexml/encodings/UTF-16.rb b/lib/rexml/encodings/UTF-16.rb index ecfc4f9945..bd92fce18d 100644 --- a/lib/rexml/encodings/UTF-16.rb +++ b/lib/rexml/encodings/UTF-16.rb @@ -1,6 +1,6 @@ module REXML module Encoding - @@__REXML_encoding_string =<<-EOL + @@__REXML_encoding_methods =<<-EOL def encode content array_utf8 = content.unpack("U*") array_enc = [] diff --git a/lib/rexml/rexml.rb b/lib/rexml/rexml.rb index 779c0638ea..b632188571 100644 --- a/lib/rexml/rexml.rb +++ b/lib/rexml/rexml.rb @@ -2,8 +2,8 @@ # # URL: http://www.germane-software.com/software/rexml # Author: Sean Russell <ser@germane-software.com> -# Version: 2.7.2 -# Date: +2003/343 +# Version: @ANT_VERSION@ +# Date: @ANT_DATE@ @@ -21,6 +21,6 @@ # A tutorial is available in docs/tutorial.html module REXML Copyright = "Copyright #{Time.now.year} Sean Russell <ser@germane-software.com>" - Date = "+2003/343" - Version = "2.7.2" + Date = "+2003/346" + Version = "2.7.3" end |