Merge branch 'master' into docs

Author: satishbabariya

Sources/PostgREST/PostgrestBuilder.swift

@@ -35,7 +35,7 @@ public class PostgrestBuilder {
         }
 
         let session = URLSession.shared
-        let dataTask = session.dataTask(with: request, completionHandler: { [unowned self] (data, response, error) -> Void in
+        let dataTask = session.dataTask(with: request, completionHandler: { (data, response, error) -> Void in
             if let error = error {
                 completion(.failure(error))
                 return
@@ -52,8 +52,8 @@ public class PostgrestBuilder {
             }
 
             do {
-                try validate(data: data, response: response)
-                let response = try parse(data: data, response: response)
+                try Self.validate(data: data, response: response)
+                let response = try Self.parse(data: data, response: response, request: request)
                 completion(.success(response))
             } catch {
                 completion(.failure(error))
@@ -68,7 +68,7 @@ public class PostgrestBuilder {
     ///   - data: `Data` received from the server.
     ///   - response: `HTTPURLResponse` received from the server.
     /// - Throws: Throws `PostgrestError` if invalid JSON object.
-    private func validate(data: Data, response: HTTPURLResponse) throws {
+    private static func validate(data: Data, response: HTTPURLResponse) throws {
         if 200 ..< 300 ~= response.statusCode {
             return
         }
@@ -86,11 +86,11 @@ public class PostgrestBuilder {
     ///   - response: Response received from the server
     /// - Throws: Throws an `Error` if invalid JSON.
     /// - Returns: Returns a `PostgrestResponse`
-    private func parse(data: Data, response: HTTPURLResponse) throws -> PostgrestResponse {
+    private static func parse(data: Data, response: HTTPURLResponse, request: URLRequest) throws -> PostgrestResponse {
         var body: Any = data
         var count: Int?
 
-        if method == "HEAD" {
+        if request.httpMethod == "HEAD" {
             if let accept = response.allHeaderFields["Accept"] as? String, accept == "text/csv" {
                 body = data
             } else {
@@ -160,6 +160,9 @@ public class PostgrestBuilder {
         var request = URLRequest(url: url)
         request.httpMethod = method
         request.allHTTPHeaderFields = headers
+        if let body = body {
+            request.httpBody = try JSONSerialization.data(withJSONObject: body, options: [])
+        }
         return request
     }
 

Sources/PostgREST/PostgrestError.swift

@@ -7,16 +7,13 @@ public struct PostgrestError: Error {
     public var message: String
 
     init?(from dictionary: [String: Any]) {
-        guard let details = dictionary["details"] as? String,
-              let hint = dictionary["hint"] as? String,
-              let code = dictionary["code"] as? String,
-              let message = dictionary["message"] as? String
-        else {
+        guard let message = dictionary["message"] as? String else {
             return nil
         }
-        self.details = details
-        self.hint = hint
-        self.code = code
+
+        self.details = dictionary["details"] as? String
+        self.hint = dictionary["hint"] as? String
+        self.code = dictionary["code"] as? String
         self.message = message
     }
 

Tests/PostgRESTTests/BuildURLRequestTests.swift

@@ -22,6 +22,11 @@ final class BuildURLRequestTests: XCTestCase {
                     .select()
                     .like(column: "email", value: "%@supabase.co")
                     .buildURLRequest(head: false, count: nil)
+            },
+            TestCase(name: "insert new user") { client in
+                try client.form("users")
+                    .insert(values: ["email": "[email protected]"])
+                    .buildURLRequest(head: false, count: nil)
             }
         ]
 

Tests/PostgRESTTests/__Snapshots__/BuildURLRequestTests/testBuildURLRequest.insert-new-user.txt

@@ -0,0 +1,5 @@
+curl \
+	--request POST \
+	--header "Prefer: return=representation" \
+	--data "{\"email\":\"[email protected]\"}" \
+	"https://example.supabase.co/users"