Merge pull request #195 from vapor/updates

Updates
vapor · Feb 24, 2017 · 8ce3359 · 8ce3359
2 parents bdc4579 + 355c6d4
commit 8ce3359
Show file tree

Hide file tree

Showing 19 changed files with 41 additions and 49 deletions.
diff --git a/Sources/Fluent/Pivot/Pivot.swift b/Sources/Fluent/Pivot/Pivot.swift
@@ -48,10 +48,10 @@ public final class Pivot<
     }
 
     public init(node: Node, in context: Context) throws {
-        leftId = try node.extract(Left.foreignIdKey)
-        rightId = try node.extract(Right.foreignIdKey)
+        leftId = try node.get(Left.foreignIdKey)
+        rightId = try node.get(Right.foreignIdKey)
 
-        id = try node.extract(idKey)
+        id = try node.get(idKey)
     }
 
     public func makeNode(context: Context) throws -> Node {

diff --git a/Sources/Fluent/Preparation/Migration.swift b/Sources/Fluent/Preparation/Migration.swift
@@ -8,8 +8,8 @@ final class Migration: Entity {
     }
 
     init(node: Node, in context: Context) throws {
-        name = try node.extract("name")
-        id = try node.extract(idKey)
+        name = try node.get("name")
+        id = try node.get(idKey)
     }
 
     func makeNode(context: Context = EmptyNode) throws -> Node {

diff --git a/Sources/Fluent/Utilities/Fluent+Node.swift b/Sources/Fluent/Utilities/Fluent+Node.swift
@@ -1,4 +1,8 @@
-@_exported import Node
+#if COCOAPODS
+    @_exported import NodeCocoapods
+#else
+    @_exported import Node
+#endif
 
 public final class DatabaseContext: Context {
     public let database: Database

diff --git a/Sources/FluentTester/Atom.swift b/Sources/FluentTester/Atom.swift
@@ -1,5 +1,3 @@
-import Fluent
-
 public final class Atom: Entity {
     public var name: String
     public var protons: Int
@@ -15,11 +13,11 @@ public final class Atom: Entity {
     }
 
     public init(node: Node, in context: Context) throws {
-        name = try node.extract("name")
-        protons = try node.extract("protons")
-        weight = try node.extract("weight")
+        name = try node.get("name")
+        protons = try node.get("protons")
+        weight = try node.get("weight")
 
-        id = try node.extract(idKey)
+        id = try node.get(idKey)
     }
 
     public func makeNode(context: Context) throws -> Node {

diff --git a/Sources/FluentTester/Compound.swift b/Sources/FluentTester/Compound.swift
@@ -1,5 +1,3 @@
-import Fluent
-
 public final class Compound: Entity {
     public var name: String
     public let storage = Storage()
@@ -10,8 +8,8 @@ public final class Compound: Entity {
     }
 
     public init(node: Node, in context: Context) throws {
-        name = try node.extract("name")
-        id = try node.extract(idKey)
+        name = try node.get("name")
+        id = try node.get(idKey)
     }
 
     public func makeNode(context: Context) throws -> Node {

diff --git a/Sources/FluentTester/Student.swift b/Sources/FluentTester/Student.swift
@@ -1,5 +1,3 @@
-import Fluent
-
 final class Student: Entity {
     var name: String
     var age: Int
@@ -18,13 +16,13 @@ final class Student: Entity {
     }
 
     init(node: Node, in context: Context) throws {
-        name = try node.extract("name")
-        age = try node.extract("age")
-        ssn = try node.extract("ssn")
-        donor = try node.extract("donor")
-        meta = try node.extract("meta")
+        name = try node.get("name")
+        age = try node.get("age")
+        ssn = try node.get("ssn")
+        donor = try node.get("donor")
+        meta = try node.get("meta")
 
-        id = try node.extract(idKey)
+        id = try node.get(idKey)
     }
 
     func makeNode(context: Context) throws -> Node {

diff --git a/Sources/FluentTester/Tester+InsertAndFind.swift b/Sources/FluentTester/Tester+InsertAndFind.swift
@@ -1,5 +1,3 @@
-import Fluent
-
 extension Tester {
     public func testInsertAndFind() throws {
         Atom.database = database

diff --git a/Sources/FluentTester/Tester+PivotsAndRelations.swift b/Sources/FluentTester/Tester+PivotsAndRelations.swift
@@ -1,5 +1,3 @@
-import Fluent
-
 extension Tester {
     func setup() {
         Atom.database = database

diff --git a/Sources/FluentTester/Tester+Schema.swift b/Sources/FluentTester/Tester+Schema.swift
@@ -1,5 +1,3 @@
-import Fluent
-
 extension Tester {
     public func testSchema() throws {
         Student.database = database

diff --git a/Sources/FluentTester/Tester+Utilities.swift b/Sources/FluentTester/Tester+Utilities.swift
@@ -1,5 +1,3 @@
-import Fluent
-
 extension Tester {
     public func test(_ f: () throws -> (), _ name: String) throws {
         do {

diff --git a/Sources/FluentTester/Tester.swift b/Sources/FluentTester/Tester.swift
@@ -1,4 +1,6 @@
-import Fluent
+#if !COCOAPODS
+    @_exported import Fluent
+#endif
 
 public final class Tester {
     public let database: Database

diff --git a/Tests/FluentTests/ModelTests.swift b/Tests/FluentTests/ModelTests.swift
@@ -80,7 +80,7 @@ class ModelTests: XCTestCase {
 
             init() {}
             init(node: Node, in context: Context) throws {
-                id = try node.extract(idKey)
+                id = try node.get(idKey)
             }
             func makeNode(context: Context) throws -> Node {
                 return try Node(node: [idKey: id])

diff --git a/Tests/FluentTests/PreparationTests.swift b/Tests/FluentTests/PreparationTests.swift
@@ -142,9 +142,9 @@ final class TestModel: Entity {
     let storage = Storage()
 
     init(node: Node, in context: Context) throws {
-        name = try node.extract("name")
-        age = try node.extract("age")
-        id = try node.extract(idKey)
+        name = try node.get("name")
+        age = try node.get("age")
+        id = try node.get(idKey)
     }
 
     func makeNode(context: Context = EmptyNode) throws -> Node {

diff --git a/Tests/FluentTests/Utilities/Atom.swift b/Tests/FluentTests/Utilities/Atom.swift
@@ -12,10 +12,10 @@ final class Atom: Entity {
     }
 
     init(node: Node, in context: Context) throws {
-        name = try node.extract("name")
-        groupId = try node.extract("group_id")
+        name = try node.get("name")
+        groupId = try node.get("group_id")
 
-        id = try node.extract(idKey)
+        id = try node.get(idKey)
     }
 
     func makeNode(context: Context = EmptyNode) throws -> Node {

diff --git a/Tests/FluentTests/Utilities/Compound.swift b/Tests/FluentTests/Utilities/Compound.swift
@@ -9,8 +9,8 @@ final class Compound: Entity {
     }
 
     init(node: Node, in context: Context) throws {
-        name = try node.extract("name")
-        id = try node.extract(idKey)
+        name = try node.get("name")
+        id = try node.get(idKey)
     }
 
     func makeNode(context: Context = EmptyNode) throws -> Node {

diff --git a/Tests/FluentTests/Utilities/CustomIdKey.swift b/Tests/FluentTests/Utilities/CustomIdKey.swift
@@ -25,8 +25,8 @@ final class CustomIdKey: Entity {
     }
 
     init(node: Node, in context: Context) throws {
-        label = try node.extract("label")
-        id = try node.extract(idKey)
+        label = try node.get("label")
+        id = try node.get(idKey)
     }
 
     func makeNode(context: Context = EmptyNode) throws -> Node {

diff --git a/Tests/FluentTests/Utilities/CustomIdentifiedThing.swift b/Tests/FluentTests/Utilities/CustomIdentifiedThing.swift
@@ -14,7 +14,7 @@ final class CustomIdentifiedThing: Entity {
     static let idKey = "#id"
 
     init(node: Node, in context: Context) throws {
-        id = try node.extract(idKey)
+        id = try node.get(idKey)
     }
 
     func makeNode(context: Context = EmptyNode) throws -> Node {

diff --git a/Tests/FluentTests/Utilities/StringIdentifiedThing.swift b/Tests/FluentTests/Utilities/StringIdentifiedThing.swift
@@ -15,7 +15,7 @@ final class StringIdentifiedThing: Entity {
     let storage = Storage()
 
     init(node: Node, in context: Context) throws {
-        id = try node.extract(idKey)
+        id = try node.get(idKey)
     }
 
     func makeNode(context: Context = EmptyNode) throws -> Node {

diff --git a/Tests/FluentTests/Utilities/User.swift b/Tests/FluentTests/Utilities/User.swift
@@ -24,9 +24,9 @@ final class User: Entity {
     }
 
     init(node: Node, in context: Context) throws {
-        name = try node.extract("name")
-        email = try node.extract("email")
-        id = try node.extract(idKey)
+        name = try node.get("name")
+        email = try node.get("email")
+        id = try node.get(idKey)
     }
 
     func makeNode(context: Context = EmptyNode) throws -> Node {