Merge branch 'release/0.21.0'

Author: Blake Watters

.gitignore

@@ -28,3 +28,7 @@ Pods
 RestKit.xcodeproj/xcshareddata/
 RestKit.xcworkspace/xcshareddata/xcschemes/
 DerivedData
+
+# Bundler binstubs
+.bundle
+bin

.gitmodules

@@ -4,3 +4,9 @@
 [submodule "Vendor/TransitionKit"]
 	path = Vendor/TransitionKit
 	url = https://github.com/blakewatters/TransitionKit.git
+[submodule "Vendor/RKValueTransformers"]
+	path = Vendor/RKValueTransformers
+	url = https://github.com/RestKit/RKValueTransformers.git
+[submodule "Vendor/ISO8601DateFormatterValueTransformer"]
+	path = Vendor/ISO8601DateFormatterValueTransformer
+	url = https://github.com/blakewatters/ISO8601DateFormatterValueTransformer.git

.ruby-gemset

@@ -1 +1 @@
-ruby-1.9.3-p429
+1.9.3-p429

.ruby-version

@@ -1,8 +1,8 @@
 language: objective-c
 before_install:
     - brew update
-    - brew install xctool --HEAD
-    - bundle install
+    - brew uninstall xctool
+    - brew install xctool
 script:
-    - rake server:start
-    - rake test
+    - rake server:start test test:building_without_core_data
+    

.travis.yml

@@ -36,24 +36,10 @@
 
 extern NSString * const RKObjectMappingNestingAttributeKeyName;
 
-static char kRKManagedObjectMappingOperationDataSourceAssociatedObjectKey;
+static void *RKManagedObjectMappingOperationDataSourceAssociatedObjectKey = &RKManagedObjectMappingOperationDataSourceAssociatedObjectKey;
 
-id RKTransformedValueWithClass(id value, Class destinationType, NSValueTransformer *dateToStringValueTransformer);
 NSArray *RKApplyNestingAttributeValueToMappings(NSString *attributeName, id value, NSArray *propertyMappings);
 
-// Return YES if the entity is identified by an attribute that acts as the nesting key in the source representation
-static BOOL RKEntityMappingIsIdentifiedByNestingAttribute(RKEntityMapping *entityMapping)
-{
-    for (NSAttributeDescription *attribute in [entityMapping identificationAttributes]) {
-        RKAttributeMapping *attributeMapping = [[entityMapping propertyMappingsByDestinationKeyPath] objectForKey:[attribute name]];
-        if ([attributeMapping.sourceKeyPath isEqualToString:RKObjectMappingNestingAttributeKeyName]) {
-            return YES;
-        }
-    }
-    
-    return NO;
-}
-
 static id RKValueForAttributeMappingInRepresentation(RKAttributeMapping *attributeMapping, NSDictionary *representation)
 {
     if ([attributeMapping.sourceKeyPath isEqualToString:RKObjectMappingNestingAttributeKeyName]) {
@@ -81,16 +67,15 @@ static id RKValueForAttributeMappingInRepresentation(RKAttributeMapping *attribu
 {
     NSCParameterAssert(entityMapping);
     NSCAssert([representation isKindOfClass:[NSDictionary class]], @"Expected a dictionary representation");
-    
-    RKDateToStringValueTransformer *dateToStringTransformer = [[RKDateToStringValueTransformer alloc] initWithDateToStringFormatter:entityMapping.preferredDateFormatter
-                                                                                                             stringToDateFormatters:entityMapping.dateFormatters];
     NSArray *attributeMappings = entityMapping.attributeMappings;
-    
+    __block NSError *error = nil;
+
     // If the representation is mapped with a nesting attribute, we must apply the nesting value to the representation before constructing the identification attributes
     RKAttributeMapping *nestingAttributeMapping = [[entityMapping propertyMappingsBySourceKeyPath] objectForKey:RKObjectMappingNestingAttributeKeyName];
     if (nestingAttributeMapping) {
         Class attributeClass = [entityMapping classForProperty:nestingAttributeMapping.destinationKeyPath];
-        id attributeValue = RKTransformedValueWithClass([[representation allKeys] lastObject], attributeClass, dateToStringTransformer);
+        id attributeValue = nil;
+        [entityMapping.valueTransformer transformValue:[[representation allKeys] lastObject] toValue:&attributeValue ofClass:attributeClass error:&error];
         attributeMappings = RKApplyNestingAttributeValueToMappings(nestingAttributeMapping.destinationKeyPath, attributeValue, attributeMappings);
     }
 
@@ -100,7 +85,8 @@ static id RKValueForAttributeMappingInRepresentation(RKAttributeMapping *attribu
         RKAttributeMapping *attributeMapping = RKAttributeMappingForNameInMappings([attribute name], attributeMappings);
         Class attributeClass = [entityMapping classForProperty:[attribute name]];
         id sourceValue = RKValueForAttributeMappingInRepresentation(attributeMapping, representation);
-        id attributeValue = RKTransformedValueWithClass(sourceValue, attributeClass, dateToStringTransformer);
+        id attributeValue = nil;
+        if (sourceValue) [entityMapping.valueTransformer transformValue:sourceValue toValue:&attributeValue ofClass:attributeClass error:&error];
         [entityIdentifierAttributes setObject:attributeValue ?: [NSNull null] forKey:[attribute name]];
     }];
 
@@ -253,7 +239,7 @@ - (id)mappingOperation:(RKMappingOperation *)mappingOperation targetObjectForRep
         id existingObjectsOfRelationship = identificationAttributes ? [mappingOperation.destinationObject valueForKeyPath:relationship.destinationKeyPath] : RKMutableCollectionValueWithObjectForKeyPath(mappingOperation.destinationObject, relationship.destinationKeyPath);
         if (existingObjectsOfRelationship && !RKObjectIsCollection(existingObjectsOfRelationship)) existingObjectsOfRelationship = @[ existingObjectsOfRelationship ];
         for (NSManagedObject *existingObject in existingObjectsOfRelationship) {
-            if (! identificationAttributes) {
+            if (! identificationAttributes && ![existingObject isDeleted]) {
                 managedObject = existingObject;
                 [existingObjectsOfRelationship removeObject:managedObject];
                 break;
@@ -341,9 +327,10 @@ - (BOOL)commitChangesForMappingOperation:(RKMappingOperation *)mappingOperation
         // Add a dependency on the parent operation. If we are being mapped as part of a relationship, then the assignment of the mapped object to a parent may well fulfill the validation requirements. This ensures that the relationship mapping has completed before we evaluate the object for deletion.
         if (self.parentOperation) [deletionOperation addDependency:self.parentOperation];
 
+        RKRelationshipConnectionOperation *connectionOperation = nil;
         if ([connections count]) {
-            RKRelationshipConnectionOperation *operation = [[RKRelationshipConnectionOperation alloc] initWithManagedObject:mappingOperation.destinationObject connections:connections managedObjectCache:self.managedObjectCache];
-            [operation setConnectionBlock:^(RKRelationshipConnectionOperation *operation, RKConnectionDescription *connection, id connectedValue) {
+            connectionOperation = [[RKRelationshipConnectionOperation alloc] initWithManagedObject:mappingOperation.destinationObject connections:connections managedObjectCache:self.managedObjectCache];
+            [connectionOperation setConnectionBlock:^(RKRelationshipConnectionOperation *operation, RKConnectionDescription *connection, id connectedValue) {
                 if (connectedValue) {
                     if ([mappingOperation.delegate respondsToSelector:@selector(mappingOperation:didConnectRelationship:toValue:usingConnection:)]) {
                         [mappingOperation.delegate mappingOperation:mappingOperation didConnectRelationship:connection.relationship toValue:connectedValue usingConnection:connection];
@@ -355,34 +342,35 @@ - (BOOL)commitChangesForMappingOperation:(RKMappingOperation *)mappingOperation
                 }
             }];
 
-            if (self.parentOperation) [operation addDependency:self.parentOperation];
-            [deletionOperation addDependency:operation];
-            [operationQueue addOperation:operation];
-            RKLogTrace(@"Enqueued %@ dependent upon parent operation %@ to operation queue %@", operation, self.parentOperation, operationQueue);
+            if (self.parentOperation) [connectionOperation addDependency:self.parentOperation];
+            [deletionOperation addDependency:connectionOperation];
+            [operationQueue addOperation:connectionOperation];
+            RKLogTrace(@"Enqueued %@ dependent upon parent operation %@ to operation queue %@", connectionOperation, self.parentOperation, operationQueue);
         }
 
         // Enqueue our deletion operation for execution after all the connections
         [operationQueue addOperation:deletionOperation];
 
         // Handle tombstone deletion by predicate
         if ([(RKEntityMapping *)mappingOperation.objectMapping deletionPredicate]) {
-            RKManagedObjectDeletionOperation *deletionOperation = nil;
-            if (self.parentOperation) {
+            RKManagedObjectDeletionOperation *predicateDeletionOperation = nil;
+            // Attach a deletion operation for execution after the parent operation completes
+            predicateDeletionOperation = (RKManagedObjectDeletionOperation *)objc_getAssociatedObject(self.parentOperation, RKManagedObjectMappingOperationDataSourceAssociatedObjectKey);
+            if (! predicateDeletionOperation) {
+                predicateDeletionOperation = [[RKManagedObjectDeletionOperation alloc] initWithManagedObjectContext:self.managedObjectContext];
+
                 // Attach a deletion operation for execution after the parent operation completes
-                deletionOperation = (RKManagedObjectDeletionOperation *)objc_getAssociatedObject(self.parentOperation, &kRKManagedObjectMappingOperationDataSourceAssociatedObjectKey);
-                if (! deletionOperation) {
-                    deletionOperation = [[RKManagedObjectDeletionOperation alloc] initWithManagedObjectContext:self.managedObjectContext];
-                    objc_setAssociatedObject(self.parentOperation, &kRKManagedObjectMappingOperationDataSourceAssociatedObjectKey, deletionOperation, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-                    [deletionOperation addDependency:self.parentOperation];
-                    NSOperationQueue *operationQueue = self.operationQueue ?: [NSOperationQueue currentQueue];
-                    [operationQueue addOperation:deletionOperation];
+                if (self.parentOperation) {
+                    objc_setAssociatedObject(self.parentOperation, RKManagedObjectMappingOperationDataSourceAssociatedObjectKey, predicateDeletionOperation, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+                    [predicateDeletionOperation addDependency:self.parentOperation];
                 }
-                [deletionOperation addEntityMapping:(RKEntityMapping *)mappingOperation.objectMapping];
-            } else {
-                deletionOperation = [[RKManagedObjectDeletionOperation alloc] initWithManagedObjectContext:self.managedObjectContext];
-                [deletionOperation addEntityMapping:(RKEntityMapping *)mappingOperation.objectMapping];
-                [deletionOperation start];
+
+                // Ensure predicate deletion executes after any connections have been established
+                if (connectionOperation) [predicateDeletionOperation addDependency:connectionOperation];
+
+                [operationQueue addOperation:predicateDeletionOperation];
             }
+            [predicateDeletionOperation addEntityMapping:(RKEntityMapping *)mappingOperation.objectMapping];
         }
     }
 
@@ -423,7 +411,7 @@ - (void)updateCacheWithChangesFromContextWillSaveNotification:(NSNotification *)
 - (BOOL)mappingOperation:(RKMappingOperation *)mappingOperation deleteExistingValueOfRelationshipWithMapping:(RKRelationshipMapping *)relationshipMapping error:(NSError **)error
 {
     // Validate the assignment policy
-    if (! relationshipMapping.assignmentPolicy == RKReplaceAssignmentPolicy) {
+    if (relationshipMapping.assignmentPolicy != RKReplaceAssignmentPolicy) {
         NSDictionary *userInfo = @{ NSLocalizedDescriptionKey: @"Unable to satisfy deletion request: Relationship mapping was expected to have an assignment policy of `RKReplaceAssignmentPolicy`, but did not." };
         NSError *localError = [NSError errorWithDomain:RKErrorDomain code:RKMappingErrorInvalidAssignmentPolicy userInfo:userInfo];
         if (error) *error = localError;
@@ -466,10 +454,12 @@ - (BOOL)mappingOperationShouldSkipPropertyMapping:(RKMappingOperation *)mappingO
     if (! [currentValue respondsToSelector:@selector(compare:)]) return NO;
 
     RKPropertyMapping *propertyMappingForModificationKey = [[(RKEntityMapping *)mappingOperation.mapping propertyMappingsByDestinationKeyPath] objectForKey:modificationKey];
-    id rawValue = [[mappingOperation sourceObject] valueForKeyPath:propertyMappingForModificationKey.sourceKeyPath];    
-    RKDateToStringValueTransformer *transformer = [[RKDateToStringValueTransformer alloc] initWithDateToStringFormatter:entityMapping.preferredDateFormatter stringToDateFormatters:entityMapping.dateFormatters];
+    id rawValue = [[mappingOperation sourceObject] valueForKeyPath:propertyMappingForModificationKey.sourceKeyPath];
     Class attributeClass = [entityMapping classForProperty:propertyMappingForModificationKey.destinationKeyPath];
-    id transformedValue = RKTransformedValueWithClass(rawValue, attributeClass, transformer);
+
+    id transformedValue = nil;
+    NSError *error = nil;
+    [entityMapping.valueTransformer transformValue:rawValue toValue:&transformedValue ofClass:attributeClass error:&error];
     if (! transformedValue) return NO;
 
     if ([currentValue isKindOfClass:[NSString class]]) {

Code/CoreData/RKManagedObjectMappingOperationDataSource.m

@@ -245,8 +245,24 @@ - (BOOL)copySeedDatabaseIfNecessaryFromPath:(NSString *)seedPath toPath:(NSStrin
 
             return NO;
         }
+        if ([[NSFileManager defaultManager] fileExistsAtPath:[seedPath stringByAppendingString:@"-shm"]]) {
+            if (![[NSFileManager defaultManager] copyItemAtPath:[seedPath stringByAppendingString:@"-shm"] toPath:[storePath stringByAppendingString:@"-shm"] error:&localError]) {
+                RKLogError(@"Failed to copy seed database (SHM) from path '%@' to path '%@': %@", seedPath, storePath, [localError localizedDescription]);
+                if (error) *error = localError;
+                
+                return NO;
+            }
+        }
+        if ([[NSFileManager defaultManager] fileExistsAtPath:[seedPath stringByAppendingString:@"-wal"]]) {
+            if (![[NSFileManager defaultManager] copyItemAtPath:[seedPath stringByAppendingString:@"-wal"] toPath:[storePath stringByAppendingString:@"-wal"] error:&localError]) {
+                RKLogError(@"Failed to copy seed database (WAL) from path '%@' to path '%@': %@", seedPath, storePath, [localError localizedDescription]);
+                if (error) *error = localError;
+                
+                return NO;
+            }
+        }
     }
-
+    
     return YES;
 }
 
@@ -342,6 +358,19 @@ - (BOOL)resetPersistentStores:(NSError **)error
                         RKLogWarning(@"Found external support item for store at path that is not a directory: %@", [supportDirectoryFileURL path]);
                     }
                 }
+
+                // Check for and remove -shm and -wal files
+                for (NSString *suffix in @[ @"-shm", @"-wal" ]) {
+                    NSString *supportFileName = [[URL lastPathComponent] stringByAppendingString:suffix];
+                    NSURL *supportFileURL = [NSURL URLWithString:supportFileName relativeToURL:[URL URLByDeletingLastPathComponent]];
+                    if ([[NSFileManager defaultManager] fileExistsAtPath:[supportFileURL path]]) {
+                        if (! [[NSFileManager defaultManager] removeItemAtURL:supportFileURL error:&localError]) {
+                            RKLogError(@"Failed to remove support file at URL %@: %@", supportFileURL, localError);
+                            if (error) *error = localError;
+                            return NO;
+                        }
+                    }
+                }
             } else {
                 RKLogDebug(@"Skipped removal of persistent store file: URL for persistent store is not a file URL. (%@)", URL);
             }

Code/CoreData/RKManagedObjectStore.m

@@ -25,3 +25,8 @@
 #import "RKResponseDescriptor.h"
 #import "RKObjectManager.h"
 #import "RKHTTPUtilities.h"
+#import "RKObjectRequestOperation.h"
+
+#ifdef _COREDATADEFINES_H
+#import "RKManagedObjectRequestOperation.h"
+#endif

Code/Network.h

@@ -18,7 +18,7 @@
 //  limitations under the License.
 //
 
-#import "AFNetworking.h"
+#import "AFHTTPClient.h"
 #import "AFHTTPRequestOperation.h"
 
 // Expose the default headers from AFNetworking's AFHTTPClient

Code/Network/RKHTTPRequestOperation.h

@@ -32,6 +32,14 @@
 
 NSString *RKStringFromIndexSet(NSIndexSet *indexSet); // Defined in RKResponseDescriptor.m
 
+static BOOL RKResponseRequiresContentTypeMatch(NSHTTPURLResponse *response, NSURLRequest *request)
+{
+    if (RKRequestMethodFromString(request.HTTPMethod) == RKRequestMethodHEAD) return NO;
+    if (response.statusCode == 304) return NO;
+    if (response.statusCode == 204) return NO;
+    return YES;
+}
+
 @interface AFURLConnectionOperation () <NSURLConnectionDataDelegate>
 @property (readwrite, nonatomic, strong) NSRecursiveLock *lock;
 @end
@@ -68,6 +76,7 @@ - (BOOL)hasAcceptableStatusCode
 - (BOOL)hasAcceptableContentType
 {
     if (! self.response) return NO;
+    if (!RKResponseRequiresContentTypeMatch(self.response, self.request)) return YES;
     NSString *contentType = [self.response MIMEType] ?: @"application/octet-stream";
     return self.acceptableContentTypes ? RKMIMETypeInSet(contentType, self.acceptableContentTypes) : [super hasAcceptableContentType];
 }

Code/Network/RKHTTPRequestOperation.m

@@ -18,7 +18,7 @@
 //  limitations under the License.
 //
 
-#import <CoreData/CoreData.h>
+#ifdef _COREDATADEFINES_H
 #import "RKObjectRequestOperation.h"
 #import "RKManagedObjectCaching.h"
 
@@ -140,7 +140,7 @@
 
  @warning A `nil` value for the `managedObjectCache` property is valid, but may result in the creation of duplicate objects.
  */
-@property (nonatomic, weak) id<RKManagedObjectCaching> managedObjectCache;
+@property (nonatomic, strong) id<RKManagedObjectCaching> managedObjectCache;
 
 /**
  An array of `RKFetchRequestBlock` block objects used to map `NSURL` objects into corresponding `NSFetchRequest` objects.
@@ -202,3 +202,5 @@ typedef NSFetchRequest *(^RKFetchRequestBlock)(NSURL *URL);
  @return An array of fetch requests from all blocks that match the given URL.
  */
 NSArray *RKArrayOfFetchRequestFromBlocksWithURL(NSArray *fetchRequestBlocks, NSURL *URL);
+
+#endif