Changeset 456:371df097a76e

Timestamp:

06/09/07 23:28:56 (18 months ago)

Author:

ser

Branch:

default

convert_revision:

svn:877f57f0-f5bd-0310-8c13-bb9e5bdefd87/trunk@1255

Message:

r1279@bean: ser | 2007-06-09 23:19:02 -0400
Fixes ticket:89 -- encoding CP-1252 was broken. ISO-8859-15 had the same
problem.

Also in this patch is a fix to merge.rb (unused, but it should at least
contain no errors), and a unit test for ticket:88.

Files:

• bin/merge.rb (modified) (1 diff)
• src/rexml/encodings/CP-1252.rb (modified) (3 diffs)
• src/rexml/encodings/ISO-8859-15.rb (modified) (2 diffs)
• test/core_test.rb (modified) (1 diff)
• test/encoding.rb (modified) (1 diff)

bin/merge.rb

@@ -41 +41 @@
 Name: svn:executable
    + *
+=end
 
 
-

src/rexml/encodings/CP-1252.rb

@@ -4 +4 @@
 module REXML
   module Encoding
-    @@__REXML_encoding_methods = %q~
+        register( "CP-1252" ) do |o|
+                class << o
+                        alias encode encode_cp1252
+                        alias decode decode_cp1252
+                end
+        end
+
     # Convert from UTF-8
-    def encode content
+    def encode_cp1252(content)
       array_utf8 = content.unpack('U*')
       array_enc = []
@@ -55 +61 @@
     
     # Convert to UTF-8
-    def decode(str)
+    def decode_cp1252(str)
       array_latin9 = str.unpack('C*')
       array_enc = []
@@ -94 +100 @@
       array_enc.pack('U*')
     end
-    ~
   end
 end

src/rexml/encodings/ISO-8859-15.rb

@@ -4 +4 @@
 module REXML
   module Encoding
-    @@__REXML_encoding_methods = %q~
+        register("ISO-8859-15") do |o|
+                alias encode to_iso_8859_15
+                alias decode from_iso_8859_15
+        end
+
     # Convert from UTF-8
-    def to_iso_8859_15 content
+    def to_iso_8859_15(content)
       array_utf8 = content.unpack('U*')
       array_enc = []
@@ -65 +69 @@
       array_enc.pack('U*')
     end
-    ~
   end
 end

test/core_test.rb

@@ -1209 +1209 @@
     assert_equal( sanity1, sanity2 )
   end
+  
+  def test_ticket_88
+    doc = REXML::Document.new("<?xml version=\"1.0\" encoding=\"shift_jis\"?>")
+    assert_equal("<?xml version='1.0' encoding='SHIFT_JIS'?>", doc.to_s)
+    doc = REXML::Document.new("<?xml version = \"1.0\" encoding = \"shift_jis\"?>")
+    assert_equal("<?xml version='1.0' encoding='SHIFT_JIS'?>", doc.to_s)
+  end
 end

test/encoding.rb

@@ -68 +68 @@
     assert_equal( doc.elements['a'].text, "\303\277" )
   end
+
+
+  def test_ticket_89
+    doc = Document.new <<-EOL
+       <?xml version="1.0" encoding="CP-1252" ?>
+       <xml><foo></foo></xml>
+       EOL
+
+    REXML::Document.new doc
+  end
 end