Merge branch 'release/0.20.2'

Author: blakewatters

.gitignore

@@ -25,3 +25,6 @@ test-reports/
 
 # CocoaPods
 Pods
+RestKit.xcodeproj/xcshareddata/
+RestKit.xcworkspace/xcshareddata/xcschemes/
+DerivedData

Code/Network/RKManagedObjectRequestOperation.m

@@ -526,6 +526,7 @@ - (BOOL)canSkipMapping
     BOOL (^shouldSkipMapping)(void) = ^{
         // Is the request cacheable
         if (!self.cachedResponse) return NO;
+        if (!self.managedObjectCache) return NO;
         NSURLRequest *request = self.HTTPRequestOperation.request;
         if (! [[request HTTPMethod] isEqualToString:@"GET"] && ! [[request HTTPMethod] isEqualToString:@"HEAD"]) return NO;
         NSHTTPURLResponse *response = (NSHTTPURLResponse *)self.HTTPRequestOperation.response;
@@ -666,7 +667,7 @@ - (BOOL)deleteTargetObjectIfAppropriate:(NSError **)error
     return _blockSuccess;
 }
 
-- (NSSet *)localObjectsFromFetchRequestsMatchingRequestURL:(NSError **)error
+- (NSSet *)localObjectsFromFetchRequests:(NSArray *)fetchRequests matchingRequestURL:(NSError **)error
 {
     NSMutableSet *localObjects = [NSMutableSet set];    
     __block NSError *_blockError;
@@ -699,6 +700,23 @@ - (NSSet *)localObjectsFromFetchRequestsMatchingRequestURL:(NSError **)error
     return localObjects;
 }
 
+- (NSArray *)fetchRequestsMatchingResponseURL
+{
+    // Pass the fetch request blocks a relative `NSURL` object if possible
+    NSMutableArray *fetchRequests = [NSMutableArray array];
+    NSURL *URL = RKRelativeURLFromURLAndResponseDescriptors(self.HTTPRequestOperation.response.URL, self.responseDescriptors);
+    for (RKFetchRequestBlock fetchRequestBlock in [self.fetchRequestBlocks reverseObjectEnumerator]) {
+        NSFetchRequest *fetchRequest = fetchRequestBlock(URL);
+        if (fetchRequest) {
+            // Workaround for iOS 5 -- The log statement crashes if the entity is not assigned before logging
+            [fetchRequest setEntity:[[[[self.privateContext persistentStoreCoordinator] managedObjectModel] entitiesByName] objectForKey:[fetchRequest entityName]]];
+            RKLogDebug(@"Found fetch request matching URL '%@': %@", URL, fetchRequest);
+            [fetchRequests addObject:fetchRequest];
+        }
+    }
+    return fetchRequests;
+}
+
 - (BOOL)deleteLocalObjectsMissingFromMappingResult:(RKMappingResult *)mappingResult error:(NSError **)error
 {
     if (! self.deletesOrphanedObjects) {
@@ -716,8 +734,13 @@ - (BOOL)deleteLocalObjectsMissingFromMappingResult:(RKMappingResult *)mappingRes
         return YES;
     }
 
+    // Determine if there are any fetch request blocks to use for orphaned object cleanup
+    NSArray *fetchRequests = [self fetchRequestsMatchingResponseURL];
+    if (! [fetchRequests count]) return YES;
+    
+    // Proceed with cleanup
     NSSet *managedObjectsInMappingResult = RKManagedObjectsFromMappingResultWithMappingInfo(mappingResult, self.mappingInfo) ?: [NSSet set];
-    NSSet *localObjects = [self localObjectsFromFetchRequestsMatchingRequestURL:error];
+    NSSet *localObjects = [self localObjectsFromFetchRequests:fetchRequests matchingRequestURL:error];
     if (! localObjects) {
         RKLogError(@"Failed when attempting to fetch local candidate objects for orphan cleanup: %@", error ? *error : nil);
         return NO;

Code/Network/RKObjectRequestOperation.m

@@ -151,7 +151,7 @@ - (void)objectRequestOperationDidStart:(NSNotification *)notification
     // Weakly tag the HTTP operation with its parent object request operation
     RKObjectRequestOperation *objectRequestOperation = [notification object];
     objc_setAssociatedObject(objectRequestOperation, RKOperationStartDate, [NSDate date], OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-    objc_setAssociatedObject(objectRequestOperation.HTTPRequestOperation, RKParentObjectRequestOperation, objectRequestOperation, OBJC_ASSOCIATION_ASSIGN);
+    objc_setAssociatedObject(objectRequestOperation.HTTPRequestOperation, RKParentObjectRequestOperation, objectRequestOperation, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
 }
 
 - (void)HTTPOperationDidStart:(NSNotification *)notification
@@ -165,9 +165,9 @@ - (void)HTTPOperationDidStart:(NSNotification *)notification
         NSString *body = nil;
         if ([operation.request HTTPBody]) {
             body = RKLogTruncateString([[NSString alloc] initWithData:[operation.request HTTPBody] encoding:NSUTF8StringEncoding]);
-        } else if ([operation.request HTTPBodyStream]) {
+        } /*else if ([operation.request HTTPBodyStream]) {
             body = RKStringDescribingStream([operation.request HTTPBodyStream]);
-        }
+        }*/
 
         RKLogTrace(@"%@ '%@':\nrequest.headers=%@\nrequest.body=%@", [operation.request HTTPMethod], [[operation.request URL] absoluteString], [operation.request allHTTPHeaderFields], body);
     } else {
@@ -182,6 +182,7 @@ - (void)HTTPOperationDidFinish:(NSNotification *)notification
 
     // NOTE: if we have a parent object request operation, we'll wait it to finish to emit the logging info
     RKObjectRequestOperation *parentOperation = objc_getAssociatedObject(operation, RKParentObjectRequestOperation);
+    objc_setAssociatedObject(operation, RKParentObjectRequestOperation, nil, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
     if (parentOperation) {
         objc_setAssociatedObject(operation, RKOperationFinishDate, [NSDate date], OBJC_ASSOCIATION_RETAIN_NONATOMIC);
         return;
@@ -604,7 +605,7 @@ - (BOOL)isConcurrent
 
 - (BOOL)isReady
 {
-    return [self.stateMachine isReady];
+    return [self.stateMachine isReady] && [super isReady];
 }
 
 - (BOOL)isExecuting

Code/ObjectMapping/RKMapperOperation.m

@@ -397,11 +397,7 @@ - (void)main
     BOOL foundMappable = NO;
     NSMutableDictionary *results = [self mapSourceRepresentationWithMappingsDictionary:self.mappingsDictionary];
     if ([self isCancelled]) return;
-    foundMappable = (results != nil);
-
-    if ([self.delegate respondsToSelector:@selector(mapperDidFinishMapping:)]) {
-        [self.delegate mapperDidFinishMapping:self];
-    }
+    foundMappable = (results != nil);    
 
     // If we found nothing eligible for mapping in the content, add an unmappable key path error and fail mapping
     // If the content is empty, we don't consider it an error
@@ -413,12 +409,14 @@ - (void)main
                                             RKDetailedErrorsKey: self.errors} mutableCopy];
         NSError *compositeError = [[NSError alloc] initWithDomain:RKErrorDomain code:RKMappingErrorNotFound userInfo:userInfo];
         self.error = compositeError;
-        return;
+    } else {
+        if (results) self.mappingResult = [[RKMappingResult alloc] initWithDictionary:results];
     }
 
     RKLogDebug(@"Finished performing object mapping. Results: %@", results);
-
-    if (results) self.mappingResult = [[RKMappingResult alloc] initWithDictionary:results];
+    if ([self.delegate respondsToSelector:@selector(mapperDidFinishMapping:)]) {
+        [self.delegate mapperDidFinishMapping:self];
+    }
 }
 
 - (BOOL)execute:(NSError **)error

Code/ObjectMapping/RKMappingOperation.h

@@ -160,9 +160,12 @@
     NSDictionary *representation = @{ @"name": @"Blake Watters" };
     NSDictionary *metadata = @{ @"URL": [NSURL URLWithString:@"http://restkit.org"] };
 
-    RKObjectMapping *mapping = [RKObjectMapping mappingForClass:[RKMetadataExample class]];
-    [mapping addAttributeMappingsFromDicitonary:@{ @"name": @"name", @"@metadata.URL": @"URL" }];
-    RKMappingOperation *mappingOperation = [[RKObjectMapping alloc] initWithSourceObject:representation destinationObject:example mapping:
+    RKObjectMapping *objectMapping = [RKObjectMapping mappingForClass:[RKMetadataExample class]];
+    [objectMapping addAttributeMappingsFromDictionary:@{ @"name": @"name", @"@metadata.URL": @"URL" }];
+ 
+    RKMappingOperation *mappingOperation = [[RKMappingOperation alloc] initWithSourceObject:representation destinationObject:example mapping:objectMapping];
+    mappingOperation.metadata = metadata;
+ 
     NSError *error = nil;
     BOOL success = [mappingOperation execute:&error];
 

Code/ObjectMapping/RKMappingOperation.m

@@ -117,8 +117,14 @@ id RKTransformedValueWithClass(id value, Class destinationType, NSValueTransform
             if ([booleanStrings containsObject:lowercasedString]) {
                 // Handle booleans encoded as Strings
                 return [NSNumber numberWithBool:[trueStrings containsObject:lowercasedString]];
-            } else {
+            } else if ([(NSString *)value rangeOfString:@"."].location != NSNotFound) {
+                // String -> Floating Point Number
+                // Only use floating point if needed to avoid losing precision
+                // on large integers
                 return [NSNumber numberWithDouble:[(NSString *)value doubleValue]];
+            } else {
+                // String -> Signed Integer
+                return [NSNumber numberWithLongLong:[(NSString *)value longLongValue]];
             }
         }
     } else if ([value isEqual:[NSNull null]]) {

Code/ObjectMapping/RKObjectUtilities.m

@@ -19,6 +19,7 @@
 //
 
 #import <objc/message.h>
+#import <objc/runtime.h>
 #import "RKObjectUtilities.h"
 
 BOOL RKObjectIsEqualToObject(id object, id anotherObject) {
@@ -84,9 +85,8 @@ BOOL RKObjectIsCollectionOfCollections(id object)
 Class RKKeyValueCodingClassForObjCType(const char *type)
 {
     if (type) {
-        // https://developer.apple.com/library/mac/#documentation/Cocoa/Conceptual/ObjCRuntimeGuide/Articles/ocrtTypeEncodings.html
         switch (type[0]) {
-            case '@': {
+            case _C_ID: {
                 char *openingQuoteLoc = strchr(type, '"');
                 if (openingQuoteLoc) {
                     char *closingQuoteLoc = strchr(openingQuoteLoc+1, '"');
@@ -102,38 +102,38 @@ Class RKKeyValueCodingClassForObjCType(const char *type)
                 // If there is no quoted class type (id), it can be used as-is.
                 return Nil;
             }
-                
-            case 'c': // char
-            case 'C': // unsigned char
-            case 's': // short
-            case 'S': // unsigned short
-            case 'i': // int
-            case 'I': // unsigned int
-            case 'l': // long
-            case 'L': // unsigned long
-            case 'q': // long long
-            case 'Q': // unsigned long long
-            case 'f': // float
-            case 'd': // double
+
+            case _C_CHR: // char
+            case _C_UCHR: // unsigned char
+            case _C_SHT: // short
+            case _C_USHT: // unsigned short
+            case _C_INT: // int
+            case _C_UINT: // unsigned int
+            case _C_LNG: // long
+            case _C_ULNG: // unsigned long
+            case _C_LNG_LNG: // long long
+            case _C_ULNG_LNG: // unsigned long long
+            case _C_FLT: // float
+            case _C_DBL: // double
                 return [NSNumber class];
 
-            case 'B': // C++ bool or C99 _Bool
+            case _C_BOOL: // C++ bool or C99 _Bool
                 return objc_getClass("NSCFBoolean")
                 ?: objc_getClass("__NSCFBoolean")
                 ?: [NSNumber class];
 
-            case '{': // struct
-            case 'b': // bitfield
-            case '(': // union
+            case _C_STRUCT_B: // struct
+            case _C_BFLD: // bitfield
+            case _C_UNION_B: // union
                 return [NSValue class];
 
-            case '[': // c array
-            case '^': // pointer
-            case 'v': // void
-            case '*': // char *
-            case '#': // Class
-            case ':': // selector
-            case '?': // unknown type (function pointer, etc)
+            case _C_ARY_B: // c array
+            case _C_PTR: // pointer
+            case _C_VOID: // void
+            case _C_CHARPTR: // char *
+            case _C_CLASS: // Class
+            case _C_SEL: // selector
+            case _C_UNDEF: // unknown type (function pointer, etc)
             default:
                 break;
         }

Code/Support/RKMIMETypeSerialization.m

@@ -133,7 +133,7 @@ + (void)unregisterClass:(Class<RKSerialization>)serializationClass
 {
     NSArray *registrationsCopy = [[self sharedSerialization].registrations copy];
     for (RKMIMETypeSerializationRegistration *registration in registrationsCopy) {
-        if (registration.class == serializationClass) {
+        if (registration.serializationClass == serializationClass) {
             [[self sharedSerialization].registrations removeObject:registration];
         }
     }

Code/Support/RKOperationStateMachine.m

@@ -68,9 +68,7 @@ - (id)initWithOperation:(NSOperation *)operation dispatchQueue:(dispatch_queue_t
         [executingState setWillEnterStateBlock:^(TKState *state, TKStateMachine *stateMachine) {
             [self.operation willChangeValueForKey:@"isExecuting"];
         }];
-        [executingState setDidEnterStateBlock:^(TKState *state, TKStateMachine *stateMachine) {
-            [self.operation didChangeValueForKey:@"isExecuting"];
-        }];
+        // NOTE: isExecuting KVO for `setDidEnterStateBlock:` configured below in `setExecutionBlock`
         [executingState setWillExitStateBlock:^(TKState *state, TKStateMachine *stateMachine) {
             [self.operation willChangeValueForKey:@"isExecuting"];
         }];
@@ -172,6 +170,7 @@ - (void)setExecutionBlock:(void (^)(void))block
 {
     TKState *executingState = [self.stateMachine stateNamed:RKOperationStateExecuting];
     [executingState setDidEnterStateBlock:^(TKState *state, TKStateMachine *stateMachine) {
+        [self.operation didChangeValueForKey:@"isExecuting"];
         dispatch_async(self.dispatchQueue, ^{
             block();
         });

Examples/RKTwitterCoreData/Classes/RKTwitterAppDelegate.m

@@ -88,7 +88,11 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     RKLogConfigureByName("RestKit/ObjectMapping", RKLogLevelInfo);
     RKLogConfigureByName("RestKit/CoreData", RKLogLevelTrace);
 
-    NSError *error;
+    NSError *error = nil;
+    BOOL success = RKEnsureDirectoryExistsAtPath(RKApplicationDataDirectory(), &error);
+    if (! success) {
+        RKLogError(@"Failed to create Application Data Directory at path '%@': %@", RKApplicationDataDirectory(), error);
+    }
     NSString *seedStorePath = [RKApplicationDataDirectory() stringByAppendingPathComponent:@"RKSeedDatabase.sqlite"];
     RKManagedObjectImporter *importer = [[RKManagedObjectImporter alloc] initWithManagedObjectModel:managedObjectModel storePath:seedStorePath];
     [importer importObjectsFromItemAtPath:[[NSBundle mainBundle] pathForResource:@"restkit" ofType:@"json"]

Gemfile

@@ -5,5 +5,5 @@ gem "bundler", "~> 1.3.0"
 gem "sinatra", :git => "git://github.com/sinatra/sinatra.git"
 gem "thin", "~> 1.5.0"
 gem 'debugger', '~> 1.3.0'
-gem 'cocoapods', '0.19.1'
+gem 'cocoapods', '0.20.2'
 gem 'rakeup', '~> 1.0.0'

Gemfile.lock

@@ -14,24 +14,24 @@ GEM
       i18n (= 0.6.1)
       multi_json (~> 1.0)
     addressable (2.3.4)
-    claide (0.2.0)
-    cocoapods (0.19.1)
+    claide (0.3.2)
+    cocoapods (0.20.2)
       activesupport (~> 3.2.13)
-      claide (~> 0.2.0)
-      cocoapods-core (= 0.19.1)
-      cocoapods-downloader (~> 0.1.0)
+      claide (~> 0.3.2)
+      cocoapods-core (= 0.20.2)
+      cocoapods-downloader (~> 0.1.1)
       colored (~> 1.2)
       escape (~> 0.0.4)
       faraday (~> 0.8.1)
-      json (~> 1.7.3)
+      json (~> 1.8.0)
       octokit (~> 1.7)
       open4 (~> 1.3.0)
       rake (~> 10.0.0)
-      xcodeproj (~> 0.5.5)
-    cocoapods-core (0.19.1)
+      xcodeproj (~> 0.6.0)
+    cocoapods-core (0.20.2)
       activesupport (~> 3.2.13)
       rake (~> 10.0.0)
-    cocoapods-downloader (0.1.0)
+    cocoapods-downloader (0.1.1)
     colored (1.2)
     columnize (0.3.6)
     daemons (1.1.9)
@@ -48,10 +48,10 @@ GEM
       multipart-post (~> 1.1)
     faraday_middleware (0.9.0)
       faraday (>= 0.7.4, < 0.9)
-    hashie (2.0.4)
+    hashie (2.0.5)
     i18n (0.6.1)
-    json (1.7.7)
-    multi_json (1.7.3)
+    json (1.8.0)
+    multi_json (1.7.4)
     multipart-post (1.2.0)
     netrc (0.7.7)
     octokit (1.24.0)
@@ -74,7 +74,7 @@ GEM
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     tilt (1.4.0)
-    xcodeproj (0.5.5)
+    xcodeproj (0.6.0)
       activesupport (~> 3.2.13)
       colored (~> 1.2)
 
@@ -83,7 +83,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.3.0)
-  cocoapods (= 0.19.1)
+  cocoapods (= 0.20.2)
   debugger (~> 1.3.0)
   rake (~> 10.0.0)
   rakeup (~> 1.0.0)

Podfile.lock

@@ -16,4 +16,4 @@ SPEC CHECKSUMS:
   OCMock: 79212e5e328378af5cfd6edb5feacfd6c49cd8a3
   Specta: 8a215d36842f2d29e888786937d1bf7f8725f780
 
-COCOAPODS: 0.19.1
+COCOAPODS: 0.20.2

README.md

@@ -257,6 +257,9 @@ RKObjectRequestOperation *operation = [[RKObjectRequestOperation alloc] initWith
 [operation setCompletionBlockWithSuccess:nil failure:^(RKObjectRequestOperation *operation, NSError *error) {
     // The `description` method of the class the error is mapped to is used to construct the value of the localizedDescription
 	NSLog(@"Loaded this error: %@", [error localizedDescription]);
+    
+    // You can access the model object used to construct the `NSError` via the `userInfo`
+    RKErrorMessage *errorMessage =  [[error.userInfo objectForKey:RKObjectMapperErrorObjectsKey] firstObject];
 }];
 ```