Merge pull request #54 from vapor/context-dictionary

fix context-dctionary bug
vapor-community · Mar 3, 2017 · 93d7636 · 93d7636
2 parents 68f7785 + f82f79a
commit 93d7636
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/Sources/Node/Core/Context.swift b/Sources/Node/Core/Context.swift
@@ -6,5 +6,11 @@
 */
 public protocol Context {}
 
-extension Array: Context {}
-extension Dictionary: Context {}
+public final class ObjectContext<K: Hashable, V>: Context {
+    public let object: [K: V]
+    public init(_ object: [K: V]) {
+        self.object = object
+    }
+}
+
+public let emptyContext = ObjectContext<String, Int>([:])
diff --git a/Sources/Node/Core/Node.swift b/Sources/Node/Core/Node.swift
@@ -1,10 +1,12 @@
 public struct Node: StructuredDataWrapper {
+    public static let defaultContext = emptyContext
+
     public var wrapped: StructuredData
     public var context: Context
 
     public init(_ wrapped: StructuredData, in context: Context?) {
         self.wrapped = wrapped
-        self.context = context ?? [String: Int]()
+        self.context = context ?? emptyContext
     }
 }
 

diff --git a/Tests/NodeTests/NodeBackedTests.swift b/Tests/NodeTests/NodeBackedTests.swift
@@ -6,7 +6,7 @@ struct JSON: StructuredDataWrapper {
     var context: Context
     init(_ wrapped: StructuredData, in context: Context?) {
         self.wrapped = wrapped
-        self.context = context ?? [String: Int]()
+        self.context = context ?? emptyContext
     }
 }
 

diff --git a/Tests/NodeTests/SequenceConvertibleTests.swift b/Tests/NodeTests/SequenceConvertibleTests.swift
@@ -68,18 +68,18 @@ class SequenceConvertibleTests: XCTestCase {
         XCTAssertNil(foo1.contextMakeNode)
         XCTAssertNil(foo2.contextMakeNode)
 
-        let context = ["isContext": true]
+        let context = ObjectContext(["isContext": true])
 
         let _ = try [foo1, foo2].makeNode(in: context)
 
-        guard let foo1Context = foo1.contextMakeNode as? [String: Bool], 
-            let foo2Context = foo1.contextMakeNode as? [String: Bool] else {
+        guard let foo1Context = foo1.contextMakeNode as? ObjectContext<String, Bool>,
+            let foo2Context = foo1.contextMakeNode as? ObjectContext<String, Bool> else {
             XCTFail()
             return
         }
 
-        XCTAssert(foo1Context == context)
-        XCTAssert(foo2Context == context)
+        XCTAssert(foo1Context === context)
+        XCTAssert(foo2Context === context)
 
     }