Merge branch 'master' of https://github.com/Hearst-DD/ObjectMapper

tristanhimmelman · tristanhimmelman · commit 3cab668eccaa · 2020-03-15T20:31:33.000-04:00
diff --git a/Sources/Mappable.swift b/Sources/Mappable.swift
@@ -46,7 +46,7 @@ public protocol StaticMappable: BaseMappable {
 	static func objectForMapping(map: Map) -> BaseMappable?
 }
 
-public extension BaseMappable {
+public extension Mappable {
 	
 	/// Initializes object from a JSON String
 	init?(JSONString: String, context: MapContext? = nil) {
@@ -65,12 +65,15 @@ public extension BaseMappable {
 			return nil
 		}
 	}
-	
+}
+
+public extension BaseMappable {
+
 	/// Returns the JSON Dictionary for the object
 	func toJSON() -> [String: Any] {
 		return Mapper().toJSON(self)
 	}
-	
+
 	/// Returns the JSON String for the object
 	func toJSONString(prettyPrint: Bool = false) -> String? {
 		return Mapper().toJSONString(self, prettyPrint: prettyPrint)

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public protocol StaticMappable: BaseMappable {`
`46`	`46`	`static func objectForMapping(map: Map) -> BaseMappable?`
`47`	`47`	`}`
`48`	`48`
`49`		`-public extension BaseMappable {`
	`49`	`+public extension Mappable {`
`50`	`50`
`51`	`51`	`/// Initializes object from a JSON String`
`52`	`52`	`init?(JSONString: String, context: MapContext? = nil) {`
`@@ -65,12 +65,15 @@ public extension BaseMappable {`
`65`	`65`	`return nil`
`66`	`66`	`}`
`67`	`67`	`}`
`68`		`-`
	`68`	`+}`
	`69`	`+`
	`70`	`+public extension BaseMappable {`
	`71`	`+`
`69`	`72`	`/// Returns the JSON Dictionary for the object`
`70`	`73`	`func toJSON() -> [String: Any] {`
`71`	`74`	`return Mapper().toJSON(self)`
`72`	`75`	`}`
`73`		`-`
	`76`	`+`
`74`	`77`	`/// Returns the JSON String for the object`
`75`	`78`	`func toJSONString(prettyPrint: Bool = false) -> String? {`
`76`	`79`	`return Mapper().toJSONString(self, prettyPrint: prettyPrint)`