hardcode error response

vapor · Jan 27, 2016 · 14288ad · 14288ad
1 parent 7086bba
commit 14288ad
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/Sources/Response.swift b/Sources/Response.swift
@@ -162,11 +162,9 @@ public class Response {
     }
 
     public convenience init(error: String) {
-        let object: [String: Any] = [
-            "error": true,
-            "message": error
-        ]
-        try! self.init(status: .Error, json: object)
+        let text = "{\n\t\"error\": true,\n\t\"message\":\"\(error)\"}"
+        let data = [UInt8](text.utf8)
+        self.init(status: .Error, data: data, contentType: .Json)
     }
 
     public convenience init(status: Status, html: String) {

diff --git a/Sources/ResponseConvertible.swift b/Sources/ResponseConvertible.swift
@@ -13,6 +13,26 @@ extension String: ResponseConvertible {
 	}
 }
 
+extension Dictionary: ResponseConvertible {
+	public func response() -> Response {
+		do {
+            return try Response(status: .OK, json: self)    
+        } catch {
+            return Response(error: "JSON serialization error: \(error)")
+        }
+	}
+}
+
+extension Array: ResponseConvertible {
+	public func response() -> Response {
+		do {
+            return try Response(status: .OK, json: self)    
+        } catch {
+            return Response(error: "JSON serialization error: \(error)")
+        }
+	}
+}
+
 extension NSDictionary: ResponseConvertible {
 	public func response() -> Response {
 		do {