pathLenght for SVG elments & path rx, ry

BinaryBirds · Feb 18, 2022 · ecb4d01 · ecb4d01
1 parent 8bdb215
commit ecb4d01
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 10 deletions.
diff --git a/Sources/SwiftSvg/Circle.swift b/Sources/SwiftSvg/Circle.swift
@@ -5,15 +5,19 @@
 //  Created by Tibor Bodecs on 2021. 11. 29..
 //
 
-
+/// https://developer.mozilla.org/en-US/docs/Web/SVG/Element/circle
 open class Circle: Tag {
 
-    public init(cx: Double, cy: Double, r: Double) {
+    public init(cx: Double,
+                cy: Double,
+                r: Double,
+                pathLength: Double? = nil) {
         super.init()
         setAttributes([
             .init(key: "cx", value: cx.preciseString),
             .init(key: "cy", value: cy.preciseString),
             .init(key: "r", value: r.preciseString),
         ])
+        attribute("pathLength", pathLength?.preciseString)
     }
 }
diff --git a/Sources/SwiftSvg/Ellipse.swift b/Sources/SwiftSvg/Ellipse.swift
@@ -5,16 +5,21 @@
 //  Created by Tibor Bodecs on 2021. 12. 21..
 //
 
+/// https://developer.mozilla.org/en-US/docs/Web/SVG/Element/ellipse
 open class Ellipse: Tag {
 
-    public init(cx: Double, cy: Double, rx: Double, ry: Double) {
+    public init(cx: Double,
+                cy: Double,
+                rx: Double,
+                ry: Double,
+                pathLength: Double? = nil) {
         super.init()
         setAttributes([
             .init(key: "cx", value: cx.preciseString),
             .init(key: "cy", value: cy.preciseString),
             .init(key: "rx", value: rx.preciseString),
             .init(key: "ry", value: ry.preciseString),
         ])
-
+        attribute("pathLength", pathLength?.preciseString)
     }
 }
diff --git a/Sources/SwiftSvg/Line.swift b/Sources/SwiftSvg/Line.swift
@@ -5,16 +5,21 @@
 //  Created by Tibor Bodecs on 2021. 11. 29..
 //
 
+/// https://developer.mozilla.org/en-US/docs/Web/SVG/Element/line
 open class Line: Tag {
 
-    public init(x1: Double, y1: Double, x2: Double, y2: Double) {
+    public init(x1: Double,
+                y1: Double,
+                x2: Double,
+                y2: Double,
+                pathLength: Double? = nil) {
         super.init()
         setAttributes([
             .init(key: "x1", value: x1.preciseString),
             .init(key: "y1", value: y1.preciseString),
             .init(key: "x2", value: x2.preciseString),
             .init(key: "y2", value: y2.preciseString),
         ])
-
+        attribute("pathLength", pathLength?.preciseString)
     }
 }
diff --git a/Sources/SwiftSvg/Path.swift b/Sources/SwiftSvg/Path.swift
@@ -6,12 +6,14 @@
 //
 
 
+/// https://developer.mozilla.org/en-US/docs/Web/SVG/Element/path
 open class Path: Tag {
 
-    public init(_ d: String) {
+    public init(_ d: String, pathLength: Double? = nil) {
         super.init()
         setAttributes([
             .init(key: "d", value: d),
         ])
+        attribute("pathLength", pathLength?.preciseString)
     }
 }
diff --git a/Sources/SwiftSvg/Polygon.swift b/Sources/SwiftSvg/Polygon.swift
@@ -5,12 +5,14 @@
 //  Created by Tibor Bodecs on 2021. 12. 21..
 //
 
+/// https://developer.mozilla.org/en-US/docs/Web/SVG/Element/polygon
 open class Polygon: Tag {
 
-    public init(_ points: [Double]) {
+    public init(_ points: [Double], pathLength: Double? = nil) {
         super.init()
         setAttributes([
             .init(key: "points", value: points.map(\.preciseString).joined(separator: " ")),
         ])
+        attribute("pathLength", pathLength?.preciseString)
     }
 }
diff --git a/Sources/SwiftSvg/Polyline.swift b/Sources/SwiftSvg/Polyline.swift
@@ -5,12 +5,14 @@
 //  Created by Tibor Bodecs on 2021. 12. 21..
 //
 
+/// https://developer.mozilla.org/en-US/docs/Web/SVG/Element/polyline
 open class Polyline: Tag {
 
-    public init(_ points: [Double]) {
+    public init(_ points: [Double], pathLength: Double? = nil) {
         super.init()
         setAttributes([
             .init(key: "points", value: points.map(\.preciseString).joined(separator: " ")),
         ])
+        attribute("pathLength", pathLength?.preciseString)
     }
 }
diff --git a/Sources/SwiftSvg/Rect.swift b/Sources/SwiftSvg/Rect.swift
@@ -5,15 +5,25 @@
 //  Created by Tibor Bodecs on 2021. 12. 21..
 //
 
+/// https://developer.mozilla.org/en-US/docs/Web/SVG/Element/rect
 open class Rect: Tag {
 
-    public init(x: Double, y: Double, width: Double, height: Double) {
+    public init(x: Double,
+                y: Double,
+                width: Double,
+                height: Double,
+                rx: Double? = nil,
+                ry: Double? = nil,
+                pathLength: Double? = nil) {
         super.init()
         setAttributes([
             .init(key: "x", value: x.preciseString),
             .init(key: "y", value: y.preciseString),
             .init(key: "width", value: width.preciseString),
             .init(key: "height", value: height.preciseString),
         ])
+        attribute("rx", rx?.preciseString)
+        attribute("ry", ry?.preciseString)
+        attribute("pathLength", pathLength?.preciseString)
     }
 }
diff --git a/Sources/SwiftSvg/Svg.swift b/Sources/SwiftSvg/Svg.swift
@@ -5,6 +5,7 @@
 //  Created by Tibor Bodecs on 2021. 11. 29..
 //
 
+/// https://developer.mozilla.org/en-US/docs/Web/SVG/Element
 open class Svg: Tag {
 
 }

diff --git a/Tests/SwiftSvgTests/SwiftSvgTests.swift b/Tests/SwiftSvgTests/SwiftSvgTests.swift
@@ -82,6 +82,19 @@ final class SwiftSvgTests: XCTestCase {
         """)
     }
 
+    func testRectWithOptionalAttributes() {
+        let doc = Document {
+            Svg {
+                Rect(x: 1, y: 2, width: 3, height: 4, rx: 5, ry: 6, pathLength: 7)
+            }
+        }
+        XCTAssertEqual(DocumentRenderer().render(doc), """
+        <svg>
+            <rect x="1" y="2" width="3" height="4" rx="5" ry="6" pathLength="7"></rect>
+        </svg>
+        """)
+    }
+
     func testEllipse() {
         let doc = Document {
             Svg {