From c4899d5690c2fc328a3bbb2947b053826f0a3fc2 Mon Sep 17 00:00:00 2001 From: Logan Wright Date: Fri, 24 Feb 2017 12:38:31 +0100 Subject: [PATCH 1/2] condense tester imports --- Sources/FluentTester/Atom.swift | 2 -- Sources/FluentTester/Compound.swift | 2 -- Sources/FluentTester/Student.swift | 2 -- Sources/FluentTester/Tester+InsertAndFind.swift | 2 -- Sources/FluentTester/Tester+PivotsAndRelations.swift | 2 -- Sources/FluentTester/Tester+Schema.swift | 2 -- Sources/FluentTester/Tester+Utilities.swift | 2 -- Sources/FluentTester/Tester.swift | 4 +++- 8 files changed, 3 insertions(+), 15 deletions(-) diff --git a/Sources/FluentTester/Atom.swift b/Sources/FluentTester/Atom.swift index 1ecd7d78..2fabbbfb 100644 --- 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 diff --git a/Sources/FluentTester/Compound.swift b/Sources/FluentTester/Compound.swift index a7627fff..b6796f75 100644 --- 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() diff --git a/Sources/FluentTester/Student.swift b/Sources/FluentTester/Student.swift index 21d06236..b6eef1b3 100644 --- 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 diff --git a/Sources/FluentTester/Tester+InsertAndFind.swift b/Sources/FluentTester/Tester+InsertAndFind.swift index e63632bc..7b549d78 100644 --- 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 index e2ddfe66..ed683567 100644 --- 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 index 4e4d26ac..e664a823 100644 --- 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 index 01a267e1..a0a043b4 100644 --- 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 index bc2c207c..8f0585d4 100644 --- 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 From 355c6d4abe49cad2df128683aae6156e180433c5 Mon Sep 17 00:00:00 2001 From: Logan Wright Date: Fri, 24 Feb 2017 12:55:22 +0100 Subject: [PATCH 2/2] update deps and prep for pods --- Sources/Fluent/Pivot/Pivot.swift | 6 +++--- Sources/Fluent/Preparation/Migration.swift | 4 ++-- Sources/Fluent/Utilities/Fluent+Node.swift | 6 +++++- Sources/FluentTester/Atom.swift | 8 ++++---- Sources/FluentTester/Compound.swift | 4 ++-- Sources/FluentTester/Student.swift | 12 ++++++------ Tests/FluentTests/ModelTests.swift | 2 +- Tests/FluentTests/PreparationTests.swift | 6 +++--- Tests/FluentTests/Utilities/Atom.swift | 6 +++--- Tests/FluentTests/Utilities/Compound.swift | 4 ++-- Tests/FluentTests/Utilities/CustomIdKey.swift | 4 ++-- .../Utilities/CustomIdentifiedThing.swift | 2 +- .../Utilities/StringIdentifiedThing.swift | 2 +- Tests/FluentTests/Utilities/User.swift | 6 +++--- 14 files changed, 38 insertions(+), 34 deletions(-) diff --git a/Sources/Fluent/Pivot/Pivot.swift b/Sources/Fluent/Pivot/Pivot.swift index c60ed6c9..23e48199 100644 --- 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 index 4d3667e0..3f8cfda3 100644 --- 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 index d515d5cd..1d097625 100644 --- 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 index 2fabbbfb..b3b5d1d2 100644 --- a/Sources/FluentTester/Atom.swift +++ b/Sources/FluentTester/Atom.swift @@ -13,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 index b6796f75..9278d7ab 100644 --- a/Sources/FluentTester/Compound.swift +++ b/Sources/FluentTester/Compound.swift @@ -8,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 index b6eef1b3..0b95318b 100644 --- a/Sources/FluentTester/Student.swift +++ b/Sources/FluentTester/Student.swift @@ -16,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/Tests/FluentTests/ModelTests.swift b/Tests/FluentTests/ModelTests.swift index 05d37331..78ba91f3 100644 --- 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 index c194e9c1..c74e1395 100644 --- 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 index b6be51aa..ff4e21ef 100644 --- 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 index e60c12de..2c3cadc3 100644 --- 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 index db26b94f..cb0d78f2 100644 --- 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 index 2a085a07..bcddc0d3 100644 --- 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 index 6b63fdcb..bfe723fa 100644 --- 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 index 55733de1..606bf5ff 100644 --- 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 {