Merge branch 'master' of github.com:srdanrasic/JSONCodable

srdanrasic · srdanrasic · commit 1cf873d1266a · 2015-11-08T17:30:17.000+01:00
diff --git a/JSONCodable/JSONDecodable.swift b/JSONCodable/JSONDecodable.swift
@@ -65,7 +65,7 @@ public extension Array where Element: JSONDecodable {
     init(JSONArray: [AnyObject]) throws {
         self.init(try JSONArray.flatMap {
             guard let json = $0 as? [String : AnyObject] else {
-                throw JSONDecodableError.DictionaryTypeExpectedError(key: "[inarray]", elementType: $0.dynamicType)
+                throw JSONDecodableError.DictionaryTypeExpectedError(key: "n/a", elementType: $0.dynamicType)
             }
             return try Element(object: json)
             })
@@ -277,4 +277,4 @@ public class JSONDecoder {
         }
         return result
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public extension Array where Element: JSONDecodable {`
`65`	`65`	`init(JSONArray: [AnyObject]) throws {`
`66`	`66`	`self.init(try JSONArray.flatMap {`
`67`	`67`	`guard let json = $0 as? [String : AnyObject] else {`
`68`		`- throw JSONDecodableError.DictionaryTypeExpectedError(key: "[inarray]", elementType: $0.dynamicType)`
	`68`	`+ throw JSONDecodableError.DictionaryTypeExpectedError(key: "n/a", elementType: $0.dynamicType)`
`69`	`69`	`}`
`70`	`70`	`return try Element(object: json)`
`71`	`71`	`})`
`@@ -277,4 +277,4 @@ public class JSONDecoder {`
`277`	`277`	`}`
`278`	`278`	`return result`
`279`	`279`	`}`
`280`		`-}`
	`280`	`+}`