Merge branch 'cnstoll_analysisCleanup' of github.com:mutualmobile/MMR…

…ecord into 1.3.0
mutualmobile · Mar 1, 2014 · a49a45e · a49a45e
2 parents 9de83c7 + 259c070
commit a49a45e
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 11 deletions.
diff --git a/...rdAppDotNet/MMRecordAppDotNet.xcodeproj/xcshareddata/xcschemes/MMRecordAppDotNet.xcscheme b/...rdAppDotNet/MMRecordAppDotNet.xcodeproj/xcshareddata/xcschemes/MMRecordAppDotNet.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "0460"
+ LastUpgradeVersion = "0500"
  version = "1.3">
  <BuildAction
  parallelizeBuildables = "YES"

diff --git a/Examples/MMRecordFoursquare/MMRecordFoursquare/MMRecordFoursquare.xcodeproj/project.pbxproj b/Examples/MMRecordFoursquare/MMRecordFoursquare/MMRecordFoursquare.xcodeproj/project.pbxproj
@@ -612,7 +612,6 @@
  isa = XCBuildConfiguration;
  buildSettings = {
  ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
  CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
  CLANG_CXX_LIBRARY = "libc++";
  CLANG_ENABLE_MODULES = YES;
@@ -651,7 +650,6 @@
  isa = XCBuildConfiguration;
  buildSettings = {
  ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
  CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
  CLANG_CXX_LIBRARY = "libc++";
  CLANG_ENABLE_MODULES = YES;
@@ -711,7 +709,6 @@
  55D2783D1829765E008CB6B4 /* Debug */ = {
  isa = XCBuildConfiguration;
  buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
  BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/MMRecordFoursquare.app/MMRecordFoursquare";
  FRAMEWORK_SEARCH_PATHS = (
  "$(SDKROOT)/Developer/Library/Frameworks",
@@ -734,7 +731,6 @@
  55D2783E1829765E008CB6B4 /* Release */ = {
  isa = XCBuildConfiguration;
  buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
  BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/MMRecordFoursquare.app/MMRecordFoursquare";
  FRAMEWORK_SEARCH_PATHS = (
  "$(SDKROOT)/Developer/Library/Frameworks",

diff --git a/...rdInstagram/MMRecordInstagram.xcodeproj/xcshareddata/xcschemes/MMRecordInstagram.xcscheme b/...rdInstagram/MMRecordInstagram.xcodeproj/xcshareddata/xcschemes/MMRecordInstagram.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "0460"
+ LastUpgradeVersion = "0500"
  version = "1.3">
  <BuildAction
  parallelizeBuildables = "YES"

diff --git a/...ormance/MMRecordPerformance.xcodeproj/xcshareddata/xcschemes/MMRecordPerformance.xcscheme b/...ormance/MMRecordPerformance.xcodeproj/xcshareddata/xcschemes/MMRecordPerformance.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "0460"
+ LastUpgradeVersion = "0500"
  version = "1.3">
  <BuildAction
  parallelizeBuildables = "YES"

diff --git a/...MMRecordTwitter/MMRecordTwitter.xcodeproj/xcshareddata/xcschemes/MMRecordTwitter.xcscheme b/...MMRecordTwitter/MMRecordTwitter.xcodeproj/xcshareddata/xcschemes/MMRecordTwitter.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "0460"
+ LastUpgradeVersion = "0500"
  version = "1.3">
  <BuildAction
  parallelizeBuildables = "YES"

diff --git a/Source/MMRecord/MMRecordMarshaler.m b/Source/MMRecord/MMRecordMarshaler.m
@@ -217,13 +217,11 @@ + (void)establishPrimaryKeyRelationshipFromProtoRecord:(MMRecordProtoRecord *)pr
  //is the correct one to assign
  if ([existingRecordOrCollectionFromRelationship respondsToSelector:@selector(count)]) {
 
- BOOL existingRecord = NO;
  //is a faulted set; iterate through to find
  for (MMRecord *faultedObject in (NSSet *)existingRecordOrCollectionFromRelationship) {
  if ([self verifyObject:faultedObject containsValuesForKeysInDict:protoRecord.dictionary representation:protoRecord.representation] == YES) {
  existingRecordFromParent = faultedObject;
 
- existingRecord = YES;
  break;
  }
  }

diff --git a/Source/MMRecord/MMRecordResponse.m b/Source/MMRecord/MMRecordResponse.m
@@ -206,7 +206,7 @@ - (MMRecordProtoRecord *)protoRecordWithRecordResponseObject:(id)recordResponseO
  fromExistingResponseGroups:responseGroups];
  MMRecordRepresentation *representation = recordResponseGroup.representation;
 
- if ([recordResponseObject isKindOfClass:[NSDictionary class]] == NO) {
+ if ([recordResponseObject isKindOfClass:[NSDictionary class]] == NO && representation.primaryKeyPropertyName != nil) {
  recordResponseObject = @{representation.primaryKeyPropertyName : recordResponseObject};
  }