Merge branch 'release/0.20.0-pre1'

blakewatters · blakewatters · commit 885db0afcc4b · 2012-11-29T00:27:03.000-05:00
diff --git a/Code/CoreData/RKManagedObjectMappingOperationDataSource.m b/Code/CoreData/RKManagedObjectMappingOperationDataSource.m
@@ -167,7 +167,7 @@ - (id)mappingOperation:(RKMappingOperation *)mappingOperation targetObjectForRep
         if (entityMapping.entityIdentifier.predicate) objects = [objects filteredArrayUsingPredicate:entityMapping.entityIdentifier.predicate];
         if ([objects count] > 0) {
             managedObject = objects[0];
-            if ([objects count] > 1) RKLogWarning(@"Managed object cache returned %d objects for the identifier configured for the '%@' entity, expected 1.", [objects count], [entity name]);
+            if ([objects count] > 1) RKLogWarning(@"Managed object cache returned %ld objects for the identifier configured for the '%@' entity, expected 1.", (long) [objects count], [entity name]);
         }
         if (managedObject && [self.managedObjectCache respondsToSelector:@selector(didFetchObject:)]) {
             [self.managedObjectCache didFetchObject:managedObject];
diff --git a/Code/CoreData/RKRelationshipConnectionOperation.m b/Code/CoreData/RKRelationshipConnectionOperation.m
@@ -147,8 +147,8 @@ - (id)findConnected
         if ([self.connection.relationship isToMany]) {
             connectionResult = managedObjects;
         } else {
-            if ([managedObjects count] > 1) RKLogWarning(@"Retrieved %d objects satisfying connection criteria for one-to-one relationship connection: only the first result will be connected.", [managedObjects count]);
-            connectionResult = managedObjects[0];
+            if ([managedObjects count] > 1) RKLogWarning(@"Retrieved %ld objects satisfying connection criteria for one-to-one relationship connection: only the first result will be connected.", (long) [managedObjects count]);
+            if ([managedObjects count]) connectionResult = managedObjects[0];
         }
     } else if ([self.connection isKeyPathConnection]) {
         connectionResult = [self.managedObject valueForKeyPath:self.connection.keyPath];
diff --git a/Code/Network/RKPaginator.m b/Code/Network/RKPaginator.m
@@ -216,8 +216,8 @@ - (void)waitUntilFinished
 
 - (NSString *)description
 {
-    return [NSString stringWithFormat:@"<%@: %p patternURL=%@ isLoaded=%@ perPage=%d currentPage=%@ pageCount=%@ objectCount=%@>",
-            NSStringFromClass([self class]), self, self.patternURL, self.isLoaded ? @"YES" : @"NO", self.perPage,
+    return [NSString stringWithFormat:@"<%@: %p patternURL=%@ isLoaded=%@ perPage=%ld currentPage=%@ pageCount=%@ objectCount=%@>",
+            NSStringFromClass([self class]), self, self.patternURL, self.isLoaded ? @"YES" : @"NO", (long) self.perPage,
             [self hasCurrentPage] ? @(self.currentPage) : @"???",
             [self hasPageCount] ? @(self.pageCount) : @"???",
             [self hasObjectCount] ? @(self.objectCount) : @"???"];

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ - (id)mappingOperation:(RKMappingOperation *)mappingOperation targetObjectForRep`
`167`	`167`	`if (entityMapping.entityIdentifier.predicate) objects = [objects filteredArrayUsingPredicate:entityMapping.entityIdentifier.predicate];`
`168`	`168`	`if ([objects count] > 0) {`
`169`	`169`	`managedObject = objects[0];`
`170`		`- if ([objects count] > 1) RKLogWarning(@"Managed object cache returned %d objects for the identifier configured for the '%@' entity, expected 1.", [objects count], [entity name]);`
	`170`	`+ if ([objects count] > 1) RKLogWarning(@"Managed object cache returned %ld objects for the identifier configured for the '%@' entity, expected 1.", (long) [objects count], [entity name]);`
`171`	`171`	`}`
`172`	`172`	`if (managedObject && [self.managedObjectCache respondsToSelector:@selector(didFetchObject:)]) {`
`173`	`173`	`[self.managedObjectCache didFetchObject:managedObject];`