Fixing the following NEW error: "this class is not key value coding-compliant for the key @count" for iOS 10+

.gitignore

@@ -33,3 +33,4 @@ DerivedData
 # Bundler binstubs
 .bundle
 bin
+RestKit.xcscmblueprint

.gitmodules

@@ -1,15 +0,0 @@
-[submodule "Vendor/AFNetworking"]
-	path = Vendor/AFNetworking
-	url = https://github.com/AFNetworking/AFNetworking.git
-[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
-[submodule "Vendor/SOCKit"]
-	path = Vendor/SOCKit
-	url = https://github.com/NimbusKit/sockit.git

.ruby-version

@@ -1 +1 @@
-2.2.1
+2.2.2

.travis.yml

@@ -1,7 +1,12 @@
 language: objective-c
-rvm: 2.2.1
+rvm: 2.2.2
 install:
     - bundle install
     - bundle exec pod install
 script:
     - bundle exec rake ci
+branches:
+  only:
+    - master
+    - development
+    - /^release/

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 ## Issues
 
-GitHub Issues is for reporting bugs in RestKit and discussing changes to RestKit itself. Please check the [documentation](http://cocoadocs.org/docsets/RestKit/), [wiki](https://github.com/RestKit/RestKit/wiki), and [existing issues](https://github.com/RestKit/RestKit/issues?state=closed) before opening a new issue.
+GitHub Issues is for reporting bugs in RestKit and discussing changes to RestKit itself. Please check the [documentation](http://cocoadocs.org/docsets/RestKit/), [wiki](https://github.com/RestKit/RestKit/wiki), and [existing issues](https://github.com/RestKit/RestKit/issues?q=is:issue) before opening a new issue.
 
 Additionaly, please do not post general usage questions to Issues, but instead take them to [Stack Overflow](http://stackoverflow.com/questions/tagged/restkit).
 

Code/Support/RKLumberjackLogger.h → Code/CocoaLumberjack/RKLumberjackLogger.h

@@ -8,8 +8,8 @@
 
 #import <Foundation/Foundation.h>
 
-#if __has_include("DDLog.h")
-#import "RKLog.h"
+#if __has_include(<CocoaLumberjack/CocoaLumberjack.h>)
+#import <RestKit/Support/RKLog.h>
 
 @interface RKLumberjackLogger : NSObject <RKLogging>
 @end

Code/CocoaLumberjack/RKLumberjackLogger.m

@@ -0,0 +1,110 @@
+//
+//  RKLumberjackLogger.m
+//  Pods
+//
+//  Created by C_Lindberg,Carl on 10/31/14.
+//
+//
+
+#if __has_include(<CocoaLumberjack/CocoaLumberjack.h>)
+#import <CocoaLumberjack/CocoaLumberjack.h>
+#import <RestKit/CocoaLumberjack/RKLumberjackLogger.h>
+
+@implementation RKLumberjackLogger
+
++ (DDLogLevel)ddLogLevelFromRKLogLevel:(_RKlcl_level_t)rkLevel
+{
+    switch (rkLevel)
+    {
+        case RKLogLevelOff:      return DDLogLevelOff;
+        case RKLogLevelCritical: return DDLogLevelError;
+        case RKLogLevelError:    return DDLogLevelError;
+        case RKLogLevelWarning:  return DDLogLevelWarning;
+        case RKLogLevelInfo:     return DDLogLevelInfo;
+        case RKLogLevelDebug:    return DDLogLevelDebug;
+        case RKLogLevelTrace:    return DDLogLevelVerbose;
+    }
+
+    return DDLogLevelDebug;
+}
+
++ (DDLogFlag)ddLogFlagFromRKLogLevel:(_RKlcl_level_t)rkLevel
+{
+    switch (rkLevel)
+    {
+        case RKLogLevelOff:      return 0;
+        case RKLogLevelCritical: return DDLogFlagError;
+        case RKLogLevelError:    return DDLogFlagError;
+        case RKLogLevelWarning:  return DDLogFlagWarning;
+        case RKLogLevelInfo:     return DDLogFlagInfo;
+        case RKLogLevelDebug:    return DDLogFlagDebug;
+        case RKLogLevelTrace:    return DDLogFlagVerbose;
+    }
+
+    return DDLogFlagDebug;
+}
+
++ (_RKlcl_level_t)rkLogLevelFromDDLogLevel:(DDLogLevel)ddLogLevel
+{
+    if (ddLogLevel & DDLogFlagVerbose) return RKLogLevelTrace;
+    if (ddLogLevel & DDLogFlagDebug)   return RKLogLevelDebug;
+    if (ddLogLevel & DDLogFlagInfo)    return RKLogLevelInfo;
+    if (ddLogLevel & DDLogFlagWarning) return RKLogLevelWarning;
+    if (ddLogLevel & DDLogFlagError)   return RKLogLevelError;
+
+    return RKLogLevelOff;
+}
+
+
+#pragma mark RKLogging
+
++ (void)logWithComponent:(_RKlcl_component_t)component
+                   level:(_RKlcl_level_t)level
+                    path:(const char *)path
+                    line:(uint32_t)line
+                function:(const char *)function
+                  format:(NSString *)format, ...
+{
+    va_list args;
+    va_start(args, format);
+
+    DDLogFlag flag = [self ddLogFlagFromRKLogLevel:level];
+    DDLogLevel componentLevel = [self ddLogLevelFromRKLogLevel:_RKlcl_component_level[component]];
+    BOOL async = LOG_ASYNC_ENABLED && ((flag & DDLogFlagError) == 0);
+
+    [DDLog log:async
+         level:componentLevel
+          flag:flag
+       context:0x524B5F00 + component
+          file:path function:function line:line
+           tag:nil
+        format:format args:args];
+    va_end(args);
+}
+
+@end
+
+/* Create a DDRegisteredDynamicLogging class for each RestKit component */
+
+#import <RestKit/Support/lcl_config_components_RK.h>
+
+#undef   _RKlcl_component
+#define  _RKlcl_component(_identifier, _header, _name)                                       \
+    @interface RKLumberjackLog##_identifier : NSObject <DDRegisteredDynamicLogging>          \
+    @end                                                                                     \
+    @implementation RKLumberjackLog##_identifier                                             \
+    + (DDLogLevel)ddLogLevel {                                                                      \
+        _RKlcl_level_t level = _RKlcl_component_level[RKlcl_c##_identifier];                 \
+        return [RKLumberjackLogger ddLogLevelFromRKLogLevel:level];                          \
+    }                                                                                        \
+    + (void)ddSetLogLevel:(DDLogLevel)logLevel {                                                    \
+        RKLogConfigureByName(_name, [RKLumberjackLogger rkLogLevelFromDDLogLevel:logLevel]); \
+    }                                                                                        \
+    @end
+
+RKLCLComponentDefinitions
+
+#undef   _RKlcl_component
+
+
+#endif

Code/CoreData.h

@@ -19,15 +19,15 @@
 //
 
 #import <CoreData/CoreData.h>
-#import "ObjectMapping.h"
-#import "RKManagedObjectStore.h"
-#import "RKManagedObjectImporter.h"
-#import "RKManagedObjectMappingOperationDataSource.h"
-#import "RKEntityMapping.h"
-#import "RKManagedObjectCaching.h"
-#import "RKInMemoryManagedObjectCache.h"
-#import "RKFetchRequestManagedObjectCache.h"
+#import <RestKit/CoreData/RKEntityMapping.h>
+#import <RestKit/CoreData/RKFetchRequestManagedObjectCache.h>
+#import <RestKit/CoreData/RKInMemoryManagedObjectCache.h>
+#import <RestKit/CoreData/RKManagedObjectCaching.h>
+#import <RestKit/CoreData/RKManagedObjectImporter.h>
+#import <RestKit/CoreData/RKManagedObjectMappingOperationDataSource.h>
+#import <RestKit/CoreData/RKManagedObjectStore.h>
+#import <RestKit/ObjectMapping.h>
 
-#import "RKPropertyInspector+CoreData.h"
-#import "NSManagedObjectContext+RKAdditions.h"
-#import "NSManagedObject+RKAdditions.h"
+#import <RestKit/CoreData/NSManagedObject+RKAdditions.h>
+#import <RestKit/CoreData/NSManagedObjectContext+RKAdditions.h>
+#import <RestKit/CoreData/RKPropertyInspector+CoreData.h>

Code/CoreData/NSManagedObject+RKAdditions.m

@@ -6,10 +6,10 @@
 //  Copyright (c) 2009-2012 RestKit. All rights reserved.
 //
 
-#import "NSManagedObject+RKAdditions.h"
-#import "NSManagedObjectContext+RKAdditions.h"
-#import "RKLog.h"
-#import "RKManagedObjectStore.h"
+#import <RestKit/CoreData/NSManagedObject+RKAdditions.h>
+#import <RestKit/CoreData/NSManagedObjectContext+RKAdditions.h>
+#import <RestKit/CoreData/RKManagedObjectStore.h>
+#import <RestKit/Support/RKLog.h>
 
 @implementation NSManagedObject (RKAdditions)
 

Code/CoreData/NSManagedObjectContext+RKAdditions.m

@@ -18,9 +18,9 @@
 //  limitations under the License.
 //
 
+#import <RestKit/CoreData/NSManagedObjectContext+RKAdditions.h>
+#import <RestKit/Support/RKLog.h>
 #import <objc/runtime.h>
-#import "NSManagedObjectContext+RKAdditions.h"
-#import "RKLog.h"
 
 @implementation NSManagedObjectContext (RKAdditions)
 

Code/CoreData/RKConnectionDescription.m

@@ -18,7 +18,7 @@
 //  limitations under the License.
 //
 
-#import "RKConnectionDescription.h"
+#import <RestKit/CoreData/RKConnectionDescription.h>
 
 static NSSet *RKSetWithInvalidAttributesForEntity(NSArray *attributes, NSEntityDescription *entity)
 {

Code/CoreData/RKCoreData.h

@@ -21,6 +21,6 @@
 #ifndef RestKit_RKCoreData_h
 #define RestKit_RKCoreData_h
 
-#import "CoreData.h"
+#import <RestKit/CoreData.h>
 
 #endif

Code/CoreData/RKEntityByAttributeCache.m

@@ -22,12 +22,12 @@
 #import <UIKit/UIKit.h>
 #endif
 
-#import "RKEntityByAttributeCache.h"
-#import "RKLog.h"
-#import "RKPropertyInspector.h"
-#import "RKPropertyInspector+CoreData.h"
-#import "NSManagedObject+RKAdditions.h"
-#import "RKObjectUtilities.h"
+#import <RestKit/CoreData/NSManagedObject+RKAdditions.h>
+#import <RestKit/CoreData/RKEntityByAttributeCache.h>
+#import <RestKit/CoreData/RKPropertyInspector+CoreData.h>
+#import <RestKit/ObjectMapping/RKObjectUtilities.h>
+#import <RestKit/ObjectMapping/RKPropertyInspector.h>
+#import <RestKit/Support/RKLog.h>
 
 // Set Logging Component
 #undef RKLogComponent
@@ -211,16 +211,17 @@ - (NSManagedObject *)objectForObjectID:(NSManagedObjectID *)objectID inContext:(
 {
     /**
      NOTE:
-
+     
      We use `existingObjectWithID:` as opposed to `objectWithID:` as `objectWithID:` can return us a fault
-     that will raise an exception when fired. `existingObjectWithID:error:` will return nil if the ID has been
-     deleted. `objectRegisteredForID:` is also an acceptable approach.
+     that will raise an exception when fired. `objectRegisteredForID:` is also an acceptable approach.
      */
     __block NSError *error = nil;
     __block NSManagedObject *object;
     [context performBlockAndWait:^{
         object = [context existingObjectWithID:objectID error:&error];
     }];
+    // Don't return the object if it has been deleted.
+    if ([object isDeleted]) object = nil;
     if (! object) {
         // Referential integrity errors often indicates that the temporary objectID does not exist in the specified context
         if (error && !([objectID isTemporaryID] && [error code] == NSManagedObjectReferentialIntegrityError)) {

Code/CoreData/RKEntityCache.m

@@ -18,8 +18,8 @@
 //  limitations under the License.
 //
 
-#import "RKEntityCache.h"
-#import "RKEntityByAttributeCache.h"
+#import <RestKit/CoreData/RKEntityByAttributeCache.h>
+#import <RestKit/CoreData/RKEntityCache.h>
 
 @interface RKEntityCache ()
 @property (nonatomic, strong) NSMutableSet *attributeCaches;

Code/CoreData/RKEntityMapping.h

@@ -19,9 +19,9 @@
 //
 
 #import <CoreData/CoreData.h>
-#import "RKObjectMapping.h"
-#import "RKConnectionDescription.h"
-#import "RKMacros.h"
+#import <RestKit/CoreData/RKConnectionDescription.h>
+#import <RestKit/ObjectMapping/RKObjectMapping.h>
+#import <RestKit/Support/RKMacros.h>
 
 @class RKManagedObjectStore;
 
@@ -114,17 +114,33 @@
  */
 @property (nonatomic, copy) NSPredicate *identificationPredicate;
 
+/**
+ An optional block which returns a predicate used to filter identified objects during mapping.
+
+ @return The identification predicate block.
+ */
+@property (nonatomic, copy) NSPredicate *(^identificationPredicateBlock)(NSDictionary *representation, NSManagedObjectContext *managedObjectContext);
+
 /**
  An optional attribute of the receiver's entity that can be used to detect modification of a given instance. This is used to improve the performance of mapping operations by skipping the property mappings for a given object if it is found to be not modified.
 
  A common modification attribute is a 'last modified' or 'updated at' timestamp that specifies the timestamp of the last change to an object. When the `modificationAttribute` is non-nil, the mapper will compare the value returned of the attribute on an existing object instance with the value in the representation being mapped. 
 
- The semantics of the comparison are dependent on the data type of the modification attribute. If the attribute is a string, then the values are compared for equality. If the attribute is a date or a numeric value, then the values will be compared numerically and mapping will be skipped if the value in the representation is greater than the value of the modification attribute stored on the object.
+ The semantics of the comparison are dependent on the data type of the modification attribute. If the attribute is a string, then the values are compared for equality. If the attribute is a date or a numeric value, then the values will be compared numerically and mapping will be skipped unless the value in the representation is greater than the value of the modification attribute stored on the object.
 
  @raises NSInvalidArgumentException Raised if the attribute given is not a property of the receiver's entity.
  */
 @property (nonatomic, strong) NSAttributeDescription *modificationAttribute;
 
+/**
+ If this is YES, mapping operations will map relationships of the object even if the `modificationAttribute` shows that the object has not been modified.
+
+ This is useful if a response contains a nested object that has been updated inside an object that has not.
+
+ Defaults to NO.
+ */
+@property (nonatomic) BOOL shouldMapRelationshipsIfObjectIsUnmodified;
+
 /**
  Sets the `modificationAttribute` to the receiver to the attribute with the specified name.