Added downcased shift-jis declarations. The old, all upper case declarations

are deprecated, but I need some Shift-JIS encoded documents to test against
before I remove them.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5145 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 40 insertions, 0 deletions

diff --git a/MANIFEST b/MANIFEST
index 40c60ae64..e6297caf1 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -276,6 +276,8 @@ 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
new file mode 100644
index 000000000..32aa6450f
--- /dev/null
+++ b/lib/rexml/encodings/Shift-JIS.rb
@@ -0,0 +1,37 @@
+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
new file mode 100644
index 000000000..6e8f75937
--- /dev/null
+++ b/lib/rexml/encodings/Shift_JIS.rb
@@ -0,0 +1 @@
+require 'rexml/encodings/Shift-JIS'