Fix Entities UTF16 escape

scinfu · Jun 28, 2017 · 312cb57 · 312cb57
1 parent 9898dd9
commit 312cb57
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/Sources/Entities.swift b/Sources/Entities.swift
@@ -257,8 +257,8 @@ public class Entities {
         //let length = UInt32(string.characters.count)
 
         var codePoint: UnicodeScalar
-        for ch in string.characters {
-            codePoint = ch.unicodeScalar
+        for ch in string.unicodeScalars {
+            codePoint = ch
 
             if (normaliseWhite) {
                 if (codePoint.isWhitespace) {

diff --git a/Sources/StringBuilder.swift b/Sources/StringBuilder.swift
@@ -81,6 +81,12 @@ open class StringBuilder {
         return self
     }
 
+    @discardableResult
+    open func append(_ value: UnicodeScalar) -> StringBuilder {
+        stringValue.append(contentsOf: value.description.characters)
+        return self
+    }
+
     @discardableResult
     open func insert<T: CustomStringConvertible>(_ offset: Int, _ value: T) -> StringBuilder {
         stringValue.insert(contentsOf: value.description.characters, at: offset)

diff --git a/SwiftSoup.podspec b/SwiftSoup.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'SwiftSoup'
-  s.version          = '1.4.0'
+  s.version          = '1.4.1'
   s.summary          = 'Swift HTML Parser / Reader, XML , with best of DOM, CSS, and jquery'
 
 # This description is used to generate tags and improve search results.

diff --git a/Tests/SwiftSoupTests/DocumentTest.swift b/Tests/SwiftSoupTests/DocumentTest.swift
@@ -433,6 +433,20 @@ class DocumentTest: XCTestCase {
 
 		return doc
 	}
+
+
+    func testThai()
+    {
+        let str = "บังคับ"
+        guard let doc = try? SwiftSoup.parse(str) else {
+            XCTFail()
+            return}
+        guard let txt = try? doc.html() else {
+            XCTFail()
+            return}
+        XCTAssertEqual("<html>\n <head></head>\n <body>\n  บังคับ\n </body>\n</html>", txt)
+    }
+
 	//todo:
 //	func testShiftJisRoundtrip()throws {
 //		let input =
@@ -482,7 +496,8 @@ class DocumentTest: XCTestCase {
 			("testMetaCharsetUpdateXmlNoCharset", testMetaCharsetUpdateXmlNoCharset),
 			("testMetaCharsetUpdateXmlDisabled", testMetaCharsetUpdateXmlDisabled),
 			("testMetaCharsetUpdateXmlDisabledNoChanges", testMetaCharsetUpdateXmlDisabledNoChanges),
-			("testMetaCharsetUpdatedDisabledPerDefault", testMetaCharsetUpdatedDisabledPerDefault)
+			("testMetaCharsetUpdatedDisabledPerDefault", testMetaCharsetUpdatedDisabledPerDefault),
+			("testThai",testThai)
 		]
 	}()