From 65725c89fbaa3e2e9ecc631910edc2f1edfe5965 Mon Sep 17 00:00:00 2001
From: Brian <mr.brianlane@gmail.com>
Date: Sat, 14 Dec 2024 17:26:18 -0500
Subject: [PATCH 1/2] Adds new alt attribute to produce alt text for images

---
 Sources/Elementary/HtmlAttributes.swift       |  6 +++
 .../AttributeRenderingTests.swift             | 49 ++++++++++++-------
 2 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/Sources/Elementary/HtmlAttributes.swift b/Sources/Elementary/HtmlAttributes.swift
index 18a2e00..32ff5b7 100644
--- a/Sources/Elementary/HtmlAttributes.swift
+++ b/Sources/Elementary/HtmlAttributes.swift
@@ -357,6 +357,12 @@ public extension HTMLAttributeValue {
     }
 }
 
+public extension HTMLAttribute where Tag == HTMLTag.img {
+    static func alt(_ value: String) -> Self {
+        HTMLAttribute(name: "alt", value: value)
+    }
+}
+
 public extension HTMLAttribute where Tag: HTMLTrait.Attributes.autocomplete {
     static func autocomplete(_ value: HTMLAttributeValue.AutoComplete) -> Self {
         HTMLAttribute(name: "autocomplete", value: value.rawValue)
diff --git a/Tests/ElementaryTests/AttributeRenderingTests.swift b/Tests/ElementaryTests/AttributeRenderingTests.swift
index af4946d..5f9451b 100644
--- a/Tests/ElementaryTests/AttributeRenderingTests.swift
+++ b/Tests/ElementaryTests/AttributeRenderingTests.swift
@@ -8,56 +8,56 @@ final class AttributeRenderingTests: XCTestCase {
             #"<p id="foo"></p>"#
         )
     }
-
+    
     func testRendersAttributes() async throws {
         try await HTMLAssertEqual(
             p(.id("foo"), .class("foo"), .hidden) {},
             #"<p id="foo" class="foo" hidden></p>"#
         )
     }
-
+    
     func testEscapesAttributeValues() async throws {
         try await HTMLAssertEqual(
             p(.id("foo\""), .class("&foo<>")) {},
             #"<p id="foo&quot;" class="&amp;foo<>"></p>"#
         )
     }
-
+    
     func testRendersAppliedAttributes() async throws {
         try await HTMLAssertEqual(
             p {}.attributes(.id("foo"), .class("bar")),
             #"<p id="foo" class="bar"></p>"#
         )
     }
-
+    
     func testKeepsAttributeOrder() async throws {
         try await HTMLAssertEqual(
             p(.id("1")) { "yo" }.attributes(.class("2")).attributes(.lang("de-AT")),
             #"<p id="1" class="2" lang="de-AT">yo</p>"#
         )
     }
-
+    
     func testAppliesConditionalAttributes() async throws {
         try await HTMLAssertEqual(
             img(.id("1")).attributes(.class("2"), .id("no"), when: false).attributes(.style("2"), when: true),
             #"<img id="1" style="2">"#
         )
     }
-
+    
     func testMergesClassAndStyleByDefault() async throws {
         try await HTMLAssertEqual(
             p(.class("first")) {}.attributes(.class("second"), .style("style1")).attributes(.style("style2")),
             #"<p class="first second" style="style1;style2"></p>"#
         )
     }
-
+    
     func testOverridesByDefault() async throws {
         try await HTMLAssertEqual(
             br(.id("foo")).attributes(.hidden, .id("bar")).attributes(.id("baz")),
             #"<br id="baz" hidden>"#
         )
     }
-
+    
     func testRespectsCustomMergeMode() async throws {
         try await HTMLAssertEqual(
             br(.id("1"), .data("bar", value: "baz"))
@@ -67,67 +67,82 @@ final class AttributeRenderingTests: XCTestCase {
             #"<br id="1-2" data-bar="bazbaq">"#
         )
     }
-
+    
     func testRendersMouseEventAttribute() async throws {
         try await HTMLAssertEqual(
             p(.on(.click, "doIt()")) {},
             #"<p onclick="doIt()"></p>"#
         )
     }
-
+    
     func testRendersKeyboardEventAttribute() async throws {
         try await HTMLAssertEqual(
             p(.on(.keydown, "doIt()")) {},
             #"<p onkeydown="doIt()"></p>"#
         )
     }
-
+    
     func testRendersFormEventAttribute() async throws {
         try await HTMLAssertEqual(
             p(.on(.blur, "doIt()")) {},
             #"<p onblur="doIt()"></p>"#
         )
     }
-
+    
     func testRendersMetaCharset() async throws {
         try await HTMLAssertEqual(
             meta(.charset(.utf8)),
             #"<meta charset="UTF-8">"#
         )
     }
-
+    
     func testRendersRequired() async throws {
         try await HTMLAssertEqual(
             input(.type(.text), .required),
             #"<input type="text" required>"#
         )
     }
-
+    
     func testRendersAttributesArray() async throws {
         try await HTMLAssertEqual(
             p(attributes: [.id("foo"), .class("foo"), .hidden]) {},
             #"<p id="foo" class="foo" hidden></p>"#
         )
     }
-
+    
     func testRendersAttributesArrayOnVoidElement() async throws {
         try await HTMLAssertEqual(
             input(attributes: [.type(.text), .required]),
             #"<input type="text" required>"#
         )
     }
-
+    
     func testRendersAppliedConditionalAttributesArray() async throws {
         try await HTMLAssertEqual(
             img(.id("1")).attributes(contentsOf: [.class("2"), .id("no")], when: false).attributes(contentsOf: [.style("2")], when: true),
             #"<img id="1" style="2">"#
         )
     }
-
+    
     func testRendersWidthAndHeightAttributes() async throws {
         try await HTMLAssertEqual(
             img(.width(100), .height(200)),
             #"<img width="100" height="200">"#
         )
     }
+    
+    func testRendersAltForImg() async throws {
+        try await HTMLAssertEqual(
+            img(.src("/path/to/dog.jpeg"), .alt("A happy dog"), .width(200), .height(200)),
+            #"<img src="/path/to/dog.jpeg" alt="A happy dog" width="200" height="200">"#
+        )
+    }
+    
+    func testAltFailsForNonImg() async throws {
+//      Un-comment to confirm non-img elements won't take an `alt` attr
+//        try await HTMLAssertEqual(
+//            div(.alt("A happy dog")),
+//            #"<div alt="A happy dog>"#
+//        )
+    }
 }

From 5ff19ee0a16bc5d16485e76115541ab722413d47 Mon Sep 17 00:00:00 2001
From: Simon Leeb <52261246+sliemeobn@users.noreply.github.com>
Date: Mon, 16 Dec 2024 09:49:35 +0100
Subject: [PATCH 2/2] removed non-test and formatting

---
 .../AttributeRenderingTests.swift             | 44 ++++++++-----------
 1 file changed, 18 insertions(+), 26 deletions(-)

diff --git a/Tests/ElementaryTests/AttributeRenderingTests.swift b/Tests/ElementaryTests/AttributeRenderingTests.swift
index 5f9451b..ac36d08 100644
--- a/Tests/ElementaryTests/AttributeRenderingTests.swift
+++ b/Tests/ElementaryTests/AttributeRenderingTests.swift
@@ -8,56 +8,56 @@ final class AttributeRenderingTests: XCTestCase {
             #"<p id="foo"></p>"#
         )
     }
-    
+
     func testRendersAttributes() async throws {
         try await HTMLAssertEqual(
             p(.id("foo"), .class("foo"), .hidden) {},
             #"<p id="foo" class="foo" hidden></p>"#
         )
     }
-    
+
     func testEscapesAttributeValues() async throws {
         try await HTMLAssertEqual(
             p(.id("foo\""), .class("&foo<>")) {},
             #"<p id="foo&quot;" class="&amp;foo<>"></p>"#
         )
     }
-    
+
     func testRendersAppliedAttributes() async throws {
         try await HTMLAssertEqual(
             p {}.attributes(.id("foo"), .class("bar")),
             #"<p id="foo" class="bar"></p>"#
         )
     }
-    
+
     func testKeepsAttributeOrder() async throws {
         try await HTMLAssertEqual(
             p(.id("1")) { "yo" }.attributes(.class("2")).attributes(.lang("de-AT")),
             #"<p id="1" class="2" lang="de-AT">yo</p>"#
         )
     }
-    
+
     func testAppliesConditionalAttributes() async throws {
         try await HTMLAssertEqual(
             img(.id("1")).attributes(.class("2"), .id("no"), when: false).attributes(.style("2"), when: true),
             #"<img id="1" style="2">"#
         )
     }
-    
+
     func testMergesClassAndStyleByDefault() async throws {
         try await HTMLAssertEqual(
             p(.class("first")) {}.attributes(.class("second"), .style("style1")).attributes(.style("style2")),
             #"<p class="first second" style="style1;style2"></p>"#
         )
     }
-    
+
     func testOverridesByDefault() async throws {
         try await HTMLAssertEqual(
             br(.id("foo")).attributes(.hidden, .id("bar")).attributes(.id("baz")),
             #"<br id="baz" hidden>"#
         )
     }
-    
+
     func testRespectsCustomMergeMode() async throws {
         try await HTMLAssertEqual(
             br(.id("1"), .data("bar", value: "baz"))
@@ -67,82 +67,74 @@ final class AttributeRenderingTests: XCTestCase {
             #"<br id="1-2" data-bar="bazbaq">"#
         )
     }
-    
+
     func testRendersMouseEventAttribute() async throws {
         try await HTMLAssertEqual(
             p(.on(.click, "doIt()")) {},
             #"<p onclick="doIt()"></p>"#
         )
     }
-    
+
     func testRendersKeyboardEventAttribute() async throws {
         try await HTMLAssertEqual(
             p(.on(.keydown, "doIt()")) {},
             #"<p onkeydown="doIt()"></p>"#
         )
     }
-    
+
     func testRendersFormEventAttribute() async throws {
         try await HTMLAssertEqual(
             p(.on(.blur, "doIt()")) {},
             #"<p onblur="doIt()"></p>"#
         )
     }
-    
+
     func testRendersMetaCharset() async throws {
         try await HTMLAssertEqual(
             meta(.charset(.utf8)),
             #"<meta charset="UTF-8">"#
         )
     }
-    
+
     func testRendersRequired() async throws {
         try await HTMLAssertEqual(
             input(.type(.text), .required),
             #"<input type="text" required>"#
         )
     }
-    
+
     func testRendersAttributesArray() async throws {
         try await HTMLAssertEqual(
             p(attributes: [.id("foo"), .class("foo"), .hidden]) {},
             #"<p id="foo" class="foo" hidden></p>"#
         )
     }
-    
+
     func testRendersAttributesArrayOnVoidElement() async throws {
         try await HTMLAssertEqual(
             input(attributes: [.type(.text), .required]),
             #"<input type="text" required>"#
         )
     }
-    
+
     func testRendersAppliedConditionalAttributesArray() async throws {
         try await HTMLAssertEqual(
             img(.id("1")).attributes(contentsOf: [.class("2"), .id("no")], when: false).attributes(contentsOf: [.style("2")], when: true),
             #"<img id="1" style="2">"#
         )
     }
-    
+
     func testRendersWidthAndHeightAttributes() async throws {
         try await HTMLAssertEqual(
             img(.width(100), .height(200)),
             #"<img width="100" height="200">"#
         )
     }
-    
+
     func testRendersAltForImg() async throws {
         try await HTMLAssertEqual(
             img(.src("/path/to/dog.jpeg"), .alt("A happy dog"), .width(200), .height(200)),
             #"<img src="/path/to/dog.jpeg" alt="A happy dog" width="200" height="200">"#
         )
     }
-    
-    func testAltFailsForNonImg() async throws {
-//      Un-comment to confirm non-img elements won't take an `alt` attr
-//        try await HTMLAssertEqual(
-//            div(.alt("A happy dog")),
-//            #"<div alt="A happy dog>"#
-//        )
-    }
 }