Merge pull request #87 from swhitty/reduce-strictness-parseColor

reduces strictness when parsing rbg() colors

Author: swhitty

DOM/Sources/Parser.XML.Color.swift

@@ -120,32 +120,34 @@ extension XMLParser {
     return url
   }
 
-  private func parseIntColor(data: String, withAlpha: Bool) throws -> DOM.Color {
+  private func parseIntColor(data: String, requireAlpha: Bool) throws -> DOM.Color {
     var scanner = XMLParser.Scanner(text: data)
-    try scanner.scanString(withAlpha ? "rgba(" : "rgb(")
-    
+    try scanner.scanString(requireAlpha ? "rgba(" : "rgb(")
+
     let r = try scanner.scanUInt8()
     scanner.scanStringIfPossible(",")
     let g = try scanner.scanUInt8()
     scanner.scanStringIfPossible(",")
     let b = try scanner.scanUInt8()
     var a: Float = 1.0
 
-    if withAlpha {
+    if requireAlpha {
       scanner.scanStringIfPossible(",")
-      a = try scanner.scanFloat()  // Opacity
+      a = try scanner.scanAlpha()
+    } else if scanner.scanStringIfPossible(",") {
+      a = try scanner.scanAlpha()
     }
-    
+
     try scanner.scanString(")")
-    return .rgbi(r, g, b, a)
+    return .rgbi(r, g, b, min(1, a))
   }
 
   private func parseColorRGBi(data: String) throws -> DOM.Color {
-    return try parseIntColor(data: data, withAlpha: false)
+    return try parseIntColor(data: data, requireAlpha: false)
   }
 
   private func parseColorRGBAi(data: String) throws -> DOM.Color {
-    return try parseIntColor(data: data, withAlpha: true)
+    return try parseIntColor(data: data, requireAlpha: true)
   }
 
   private func parsePercentageColor(data: String, withAlpha: Bool) throws -> DOM.Color {

DOM/Sources/Parser.XML.Scanner.swift

@@ -214,7 +214,15 @@ package extension XMLParser {
             currentIndex = scanner.currentIndex
             return val
         }
-        
+
+        package mutating func scanAlpha() throws -> Float {
+            if let pc = try? scanPercentage() {
+                return pc
+            } else {
+                return try scanFloat()
+            }
+        }
+
         package mutating func scanPercentage() throws -> Float {
             let initialLocation = currentIndex
             scanner.currentIndex = currentIndex

DOM/Tests/Parser.XML.ColorTests.swift

@@ -66,6 +66,11 @@ final class ParserColorTests: XCTestCase {
     XCTAssertEqual(try XMLParser().parseColor("rgb(0,1,2)"), .rgbi(0, 1, 2, 1.0))
     XCTAssertEqual(try XMLParser().parseColor(" rgb( 0 , 1 , 2) "), .rgbi(0, 1, 2, 1.0))
     XCTAssertEqual(try XMLParser().parseColor("rgb(255,100,78)"), .rgbi(255, 100, 78, 1.0))
+
+    XCTAssertEqual(try XMLParser().parseColor("rgb(0,1,2,255)"), .rgbi(0, 1, 2, 1.0))
+    XCTAssertEqual(try XMLParser().parseColor("rgb(0,1,2,25%)"), .rgbi(0, 1, 2, 0.25))
+    XCTAssertEqual(try XMLParser().parseColor(" rgb( 0 , 1 , 2, 0.5) "), .rgbi(0, 1, 2, 0.5))
+    XCTAssertEqual(try XMLParser().parseColor("rgb(255,100, 78, 0)"), .rgbi(255, 100, 78, 0))
   }
 
   func testColorRGBf() {

Examples/Sources/GalleryView.swift

@@ -51,7 +51,8 @@ struct GalleryView: View {
             "worried.svg",
             "yawning.svg",
             "thats-no-moon.svg",
-            "alert.svg"
+            "alert.svg",
+            "effigy.svg"
         ].compactMap {
             SVG(named: $0, in: .samples)
         }