Merge branch 'release/v0.20.0-rc1'

Author: blakewatters

Code/CoreData/NSManagedObjectContext+RKAdditions.m

@@ -44,6 +44,7 @@ - (BOOL)saveToPersistentStore:(NSError **)error
         __block BOOL success;
         [contextToSave performBlockAndWait:^{
             success = [contextToSave save:&localError];
+            if (! success && localError == nil) RKLogWarning(@"Saving of managed object context failed, but a `nil` value for the `error` argument was returned. This typically indicates an invalid implementation of a key-value validation method exists within your model. This violation of the API contract may result in the save operation being mis-interpretted by callers that rely on the availability of the error.");
         }];
 
         if (! success) {

Code/CoreData/RKEntityByAttributeCache.m

@@ -226,7 +226,6 @@ - (NSManagedObject *)objectWithAttributeValues:(NSDictionary *)attributeValues i
 
 - (NSSet *)objectsWithAttributeValues:(NSDictionary *)attributeValues inContext:(NSManagedObjectContext *)context
 {
-    // TODO: Assert that the attribute values contains all of the cache attributes!!!
     NSMutableSet *objects = [NSMutableSet set];
     NSArray *cacheKeys = RKCacheKeysForEntityFromAttributeValues(self.entity, attributeValues);
     for (NSString *cacheKey in cacheKeys) {
@@ -281,10 +280,12 @@ - (void)removeObjectID:(NSManagedObjectID *)objectID forAttributeValues:(NSDicti
 {
     @synchronized(self.cacheKeysToObjectIDs) {
         if (attributeValues && [attributeValues count]) {
-            NSString *cacheKey = RKCacheKeyForEntityWithAttributeValues(self.entity, attributeValues);
-            NSMutableArray *objectIDs = [self.cacheKeysToObjectIDs objectForKey:cacheKey];
-            if (objectIDs && [objectIDs containsObject:objectID]) {
-                [objectIDs removeObject:objectID];
+            NSArray *cacheKeys = RKCacheKeysForEntityFromAttributeValues(self.entity, attributeValues);
+            for (NSString *cacheKey in cacheKeys) {
+                NSMutableArray *objectIDs = [self.cacheKeysToObjectIDs objectForKey:cacheKey];
+                if (objectIDs && [objectIDs containsObject:objectID]) {
+                    [objectIDs removeObject:objectID];
+                }
             }
         } else {
             RKLogWarning(@"Unable to remove object for object ID %@: empty values dictionary for attributes '%@'", objectID, self.attributes);

Code/CoreData/RKEntityCache.m

@@ -96,7 +96,7 @@ - (RKEntityByAttributeCache *)attributeCacheForEntity:(NSEntityDescription *)ent
 {
     NSParameterAssert(entity);
     NSParameterAssert(attributeNames);
-    for (RKEntityByAttributeCache *cache in self.attributeCaches) {
+    for (RKEntityByAttributeCache *cache in [self.attributeCaches copy]) {
         if ([cache.entity isEqual:entity] && [cache.attributes isEqualToArray:attributeNames]) {
             return cache;
         }
@@ -109,7 +109,7 @@ - (NSSet *)attributeCachesForEntity:(NSEntityDescription *)entity
 {
     NSAssert(entity, @"Cannot retrieve attribute caches for a nil entity");
     NSMutableSet *set = [NSMutableSet set];
-    for (RKEntityByAttributeCache *cache in self.attributeCaches) {
+    for (RKEntityByAttributeCache *cache in [self.attributeCaches copy]) {
         if ([cache.entity isEqual:entity]) {
             [set addObject:cache];
         }

Code/CoreData/RKEntityMapping.m

@@ -149,7 +149,10 @@ + (instancetype)mappingForClass:(Class)objectClass
 
 + (instancetype)mappingForEntityForName:(NSString *)entityName inManagedObjectStore:(RKManagedObjectStore *)managedObjectStore
 {
+    NSParameterAssert(entityName);
+    NSParameterAssert(managedObjectStore);
     NSEntityDescription *entity = [[managedObjectStore.managedObjectModel entitiesByName] objectForKey:entityName];
+    NSAssert(entity, @"Unable to find an Entity with the name '%@' in the managed object model", entityName);
     return [[self alloc] initWithEntity:entity];
 }
 
@@ -180,8 +183,10 @@ - (id)initWithClass:(Class)objectClass
 - (id)copyWithZone:(NSZone *)zone
 {
     RKEntityMapping *copy = [super copyWithZone:zone];
+    copy.entity = self.entity;
     copy.identificationAttributes = self.identificationAttributes;
     copy.identificationPredicate = self.identificationPredicate;
+    copy.deletionPredicate = self.deletionPredicate;
 
     for (RKConnectionDescription *connection in self.connections) {
         [copy addConnection:[connection copy]];
@@ -235,7 +240,7 @@ - (NSArray *)connections
 - (void)addConnectionForRelationship:(id)relationshipOrName connectedBy:(id)connectionSpecifier
 {
     NSRelationshipDescription *relationship = [relationshipOrName isKindOfClass:[NSRelationshipDescription class]] ? relationshipOrName : [[self.entity relationshipsByName] valueForKey:relationshipOrName];
-    NSAssert(relationship, @"No relatiobship was found named '%@' in the '%@' entity", relationshipOrName, [self.entity name]);
+    NSAssert(relationship, @"No relationship was found named '%@' in the '%@' entity", relationshipOrName, [self.entity name]);
     RKConnectionDescription *connection = nil;
     if ([connectionSpecifier isKindOfClass:[NSString class]]) {
         NSString *sourceAttribute = connectionSpecifier;

Code/CoreData/RKFetchRequestManagedObjectCache.m

@@ -17,13 +17,19 @@
 #define RKLogComponent RKlcl_cRestKitCoreData
 
 /*
- NOTE: At the moment this cache key assume that the structure of the values for each key in the `attributeValues` in constant
- i.e. if you have `userID`, it will always be a single value, or `userIDs` will always be an array.
- It will need to be reimplemented if changes in attribute values occur during the life of a single cache
+ This function computes a cache key given a dictionary of attribute values. Each attribute name is used as a fragment within the aggregate cache key. A suffix qualifier is appended that differentiates singular vs. collection attribute values so that '==' and 'IN' predicates are computed appropriately.
  */
-static NSString *RKPredicateCacheKeyForAttributes(NSArray *attributeNames)
+static NSString *RKPredicateCacheKeyForAttributeValues(NSDictionary *attributesValues)
 {
-    return [[attributeNames sortedArrayUsingSelector:@selector(localizedCaseInsensitiveCompare:)] componentsJoinedByString:@":"];
+    NSArray *sortedKeys = [[attributesValues allKeys] sortedArrayUsingSelector:@selector(localizedCaseInsensitiveCompare:)];
+    NSMutableArray *keyFragments = [NSMutableArray array];
+    for (NSString *attributeName in sortedKeys) {
+        id value = [attributesValues objectForKey:attributeName];
+        char suffix = ([value respondsToSelector:@selector(count)]) ? '+' : '.';
+        NSString *attributeKey = [NSString stringWithFormat:@"%@%c", attributeName, suffix];
+        [keyFragments addObject:attributeKey];
+    }
+    return [keyFragments componentsJoinedByString:@":"];
 }
 
 // NOTE: We build a dynamic format string here because `NSCompoundPredicate` does not support use of substiution variables
@@ -65,7 +71,7 @@ - (NSSet *)managedObjectsWithEntity:(NSEntityDescription *)entity
     NSAssert(attributeValues, @"Cannot retrieve cached objects without attribute values to identify them with.");
     NSAssert(managedObjectContext, @"Cannot find existing managed object with a nil context");
 
-    NSString *predicateCacheKey = RKPredicateCacheKeyForAttributes([attributeValues allKeys]);
+    NSString *predicateCacheKey = RKPredicateCacheKeyForAttributeValues(attributeValues);
     NSPredicate *substitutionPredicate = [self.predicateCache objectForKey:predicateCacheKey];
     if (! substitutionPredicate) {
         substitutionPredicate = RKPredicateWithSubsitutionVariablesForAttributeValues(attributeValues);