Merge branch 'master' into 0.9

blakewatters · blakewatters · commit 1d50d07f251d · 2011-03-28T23:33:53.000-04:00
diff --git a/Code/ObjectMapping/RKObjectMapper.m b/Code/ObjectMapping/RKObjectMapper.m
@@ -172,7 +172,7 @@ - (void)mapObject:(NSObject<RKObjectMappable>*)model fromString:(NSString*)strin
 		return;
 	} else {
 		[NSException raise:@"Unable to map from requested string"
-					format:@"The object was serialized into a %@. A dictionary of elements was expected.", [object class]];
+					format:@"The object was serialized into a %@. A dictionary of elements was expected. (Object: %@) [Payload: %@]", [object class], object, string];
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ - (void)mapObject:(NSObject<RKObjectMappable>)model fromString:(NSString)strin`
`172`	`172`	`return;`
`173`	`173`	`} else {`
`174`	`174`	`[NSException raise:@"Unable to map from requested string"`
`175`		`- format:@"The object was serialized into a %@. A dictionary of elements was expected.", [object class]];`
	`175`	`+ format:@"The object was serialized into a %@. A dictionary of elements was expected. (Object: %@) [Payload: %@]", [object class], object, string];`
`176`	`176`	`}`
`177`	`177`	`}`
`178`	`178`