Unwind nil behavior introduced in previous commit and add test covera…

…ge for asObject behaviors.
jspooner · Jul 5, 2011 · 82ce444 · 82ce444
1 parent dddc4c3
commit 82ce444
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/Code/ObjectMapping/RKObjectMappingResult.m b/Code/ObjectMapping/RKObjectMappingResult.m
@@ -53,13 +53,12 @@ - (NSArray*)asCollection {
 - (id)asObject {
     NSArray* collection = [self asCollection];
     NSUInteger count = [collection count];
-    if (count > 1) {
-        RKLogWarning(@"Coerced object mapping result containing %d objects into singular result.", [collection count]);
-    } else if (count == 1) {
-        return [collection objectAtIndex:0];
+    if (count == 0) {
+        return nil;
     }
 
-    return nil;
+    if (count > 1) RKLogWarning(@"Coerced object mapping result containing %d objects into singular result.", count);
+    return [collection objectAtIndex:0];
 }
 
 - (NSError*)asError {

diff --git a/Specs/ObjectMapping/RKObjectMappingResultSpec.m b/Specs/ObjectMapping/RKObjectMappingResultSpec.m
@@ -29,4 +29,15 @@ - (void)itShouldNotCrashWhenAsObjectIsInvokedOnAnEmptyResult {
     }
 }
 
+- (void)itShouldReturnNilForAnEmptyCollectionCoercedToAsObject {
+    RKObjectMappingResult* result = [RKObjectMappingResult mappingResultWithDictionary:[NSDictionary dictionary]];
+    assertThat([result asObject], is(equalTo(nil)));
+}
+
+- (void)itShouldReturnTheFirstObjectInTheCollectionWhenCoercedToAsObject {
+    NSDictionary* dictionary = [NSDictionary dictionaryWithObjectsAndKeys:@"one", @"one", @"two", @"two", nil];
+    RKObjectMappingResult* result = [RKObjectMappingResult mappingResultWithDictionary:dictionary];
+    assertThat([result asObject], is(equalTo(@"one")));
+}
+
 @end