xml helper

Author: swhitty

Examples/Sources/GalleryView.swift

@@ -34,30 +34,33 @@ import SwiftUI
 
 struct GalleryView: View {
 
-    var imageNames: [String] = [
-        "avocado.svg",
-        "angry.svg",
-        "dish.svg",
-        "mouth-open.svg",
-        "sleepy.svg",
-        "smile.svg",
-        "snake.svg",
-        "spider.svg",
-        "star-struck.svg",
-        "worried.svg",
-        "yawning.svg",
-        "thats-no-moon.svg",
-        "alert.svg"
-    ]
+    var images: [SVG] = {
+        [
+            "avocado.svg",
+            "angry.svg",
+            "dish.svg",
+            "mouth-open.svg",
+            "sleepy.svg",
+            "smile.svg",
+            "snake.svg",
+            "spider.svg",
+            "star-struck.svg",
+            "worried.svg",
+            "yawning.svg",
+            "thats-no-moon.svg",
+            "alert.svg"
+        ].compactMap {
+            SVG(named: $0, in: .samples)
+        }
+    }()
 
     var body: some View {
         ScrollView {
             LazyVStack(spacing: 20) {
-                ForEach(imageNames, id: \.self) { name in
-                    SVGView(name, bundle: .samples)
+                ForEach(images, id: \.self) { image in
+                    SVGView(svg: image)
                         .aspectRatio(contentMode: .fit)
                         .padding([.leading, .trailing], 10)
-                    // .frame(maxWidth: 320)
                 }
             }
             .background(Color.white)

SwiftDraw/SVG.swift

@@ -37,8 +37,8 @@ import CoreGraphics
 public struct SVG: Hashable {
     public let size: CGSize
 
-    //An Image is simply an array of CoreGraphics draw commands
-    //see: Renderer.swift
+    // Array of commands that render the image
+    // see: Renderer.swift
     let commands: [RendererCommand<CGTypes>]
 
     public init?(fileURL url: URL, options: SVG.Options = .default) {
@@ -52,18 +52,17 @@ public struct SVG: Hashable {
     }
 
     public init?(named name: String, in bundle: Bundle = Bundle.main, options: SVG.Options = .default) {
-        guard let url = bundle.url(forResource: name, withExtension: nil) else {
-            return nil
-        }
-
+        guard let url = bundle.url(forResource: name, withExtension: nil) else { return nil }
         self.init(fileURL: url, options: options)
     }
 
-    public init?(data: Data, options: SVG.Options = .default) {
-        guard let svg = try? DOM.SVG.parse(data: data) else {
-            return nil
-        }
+    public init?(xml: String, options: SVG.Options = .default) {
+        guard let data = xml.data(using: .utf8) else { return nil }
+        self.init(data: data)
+    }
 
+    public init?(data: Data, options: SVG.Options = .default) {
+        guard let svg = try? DOM.SVG.parse(data: data) else { return nil }
         self.init(dom: svg, options: options)
     }
 

SwiftDrawTests/UIImage+ImageTests.swift

@@ -48,7 +48,7 @@ final class UIImageTests: XCTestCase {
     }
 
     func testImageSize() throws {
-        let image = try SVG.parse(#"""
+        let image = try SVG.parseXML(#"""
             <?xml version="1.0" encoding="UTF-8"?>
             <svg width="64" height="64" version="1.1" xmlns="http://www.w3.org/2000/svg">
             </svg>
@@ -76,9 +76,8 @@ final class UIImageTests: XCTestCase {
 
 private extension SVG {
 
-    static func parse(_ code: String) throws -> SVG {
-        guard let data = code.data(using: .utf8),
-              let svg = SVG(data: data)  else {
+    static func parseXML(_ xml: String) throws -> SVG {
+        guard let svg = SVG(xml: xml) else {
             throw InvalidSVG()
         }
         return svg