From 2200adbdfba1b476d25a7234b68d824c0ebf8454 Mon Sep 17 00:00:00 2001
From: Alexander Zank <alex.zank@icloud.com>
Date: Fri, 20 Mar 2020 11:40:14 +0100
Subject: [PATCH 1/2] Add support for the `<object>` tag and its `data: URL`
 attribute with a new `HTMLLinkableDataContext`. Include `testObject()` and
 pass successfully.

---
 Sources/Plot/API/HTML.swift           |  5 +++++
 Sources/Plot/API/HTMLAttributes.swift | 16 ++++++++++++++++
 Sources/Plot/API/HTMLElements.swift   |  6 ++++++
 Tests/PlotTests/HTMLTests.swift       | 16 +++++++++++++++-
 4 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/Sources/Plot/API/HTML.swift b/Sources/Plot/API/HTML.swift
index 86561d0..1813713 100644
--- a/Sources/Plot/API/HTML.swift
+++ b/Sources/Plot/API/HTML.swift
@@ -83,6 +83,8 @@ public extension HTML {
     enum ListContext: HTMLStylableContext {}
     /// The context within an HTML `<meta>` element.
     enum MetaContext: HTMLNamableContext {}
+    /// The contect within an HTM `<object>` element.
+    enum ObjectContext: HTMLDimensionContext, HTMLLinkableDataContext, HTMLTypeContext  {}
     /// The context within an HTML `<option>` element.
     enum OptionContext: HTMLValueContext {}
     /// The context within an HTML `<picture>` element.
@@ -117,6 +119,9 @@ public protocol HTMLImageContainerContext: HTMLContext {}
 /// Context shared among all HTML elements that act as some form
 /// of link to an external resource, such as `<link>` or `<a>`.
 public protocol HTMLLinkableContext: HTMLContext {}
+/// Context shared among all HTML elements that support the `data` (URL)
+/// attribute, such as `<object>.`
+public protocol HTMLLinkableDataContext: HTMLContext {}
 /// Context shared among all HTML elements that enable media playback,
 /// such as `<audio>` and `<video>`.
 public protocol HTMLMediaContext: HTMLSourceListContext {}
diff --git a/Sources/Plot/API/HTMLAttributes.swift b/Sources/Plot/API/HTMLAttributes.swift
index 17b058a..d0e2b88 100644
--- a/Sources/Plot/API/HTMLAttributes.swift
+++ b/Sources/Plot/API/HTMLAttributes.swift
@@ -179,6 +179,22 @@ public extension Node where Context: HTMLSourceContext {
     }
 }
 
+public extension Attribute where Context: HTMLLinkableDataContext {
+    /// Assign an external resource to the element, using its `data` attribute.
+    /// - parameter url: The data URL to assign.
+    static func data(_ url: URLRepresentable) -> Attribute {
+        Attribute(name: "data", value: url.string)
+    }
+}
+
+public extension Node where Context: HTMLLinkableDataContext {
+    /// Assign an external resource to the element, using its `data` attribute.
+    /// - parameter url: The data URL to assign.
+    static func data(_ url: URLRepresentable) -> Node {
+        .attribute(named: "data", value: url.string)
+    }
+}
+
 public extension Node where Context: HTMLMediaContext {
     /// Assign whether the element's media controls should be enabled.
     /// - parameter enableControls: Whether controls should be shown.
diff --git a/Sources/Plot/API/HTMLElements.swift b/Sources/Plot/API/HTMLElements.swift
index f4e600e..725f2cb 100644
--- a/Sources/Plot/API/HTMLElements.swift
+++ b/Sources/Plot/API/HTMLElements.swift
@@ -282,6 +282,12 @@ public extension Node where Context: HTML.BodyContext {
     static func noscript(_ nodes: Node<HTML.BodyContext>...) -> Node {
         .element(named: "noscript", nodes: nodes)
     }
+    
+    /// Add an `<object>` HTML element within the current context.
+    /// - parameter nodes: The element's attributes and child elements.
+    static func object(_ nodes: Node<HTML.ObjectContext>...) -> Node {
+        .element(named: "object", nodes: nodes)
+    }
 
     /// Add an `<ol>` HTML element within the current context.
     /// - parameter nodes: The element's attributes and child elements.
diff --git a/Tests/PlotTests/HTMLTests.swift b/Tests/PlotTests/HTMLTests.swift
index 51f56d7..abebd9f 100644
--- a/Tests/PlotTests/HTMLTests.swift
+++ b/Tests/PlotTests/HTMLTests.swift
@@ -666,6 +666,19 @@ final class HTMLTests: XCTestCase {
         </picture></body>
         """)
     }
+    
+    func  testObject() {
+        let html = HTML(.body(.object(
+            .data("vector.svg"),
+            .attribute(.type("image/svg+xml")),
+            .attribute(.width(200)),
+            .attribute(.height(100))
+        )))
+        
+        assertEqualHTMLContent(html, """
+        <body><object data="vector.svg" type="image/svg+xml" width="200" height="100"></object></body>
+        """)
+    }
 }
 
 extension HTMLTests {
@@ -732,7 +745,8 @@ extension HTMLTests {
             ("testDataAttributes", testDataAttributes),
             ("testSubresourceIntegrity", testSubresourceIntegrity),
             ("testComments", testComments),
-            ("testPicture", testPicture)
+            ("testPicture", testPicture),
+            ("testObject", testObject)
         ]
     }
 }

From 5436a72c17b21fa22a022bb58211399053b5dfed Mon Sep 17 00:00:00 2001
From: Alexander Zank <alex.zank@icloud.com>
Date: Thu, 4 Jun 2020 13:44:36 +0200
Subject: [PATCH 2/2] Remove redundant HTMLLinkableDataContext, refactor
 everything related to <object>, fix typo.

---
 Sources/Plot/API/HTML.swift           |  7 ++-----
 Sources/Plot/API/HTMLAttributes.swift | 20 ++++++++++----------
 Tests/PlotTests/HTMLTests.swift       |  2 +-
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/Sources/Plot/API/HTML.swift b/Sources/Plot/API/HTML.swift
index 1813713..3da4bbd 100644
--- a/Sources/Plot/API/HTML.swift
+++ b/Sources/Plot/API/HTML.swift
@@ -83,8 +83,8 @@ public extension HTML {
     enum ListContext: HTMLStylableContext {}
     /// The context within an HTML `<meta>` element.
     enum MetaContext: HTMLNamableContext {}
-    /// The contect within an HTM `<object>` element.
-    enum ObjectContext: HTMLDimensionContext, HTMLLinkableDataContext, HTMLTypeContext  {}
+    /// The contect within an HTML `<object>` element.
+    enum ObjectContext: HTMLDimensionContext, HTMLTypeContext  {}
     /// The context within an HTML `<option>` element.
     enum OptionContext: HTMLValueContext {}
     /// The context within an HTML `<picture>` element.
@@ -119,9 +119,6 @@ public protocol HTMLImageContainerContext: HTMLContext {}
 /// Context shared among all HTML elements that act as some form
 /// of link to an external resource, such as `<link>` or `<a>`.
 public protocol HTMLLinkableContext: HTMLContext {}
-/// Context shared among all HTML elements that support the `data` (URL)
-/// attribute, such as `<object>.`
-public protocol HTMLLinkableDataContext: HTMLContext {}
 /// Context shared among all HTML elements that enable media playback,
 /// such as `<audio>` and `<video>`.
 public protocol HTMLMediaContext: HTMLSourceListContext {}
diff --git a/Sources/Plot/API/HTMLAttributes.swift b/Sources/Plot/API/HTMLAttributes.swift
index d0e2b88..0b68e4a 100644
--- a/Sources/Plot/API/HTMLAttributes.swift
+++ b/Sources/Plot/API/HTMLAttributes.swift
@@ -179,7 +179,15 @@ public extension Node where Context: HTMLSourceContext {
     }
 }
 
-public extension Attribute where Context: HTMLLinkableDataContext {
+public extension Node where Context: HTMLMediaContext {
+    /// Assign whether the element's media controls should be enabled.
+    /// - parameter enableControls: Whether controls should be shown.
+    static func controls(_ enableControls: Bool) -> Node {
+        enableControls ? .attribute(named: "controls") : .empty
+    }
+}
+
+public extension Attribute where Context == HTML.ObjectContext {
     /// Assign an external resource to the element, using its `data` attribute.
     /// - parameter url: The data URL to assign.
     static func data(_ url: URLRepresentable) -> Attribute {
@@ -187,7 +195,7 @@ public extension Attribute where Context: HTMLLinkableDataContext {
     }
 }
 
-public extension Node where Context: HTMLLinkableDataContext {
+public extension Node where Context == HTML.ObjectContext {
     /// Assign an external resource to the element, using its `data` attribute.
     /// - parameter url: The data URL to assign.
     static func data(_ url: URLRepresentable) -> Node {
@@ -195,14 +203,6 @@ public extension Node where Context: HTMLLinkableDataContext {
     }
 }
 
-public extension Node where Context: HTMLMediaContext {
-    /// Assign whether the element's media controls should be enabled.
-    /// - parameter enableControls: Whether controls should be shown.
-    static func controls(_ enableControls: Bool) -> Node {
-        enableControls ? .attribute(named: "controls") : .empty
-    }
-}
-
 public extension Attribute where Context == HTML.AudioSourceContext {
     /// Assign a type to this audio source. See `HTMLAudioFormat` for more info.
     /// - parameter format: The audio format to assign.
diff --git a/Tests/PlotTests/HTMLTests.swift b/Tests/PlotTests/HTMLTests.swift
index abebd9f..86a5ea5 100644
--- a/Tests/PlotTests/HTMLTests.swift
+++ b/Tests/PlotTests/HTMLTests.swift
@@ -667,7 +667,7 @@ final class HTMLTests: XCTestCase {
         """)
     }
     
-    func  testObject() {
+    func testObject() {
         let html = HTML(.body(.object(
             .data("vector.svg"),
             .attribute(.type("image/svg+xml")),