[ruby-dev:20701] rexml/encodings/SHIFT_JIS.rb

西山和広です。

SHIFT_JISの方もお願いします。
それからjoinは一応引数をつけておいた方がよさそうな気がします。


Index: lib/rexml/encodings/EUC-JP.rb
===================================================================
RCS file: /src/ruby/lib/rexml/encodings/EUC-JP.rb,v
retrieving revision 1.3
diff -u -p -r1.3 EUC-JP.rb
--- lib/rexml/encodings/EUC-JP.rb	10 Jul 2003 02:30:08 -0000	1.3
+++ lib/rexml/encodings/EUC-JP.rb	16 Jul 2003 12:48:49 -0000
@@ -18,11 +18,11 @@ rescue LoadError
 	module REXML
 		module Encoding
 			def from_euc_jp(str)
-				return Iconv::iconv("utf-8", "euc-jp", str).join
+				return Iconv::iconv("utf-8", "euc-jp", str).join('')
 			end
 
 			def to_euc_jp content
-				return Iconv::iconv("euc-jp", "utf-8", content).join
+				return Iconv::iconv("euc-jp", "utf-8", content).join('')
 			end
 		end
 	end
Index: lib/rexml/encodings/SHIFT_JIS.rb
===================================================================
RCS file: /src/ruby/lib/rexml/encodings/SHIFT_JIS.rb,v
retrieving revision 1.1
diff -u -p -r1.1 SHIFT_JIS.rb
--- lib/rexml/encodings/SHIFT_JIS.rb	11 Jul 2003 05:26:30 -0000	1.1
+++ lib/rexml/encodings/SHIFT_JIS.rb	16 Jul 2003 12:48:49 -0000
@@ -13,5 +13,21 @@ begin
 		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).join('')
+			end
+
+			def to_shift_jis content
+				return Iconv::iconv("shift_jis", "utf-8", content).join('')
+			end
+		end
+	end
+  rescue LoadError
+	raise "uconv or iconv is required for Japanese encoding support."
+  end
+
 end


-- 
|ZnZ(ゼット エヌ ゼット)
|西山和広(Kazuhiro NISHIYAMA)