Merge pull request #36 from bygri/if-blank-string

Proposal: #if(string) to not render if string is blank

Author: tanner0101

Resources/if-empty-string-test.leaf

@@ -0,0 +1 @@
+#if(name) { Hello, there! }

Sources/Leaf/Tag/Models/If.swift

@@ -21,8 +21,11 @@ public final class If: Tag {
         arguments: [Argument],
         value: Node?) -> Bool {
         guard let value = arguments.first?.value else { return false }
-        // Existence of bool, evaluate bool. Otherwise, not-nil returns true.
-        guard let bool = value.bool else { return true }
-        return bool
+        // Existence of bool, evaluate bool.
+        if let bool = value.bool { return bool }
+        // Empty string value returns false.
+        if value.string == "" { return false }
+        // Otherwise, not-nil returns true.
+        return true
     }
 }

Tests/LeafTests/IfTests.swift

@@ -9,6 +9,7 @@ class IfTests: XCTestCase {
         ("testBasicIfElse", testBasicIfElse),
         ("testNestedIfElse", testNestedIfElse),
         ("testIfThrow", testIfThrow),
+        ("testIfEmptyString", testIfEmptyString),
     ]
 
     func testBasicIf() throws {
@@ -78,4 +79,22 @@ class IfTests: XCTestCase {
             XCTFail("should throw")
         } catch If.Error.expectedSingleArgument {}
     }
+
+    func testIfEmptyString() throws {
+        let template = try stem.spawnLeaf(named: "if-empty-string-test")
+        do {
+            let context = try Node(node: ["name": "name"])
+            let loadable = Context(context)
+            let rendered = try stem.render(template, with: loadable).string
+            let expectation = "Hello, there!"
+            XCTAssert(rendered == expectation, "have: \(rendered), want: \(expectation)")
+        }
+        do {
+            let context = try Node(node: ["name": ""])
+            let loadable = Context(context)
+            let rendered = try stem.render(template, with: loadable).string
+            let expectation = ""
+            XCTAssert(rendered == expectation, "have: \(rendered), want: \(expectation)")
+        }
+    }
 }