Merge pull request #66 from nodes-vapor/feature/update-sugar

Update Sugar

Package.swift

@@ -9,7 +9,7 @@ let package = Package(
     dependencies: [
         .package(url: "https://github.com/vapor/fluent.git", from: "3.0.0"),
         .package(url: "https://github.com/vapor/vapor.git", from: "3.0.0"),
-        .package(url: "https://github.com/nodes-vapor/sugar.git", from: "3.0.0-beta"),
+        .package(url: "https://github.com/nodes-vapor/sugar.git", from: "4.0.0-beta"),
     ],
     targets: [
         .target(name: "Paginator", dependencies: ["Fluent", "Vapor", "Sugar"]),

Sources/Paginator/Paginatable/ArrayPaginatable.swift

@@ -78,9 +78,8 @@ public extension TransformingQuery {
             count: count,
             on: req
         )
-        .flatMap { args -> Future<P> in
-            let (results, data) = args
-            return try self.transform(results).map { results in
+        .flatMap { results, data -> Future<P> in
+            try self.transform(results).map { results in
                 return try P(data: results, meta: data)
             }
         }

Sources/Paginator/Paginatable/QueryBuilderPaginatable.swift

@@ -19,7 +19,7 @@ public extension QueryBuilder {
         P.Object == Result,
         P.PaginatorMetaData == P.PaginatableMetaData
     {
-        return try self.paginate(count: self.count(), for: req)
+        return try paginate(count: count(), for: req)
     }
 
     public func paginate<P: Paginator>(
@@ -30,10 +30,7 @@ public extension QueryBuilder {
         P.Object == Result,
         P.PaginatorMetaData == P.PaginatableMetaData
     {
-        return try P.paginate(source: self, count: count, on: req).map { args -> P in
-            let (results, data) = args
-            return try P(data: results, meta: data)
-        }
+        return try P.paginate(source: self, count: count, on: req).map(P.init)
     }
 }
 
@@ -65,16 +62,10 @@ public extension TransformingQuery {
         TransformedResult == P.Object,
         P.PaginatorMetaData == P.PaginatableMetaData
     {
-        return try P.paginate(
-            source: self.source,
-            count: count,
-            on: req
-        )
-        .flatMap { args -> Future<P> in
-            let (results, data) = args
-            return try self.transform(results).map { results in
-                return try P(data: results, meta: data)
+        return try P
+            .paginate(source: self.source, count: count, on: req)
+            .flatMap { (results, metadata) -> Future<P> in
+                try self.transform(results).map { try P(data: $0, meta: metadata) }
             }
-        }
     }
 }