diff options
Diffstat (limited to 'lib/rexml/encodings')
-rw-r--r-- | lib/rexml/encodings/EUC-JP.rb | 17 | ||||
-rw-r--r-- | lib/rexml/encodings/Shift-JIS.rb | 21 | ||||
-rw-r--r-- | lib/rexml/encodings/Shift_JIS.rb | 18 |
3 files changed, 35 insertions, 21 deletions
diff --git a/lib/rexml/encodings/EUC-JP.rb b/lib/rexml/encodings/EUC-JP.rb index cedd6751e..23a1c3c65 100644 --- a/lib/rexml/encodings/EUC-JP.rb +++ b/lib/rexml/encodings/EUC-JP.rb @@ -13,5 +13,20 @@ begin end end rescue LoadError - raise "uconv is required for Japanese encoding support." + begin + require 'iconv' + module REXML + module Encoding + def from_euc_jp(str) + return Iconv::iconv("utf-8", "euc-jp", str)[0] + end + + def to_euc_jp content + return Iconv::iconv("euc-jp", "utf-8", content)[0] + end + 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 index 865017453..e805456ea 100644 --- a/lib/rexml/encodings/Shift-JIS.rb +++ b/lib/rexml/encodings/Shift-JIS.rb @@ -3,15 +3,30 @@ begin module REXML module Encoding - def to_shift_jis content + def from_shift_jis(str) Uconv::u8tosjis(content) end - def from_shift_jis(str) + def to_shift_jis content Uconv::sjistou8(str) end end end rescue LoadError - raise "uconv is required for Japanese encoding support." + begin + require 'iconv' + module REXML + module Encoding + def from_shift_jis(str) + return Iconv::iconv("utf-8", "shift-jis", str)[0] + end + + def to_shift_jis content + return Iconv::iconv("euc-jp", "shift-jis", content)[0] + end + 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 index 865017453..6e8f75937 100644 --- a/lib/rexml/encodings/Shift_JIS.rb +++ b/lib/rexml/encodings/Shift_JIS.rb @@ -1,17 +1 @@ -begin - require 'uconv' - - module REXML - module Encoding - def to_shift_jis content - Uconv::u8tosjis(content) - end - - def from_shift_jis(str) - Uconv::sjistou8(str) - end - end - end -rescue LoadError - raise "uconv is required for Japanese encoding support." -end +require 'rexml/encodings/Shift-JIS' |