Merge pull request #26 from chriseidhof/linux-support

Linux Support

Author: robb

Sources/Swim/String+XML.swift

@@ -2,14 +2,27 @@ import Foundation
 
 extension String {
     func addingXMLEncoding() -> String {
-        withCFString { string -> NSString in
-            CFXMLCreateStringByEscapingEntities(nil, string, nil)
-        } as String
+        var result = ""
+        result.reserveCapacity(count)
+        return unicodeScalars.reduce(into: result, { $0.append($1.named_escapingIfNeeded) })
     }
+}
 
-    private func withCFString<Result>(_ body: (CFString) throws -> Result) rethrows -> Result {
-        try withCString { cString in
-            try body(CFStringCreateWithCString(nil, cString, CFStringBuiltInEncodings.UTF8.rawValue))
+extension UnicodeScalar {
+    fileprivate var named_escapingIfNeeded: String {
+        switch value {
+        case ("&" as Unicode.Scalar).value:
+            return "&amp;"
+        case ("<" as Unicode.Scalar).value:
+            return "&lt;"
+        case (">" as Unicode.Scalar).value:
+            return "&gt;"
+        case ("\'" as Unicode.Scalar).value:
+            return "&apos;"
+        case ("\"" as Unicode.Scalar).value:
+            return "&quot;"
+        default:
+            return String(self)
         }
     }
 }

Tests/SwimTests/SwimTests.swift

@@ -16,6 +16,13 @@ final class SwimTests: XCTestCase {
         XCTAssertEqual(n.rendered, "\n3 > 1")
     }
 
+    func testUnicodeAndEscaping() {
+        let n: Node = "500 €"
+        var result = ""
+        n.write(to: &result)
+        XCTAssertEqual(result, "\n500 €")
+    }
+    
     func testRaw() {
         let n: Node = Node.raw("<marquee>Hello</marquee>")
         XCTAssertEqual(n.rendered, "\n<marquee>Hello</marquee>")