Store new objects by lookupValue instead of primaryKeyValue. This avo…

…ids creation of duplicated objects the are manufactured by findOrCreateInstanceOfEntity:
jwang · Jul 8, 2011 · 40eb842 · 40eb842
1 parent e31061b
commit 40eb842
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/Code/CoreData/RKManagedObjectStore.m b/Code/CoreData/RKManagedObjectStore.m
@@ -349,7 +349,7 @@ - (NSManagedObject*)findOrCreateInstanceOfEntity:(NSEntityDescription*)entity wi
 
     if (object == nil) {
         object = [[[NSManagedObject alloc] initWithEntity:entity insertIntoManagedObjectContext:self.managedObjectContext] autorelease];
-        [dictionary setObject:object forKey:primaryKeyValue];
+        [dictionary setObject:object forKey:lookupValue];
     }
 
 	return object;

diff --git a/RestKit.xcodeproj/xcshareddata/xcschemes/UISpec.xcscheme b/RestKit.xcodeproj/xcshareddata/xcschemes/UISpec.xcscheme
@@ -62,7 +62,7 @@
       <EnvironmentVariables>
          <EnvironmentVariable
             key = "UISPEC_SPEC"
-            value = "RKManagedObjectLoaderSpec"
+            value = "RKObjectMappingNextGenSpec"
             isEnabled = "NO">
          </EnvironmentVariable>
          <EnvironmentVariable
@@ -72,7 +72,7 @@
          </EnvironmentVariable>
          <EnvironmentVariable
             key = "UISPEC_EXAMPLE"
-            value = "itShouldDeleteObjectFromLocalStoreOnDELETE"
+            value = "itShouldRegisterRailsIdiomaticObjects"
             isEnabled = "NO">
          </EnvironmentVariable>
          <EnvironmentVariable
@@ -87,12 +87,12 @@
          </EnvironmentVariable>
          <EnvironmentVariable
             key = "UISPEC_SPEC"
-            value = "RKObjectMappingNextGenSpec"
-            isEnabled = "NO">
+            value = "RKManagedObjectStoreSpec"
+            isEnabled = "YES">
          </EnvironmentVariable>
          <EnvironmentVariable
             key = "UISPEC_EXAMPLE"
-            value = "itShouldSetTheErrorWhenMappingOperationFails"
+            value = "itShouldAllowYouToPOSTAnObjectAndMapBackNonNestedContent"
             isEnabled = "NO">
          </EnvironmentVariable>
          <EnvironmentVariable

diff --git a/Specs/CoreData/RKManagedObjectStoreSpec.m b/Specs/CoreData/RKManagedObjectStoreSpec.m
@@ -24,4 +24,11 @@ - (void)itShouldCoercePrimaryKeysToStringsForLookup {
     assertThat(newReference, is(equalTo(human)));
 }
 
+- (void)itShouldStoreNewInstancesOfCreatedObjectsByStringKey {
+    RKManagedObjectStore* objectStore = RKSpecNewManagedObjectStore();
+    NSManagedObject* firstInstance = [objectStore findOrCreateInstanceOfEntity:[RKHuman entity] withPrimaryKeyAttribute:@"railsID" andValue:[NSNumber numberWithInt:1234]];
+    NSManagedObject* secondInstance = [objectStore findOrCreateInstanceOfEntity:[RKHuman entity] withPrimaryKeyAttribute:@"railsID" andValue:[NSNumber numberWithInt:1234]];
+    assertThat(secondInstance, is(equalTo(firstInstance)));
+}
+
 @end