Add mapDictionary overload to Mapper that takes an AnyObject?

Author: ikesyo

ObjectMapper/Core/FromJSON.swift

@@ -85,7 +85,7 @@ class FromJSON<CollectionType> {
 
 	/// Dctionary containing Mappable objects
 	func objectDictionary<N: Mappable>(inout field: Dictionary<String, N>, object: AnyObject?) {
-		let parsedObjects: Dictionary<String, N>? = parseObjectDictionary(object)
+		let parsedObjects = Mapper<N>().mapDictionary(object)
 
 		if let objects = parsedObjects {
 			field = objects
@@ -94,22 +94,11 @@ class FromJSON<CollectionType> {
 
 	/// Optional dictionary containing Mappable objects
 	func optionalObjectDictionary<N: Mappable>(inout field: Dictionary<String, N>?, object: AnyObject?) {
-		field = parseObjectDictionary(object)
+		field = Mapper<N>().mapDictionary(object)
 	}
 
 	/// Implicitly unwrapped Dictionary containing Mappable objects
 	func optionalObjectDictionary<N: Mappable>(inout field: Dictionary<String, N>!, object: AnyObject?) {
-		field = parseObjectDictionary(object)
-	}
-	
-	/**
-	* Parses a JSON Dictionary of dictionary into a Dictionay of Mappable objects
-	*/
-	private func parseObjectDictionary<N: Mappable>(object: AnyObject?) -> Dictionary<String, N>? {
-		if let dictionary = object as? [String : [String : AnyObject]] {
-			return Mapper<N>().mapDictionary(dictionary)
-		}
-
-		return nil
+		field = Mapper<N>().mapDictionary(object)
 	}
 }

ObjectMapper/Core/Mapper.swift

@@ -162,6 +162,16 @@ public final class Mapper<N: Mappable> {
 		}		
 	}
 
+	/// Maps a JSON object to a dictionary of Mappable objects if it is a JSON
+	/// dictionary of dictionaries, or returns nil.
+	public func mapDictionary(JSON: AnyObject?) -> [String : N]? {
+		if let JSONDictionary = JSON as? [String : [String : AnyObject]] {
+			return mapDictionary(JSONDictionary)
+		}
+
+		return nil
+	}
+
 	/**
 	* Maps a JSON dictionary of dictionaries to a dictionary of objects that conform to Mappable.
 	*/