Fix #22 (extra lines)

Stencil/Node.swift

@@ -124,13 +124,16 @@ public class ForNode : NodeType {
 
       var emptyNodes = [NodeType]()
 
+      parser.eatNextCRLF() // If CRLF after {% for %}, eat it
       let forNodes = try parser.parse(until(["endfor", "empty"]))
 
       if let token = parser.nextToken() {
         if token.contents == "empty" {
+          parser.eatNextCRLF() // if CRLF after {% empty %}, eat it
           emptyNodes = try parser.parse(until(["endfor"]))
           parser.nextToken()
         }
+        parser.eatNextCRLF() // if CRLF after {% endfor %}, eat it
       } else {
         throw TemplateSyntaxError("`endfor` was not found.")
       }
@@ -172,13 +175,16 @@ public class IfNode : NodeType {
     var trueNodes = [NodeType]()
     var falseNodes = [NodeType]()
 
+    parser.eatNextCRLF() // If CRLF after {% if %}, eat it
     trueNodes = try parser.parse(until(["endif", "else"]))
 
     if let token = parser.nextToken() {
       if token.contents == "else" {
+        parser.eatNextCRLF() // If CRLF after {% else %}, eat it
         falseNodes = try parser.parse(until(["endif"]))
         parser.nextToken()
       }
+      parser.eatNextCRLF() // If CRLF after {% endif %}, eat it
     } else {
       throw TemplateSyntaxError("`endif` was not found.")
     }
@@ -191,13 +197,16 @@ public class IfNode : NodeType {
     var trueNodes = [NodeType]()
     var falseNodes = [NodeType]()
 
+    parser.eatNextCRLF() // If CRLF after {% ifnot %}, eat it
     falseNodes = try parser.parse(until(["endif", "else"]))
 
     if let token = parser.nextToken() {
       if token.contents == "else" {
+        parser.eatNextCRLF() // If CRLF after {% else %}, eat it
         trueNodes = try parser.parse(until(["endif"]))
         parser.nextToken()
       }
+      parser.eatNextCRLF() // If CRLF after {% endif %}, eat it
     } else {
       throw TemplateSyntaxError("`endif` was not found.")
     }

Stencil/Parser.swift

@@ -77,6 +77,13 @@ public class TokenParser {
     return nodes
   }
 
+  public func eatNextCRLF() {
+    if let token = tokens.first, case Token.Text(let text) = token where text.characters.first == "\n" {
+      let strippedText: String = String(text.characters.dropFirst())
+      tokens[0] = Token.Text(value: strippedText)
+    }
+  }
+
   public func nextToken() -> Token? {
     if tokens.count > 0 {
       return tokens.removeAtIndex(0)

StencilTests/NodeTests.swift

@@ -1,6 +1,6 @@
 import Foundation
 import XCTest
-import Stencil
+@testable import Stencil
 
 
 class ErrorNode : NodeType {
@@ -54,6 +54,28 @@ class RenderNodeTests: NodeTests {
 }
 
 class ForNodeTests: NodeTests {
+  func testParseFor() {
+    let tokens = [
+      Token.Block(value: "for item in items"),
+      .Text(value: "\nan item\n"),
+      .Block(value: "endfor"),
+      .Text(value: "\nthe end\n")
+    ]
+
+    let parser = TokenParser(tokens: tokens)
+    assertSuccess(try parser.parse()) { nodes in
+      XCTAssertEqual(nodes.count, 2)
+      let forNode = nodes[0] as! ForNode
+      XCTAssertEqual(forNode.variable, Variable("items"))
+      XCTAssertEqual(forNode.loopVariable, "item")
+      XCTAssertEqual(forNode.nodes.count, 1)
+      let loopNode = forNode.nodes[0] as? TextNode
+      XCTAssertEqual(loopNode?.text, "an item\n")
+      let textNode = nodes[1] as! TextNode
+      XCTAssertEqual(textNode.text, "the end\n")
+    }
+  }
+
   func testForNodeRender() {
     let node = ForNode(variable: "items", loopVariable: "item", nodes: [VariableNode(variable: "item")], emptyNodes:[])
     XCTAssertEqual(try? node.render(context), "123")
@@ -67,9 +89,9 @@ class IfNodeTests: NodeTests {
   func testParseIf() {
     let tokens = [
       Token.Block(value: "if value"),
-      Token.Text(value: "true"),
+      Token.Text(value: "\ntrue"),
       Token.Block(value: "else"),
-      Token.Text(value: "false"),
+      Token.Text(value: "\nfalse"),
       Token.Block(value: "endif")
     ]
 
@@ -91,9 +113,9 @@ class IfNodeTests: NodeTests {
   func testParseIfNot() {
     let tokens = [
       Token.Block(value: "ifnot value"),
-      Token.Text(value: "false"),
+      Token.Text(value: "\nfalse"),
       Token.Block(value: "else"),
-      Token.Text(value: "true"),
+      Token.Text(value: "\ntrue"),
       Token.Block(value: "endif")
     ]
 

StencilTests/StencilTests.swift

@@ -47,8 +47,7 @@ class StencilTests: XCTestCase {
     let fixture = "There are 2 articles.\n" +
       "\n" +
       "    - Migrating from OCUnit to XCTest by Kyle Fuller.\n" +
-      "    - Memory Management with ARC by Kyle Fuller.\n" +
-    "\n"
+      "    - Memory Management with ARC by Kyle Fuller.\n"
 
     XCTAssertEqual(result, fixture)
   }