Merge pull request #1 from vapor/test-cov

Test cov

Author: loganwright

.swift-version

@@ -0,0 +1 @@
+DEVELOPMENT-SNAPSHOT-2016-08-18-a

.travis.yml

@@ -0,0 +1,10 @@
+os:
+  - linux
+  - osx
+language: generic
+sudo: required
+dist: trusty
+osx_image: xcode8
+script:
+  - eval "$(curl -sL swift.vapor.sh/ci)"
+  - eval "$(curl -sL swift.vapor.sh/codecov)"

Sources/Leaf/Argument.swift

@@ -13,3 +13,14 @@ public enum Argument {
     */
     case constant(value: String)
 }
+
+extension Argument {
+    var value: Node? {
+        switch self {
+        case let .constant(value: value):
+            return .string(value)
+        case let .variable(path: _, value: value):
+            return value
+        }
+    }
+}

Sources/Leaf/Buffer/Buffer+Leaf.swift

@@ -3,7 +3,9 @@ extension BufferProtocol where Element == Byte {
         var comps: [Leaf.Component] = []
         while let next = try nextComponent() {
             if case let .tagTemplate(i) = next, i.isChain {
-                guard comps.count > 0 else { throw "invalid chain component w/o preceeding tagTemplate" }
+                guard comps.count > 0 else {
+                    throw ParseError.expectedLeadingTemplate(have: nil)
+                }
                 while let last = comps.last {
                     var loop = true
 
@@ -30,16 +32,12 @@ extension BufferProtocol where Element == Byte {
 
     mutating func nextComponent() throws -> Leaf.Component? {
         guard let token = current else { return nil }
-        if token == TOKEN {
-            let tagTemplate = try extractInstruction()
-            return .tagTemplate(tagTemplate)
-        } else {
-            let raw = extractUntil { $0 == TOKEN }
-            return .raw(raw)
-        }
+        guard token == TOKEN else { return .raw(extractUntil { $0 == TOKEN }) }
+        let tagTemplate = try extractInstruction()
+        return .tagTemplate(tagTemplate)
     }
 
-    mutating func extractUntil(_ until: @noescape (Element) -> Bool) -> [Element] {
+    mutating func extractUntil(_ until: (Element) -> Bool) -> [Element] {
         var collection = Bytes()
         if let current = current {
             guard !until(current) else { return [] }
@@ -53,6 +51,14 @@ extension BufferProtocol where Element == Byte {
     }
 }
 
+enum ParseError: LeafError {
+    case tagTemplateNotFound(name: String)
+    case missingBodyOpener(expected: String, have: String?)
+    case missingBodyCloser(expected: String)
+    case expectedOpenParenthesis
+    case expectedLeadingTemplate(have: Leaf.Component?)
+}
+
 /*
  Syntax
 
@@ -77,11 +83,11 @@ extension BufferProtocol where Element == Byte {
     }
 
     mutating func extractInstructionName() throws -> String {
-        // can't extract section because of @@
-        guard current == TOKEN else { throw "tagTemplate name must lead with token" }
         moveForward() // drop initial token from name. a secondary token implies chain
         let name = extractUntil { $0 == .openParenthesis }
-        guard current == .openParenthesis else { throw "tagTemplate names must be alphanumeric and terminated with '('" }
+        guard current == .openParenthesis else {
+            throw ParseError.expectedOpenParenthesis
+        }
         return name.string
     }
 
@@ -98,7 +104,8 @@ extension BufferProtocol where Element == Byte {
 
     mutating func extractSection(opensWith opener: Byte, closesWith closer: Byte) throws -> Bytes {
         guard current ==  opener else {
-            throw "invalid body, missing opener: \([opener].string)"
+            let have = current.flatMap { [$0] }?.string
+            throw ParseError.missingBodyOpener(expected: [opener].string, have: have)
         }
 
         var subBodies = 0
@@ -112,7 +119,7 @@ extension BufferProtocol where Element == Byte {
         }
 
         guard current == closer else {
-            throw "invalid body, missing closer: \([closer].string), got \([current])"
+            throw ParseError.missingBodyCloser(expected: [closer].string)
         }
 
         return body

Sources/Leaf/Buffer/Buffer.swift

@@ -7,7 +7,7 @@ struct Buffer<T>: BufferProtocol {
 
     private var buffer: IndexingIterator<[T]>
 
-    init<S: Sequence where S.Iterator.Element == T>(_ sequence: S) {
+    init<S: Sequence>(_ sequence: S) where S.Iterator.Element == T {
         buffer = sequence.array.makeIterator()
         // queue up first
         moveForward() // sets next

Sources/Leaf/Context.swift

@@ -36,16 +36,12 @@ public final class Context {
 
     // TODO: Subscripts
 
-    public func get(key: String) -> Node? {
-        return queue.lazy.flatMap { $0[key] } .first
-    }
-
-    public func get(path: String) -> Node? {
+    subscript(path: String) -> Node? {
         let components = path.components(separatedBy: ".")
-        return get(path: components)
+        return self[components]
     }
 
-    public func get(path: [String]) -> Node? {
+    subscript(path: [String]) -> Node? {
         for node in queue {
             guard let value = node[path] else { continue }
             return value
@@ -62,10 +58,3 @@ public final class Context {
         return queue.removeTip()
     }
 }
-
-
-extension Context {
-    internal func renderedSelf() throws -> Bytes? {
-        return try get(path: "self")?.rendered()
-    }
-}

Sources/Leaf/Leaf.swift

@@ -29,12 +29,16 @@ public final class Leaf {
 
 extension Leaf: CustomStringConvertible {
     public var description: String {
-        let components = self.components.map { $0.description } .joined(separator: ", ")
-        return "Leaf: " + components
+        let components = self.components.map { $0.description } .joined(separator: "\n")
+        return "Leaf: \n" + components
     }
 }
 
 extension Leaf: Equatable {}
 public func == (lhs: Leaf, rhs: Leaf) -> Bool {
-    return lhs === rhs
+    for (l, r) in zip(lhs.components, rhs.components) where l != r {
+        return false
+    }
+
+    return lhs.raw == rhs.raw
 }

Sources/Leaf/LeafComponent.swift

@@ -10,7 +10,7 @@ extension Leaf.Component {
     internal mutating func addToChain(_ chainedInstruction: TagTemplate) throws {
         switch self {
         case .raw(_):
-            throw "unable to chain \(chainedInstruction) w/o preceding tagTemplate"
+            throw ParseError.expectedLeadingTemplate(have: self)
         case let .tagTemplate(current):
             self = .chain([current, chainedInstruction])
         case let .chain(chain):
@@ -39,6 +39,8 @@ public func == (lhs: Leaf.Component, rhs: Leaf.Component) -> Bool {
         return l == r
     case let (.tagTemplate(l), .tagTemplate(r)):
         return l == r
+    case let (.chain(l), .chain(r)):
+        return l == r
     default:
         return false
     }

Sources/Leaf/LeafError.swift

@@ -1,2 +1,4 @@
 // TODO: Real Errors
 extension String: Swift.Error {}
+protocol LeafError: Swift.Error {}
+

Sources/Leaf/Link.swift

@@ -56,6 +56,7 @@ public final class Link<Value> { // TODO: Rename Context
     /**
         Sever the child of this Link. This will also lose all children of that link.
     */
+    @discardableResult
     public func dropChild() -> Link? {
         let child = self.child
         self.child = nil
@@ -75,8 +76,8 @@ public final class Link<Value> { // TODO: Rename Context
     }
 
     /**
-        Adds a new, or replaces the existing child associated with this link
-    */
+     Adds a new, or replaces the existing child associated with this link
+     */
     public func addChild(_ link: Link?) {
         if let existingChild = child { existingChild.parent = nil }
         self.child = link