From 527dacb1a0efa63f1be775a1e830446bbf3fa9cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elvis=20Nu=C3=B1ez?= <elvisnunez@me.com>
Date: Mon, 19 Oct 2015 21:48:50 +0200
Subject: [PATCH] Migrate DATAStack

---
 Source/NSArray+Sync.m                 | 5 +++--
 Source/NSManagedObject+Sync.m         | 2 +-
 Source/Sync.m                         | 5 +++--
 Tests/Podfile                         | 2 +-
 Tests/Tests.xcodeproj/project.pbxproj | 2 +-
 Tests/Tests/Helpers/BaseTestCase.h    | 2 +-
 Tests/Tests/Helpers/BaseTestCase.m    | 4 ++--
 7 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Source/NSArray+Sync.m b/Source/NSArray+Sync.m
index e8787305..eb98cac2 100644
--- a/Source/NSArray+Sync.m
+++ b/Source/NSArray+Sync.m
@@ -21,10 +21,11 @@ - (NSArray *)preprocessForEntityNamed:(NSString *)entityName
                                          [rightValue isKindOfClass:[NSString class]]));
         if (rightValueCanBeCompared) {
             NSMutableArray *objectChanges = [NSMutableArray new];
+            NSManagedObjectContext *context = [dataStack newDisposableMainContext];
             NSEntityDescription *entity = [NSEntityDescription entityForName:entityName
-                                                      inManagedObjectContext:dataStack.disposableMainContext];
+                                                      inManagedObjectContext:context];
             for (NSDictionary *change in self) {
-                NSManagedObject *object = [[NSManagedObject alloc] initWithEntity:entity insertIntoManagedObjectContext:dataStack.disposableMainContext];
+                NSManagedObject *object = [[NSManagedObject alloc] initWithEntity:entity insertIntoManagedObjectContext:context];
                 NSError *error = nil;
                 [object hyp_fillWithDictionary:change];
                 [object sync_processRelationshipsUsingDictionary:change
diff --git a/Source/NSManagedObject+Sync.m b/Source/NSManagedObject+Sync.m
index e313a548..e65d7d82 100755
--- a/Source/NSManagedObject+Sync.m
+++ b/Source/NSManagedObject+Sync.m
@@ -1,6 +1,6 @@
 #import "NSManagedObject+Sync.h"
 
-#import "DATAStack.h"
+@import DATAStack;
 #import "Sync.h"
 
 #import "NSDictionary+ANDYSafeValue.h"
diff --git a/Source/Sync.m b/Source/Sync.m
index 67b10a83..11207f37 100755
--- a/Source/Sync.m
+++ b/Source/Sync.m
@@ -1,6 +1,6 @@
 #import "Sync.h"
 
-#import "DATAStack.h"
+@import DATAStack;
 #import "DATAFilter.h"
 
 #import "NSDictionary+ANDYSafeValue.h"
@@ -99,10 +99,11 @@ + (void)changes:(NSArray *)changes
 
     [DATAFilter changes:changes
           inEntityNamed:entityName
+              predicate:predicate
+             operations:DATAFilterOperationAll
                localKey:localKey
               remoteKey:remoteKey
                 context:context
-              predicate:predicate
                inserted:^(NSDictionary *objectJSON) {
                    NSError *error = nil;
                    NSManagedObject *created = [NSEntityDescription insertNewObjectForEntityForName:entityName
diff --git a/Tests/Podfile b/Tests/Podfile
index 5d0dfa46..4d6c9be4 100644
--- a/Tests/Podfile
+++ b/Tests/Podfile
@@ -3,7 +3,7 @@ use_frameworks!
 platform :ios, '8.0'
 
 pod 'DATAFilter'
-pod 'DATAStack'
+pod 'DATAStack', git: 'git@github.com:3lvis/DATAStack.git'
 pod 'NSDictionary-ANDYSafeValue'
 pod 'NSEntityDescription-SYNCPrimaryKey'
 pod 'NSJSONSerialization-ANDYJSONFile'
diff --git a/Tests/Tests.xcodeproj/project.pbxproj b/Tests/Tests.xcodeproj/project.pbxproj
index 237b5361..3cf36b23 100755
--- a/Tests/Tests.xcodeproj/project.pbxproj
+++ b/Tests/Tests.xcodeproj/project.pbxproj
@@ -7,7 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		0374412F80C6B8D5200C882C /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6C99E9E23EA886944E25CF9 /* Pods.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
+		0374412F80C6B8D5200C882C /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6C99E9E23EA886944E25CF9 /* Pods.framework */; };
 		141603011BC32307007D0600 /* NSArray+Sync.m in Sources */ = {isa = PBXBuildFile; fileRef = 141603001BC32307007D0600 /* NSArray+Sync.m */; settings = {ASSET_TAGS = (); }; };
 		141603031BC32425007D0600 /* NSArray+Sync_Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = 141603021BC32425007D0600 /* NSArray+Sync_Tests.m */; settings = {ASSET_TAGS = (); }; };
 		14584B041B7EE38600293841 /* Bug113.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 14584B021B7EE38600293841 /* Bug113.xcdatamodeld */; };
diff --git a/Tests/Tests/Helpers/BaseTestCase.h b/Tests/Tests/Helpers/BaseTestCase.h
index 43689502..ec9cefad 100644
--- a/Tests/Tests/Helpers/BaseTestCase.h
+++ b/Tests/Tests/Helpers/BaseTestCase.h
@@ -1,7 +1,7 @@
 @import XCTest;
 @import CoreData;
 
-#import "DATAStack.h"
+@import DATAStack;
 #import "Sync.h"
 
 @interface BaseTestCase : XCTestCase
diff --git a/Tests/Tests/Helpers/BaseTestCase.m b/Tests/Tests/Helpers/BaseTestCase.m
index a75c4d7c..56a0381e 100644
--- a/Tests/Tests/Helpers/BaseTestCase.m
+++ b/Tests/Tests/Helpers/BaseTestCase.m
@@ -1,7 +1,7 @@
 @import XCTest;
 
 #import "NSJSONSerialization+ANDYJSONFile.h"
-#import "DATAStack.h"
+@import DATAStack;
 #import "NSJSONSerialization+ANDYJSONFile.h"
 #import "Sync.h"
 #import "NSManagedObject+HYPPropertyMapper.h"
@@ -48,7 +48,7 @@ - (id)objectsFromJSON:(NSString *)fileName {
 - (DATAStack *)dataStackWithModelName:(NSString *)modelName {
     DATAStack *dataStack = [[DATAStack alloc] initWithModelName:modelName
                                                          bundle:[NSBundle bundleForClass:[self class]]
-                                                      storeType:DATAStackSQLiteStoreType];
+                                                      storeType:DATAStackStoreTypeSQLite];
 
     return dataStack;
 }