Merge pull request #11 from NSElvis/migration/datastack

Migration: DATAStack and remoteID
3lvis · Feb 9, 2015 · d05877d · d05877d
2 parents 6b0a8e5 + e606442
commit d05877d
Show file tree

Hide file tree

Showing 83 changed files with 4,587 additions and 4,658 deletions.
diff --git a/Example/Example/AppDelegate.h b/Example/Example/AppDelegate.h
@@ -1,13 +1,13 @@
 @import UIKit;
 @import CoreData;
 
-@class ANDYDataStack;
+@class DATAStack;
 
 @interface AppDelegate : UIResponder <UIApplicationDelegate>
 
 @property (strong, nonatomic) UIWindow *window;
 
-@property (nonatomic, strong, readonly) ANDYDataStack *dataStack;
+@property (nonatomic, strong, readonly) DATAStack *dataStack;
 
 @end
 

diff --git a/Example/Example/AppDelegate.m b/Example/Example/AppDelegate.m
@@ -1,12 +1,12 @@
 #import "AppDelegate.h"
-#import "ANDYDataStack.h"
+#import "DATAStack.h"
 #import "ViewController.h"
 
 AppDelegate *appDelegate;
 
 @interface AppDelegate ()
 
-@property (nonatomic, strong, readwrite) ANDYDataStack *dataStack;
+@property (nonatomic, strong, readwrite) DATAStack *dataStack;
 
 @end
 
@@ -24,11 +24,11 @@ - (instancetype)init
 
 #pragma mark - Getters
 
-- (ANDYDataStack *)dataStack
+- (DATAStack *)dataStack
 {
     if (_dataStack) return _dataStack;
 
-    _dataStack = [[ANDYDataStack alloc] initWithModelName:@"Example"];
+    _dataStack = [[DATAStack alloc] initWithModelName:@"Example"];
 
     return _dataStack;
 }
@@ -46,7 +46,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 
 - (void)applicationWillTerminate:(UIApplication *)application
 {
-    [self.dataStack persistContext];
+    [self.dataStack persistWithCompletion:nil];
 }
 
 @end
diff --git a/Example/Example/Data.h b/Example/Example/Data.h
@@ -15,7 +15,7 @@
 
 @property (nonatomic, retain) NSDate * createdDate;
 @property (nonatomic, retain) NSString * text;
-@property (nonatomic, retain) NSString * dataID;
+@property (nonatomic, retain) NSString * remoteID;
 @property (nonatomic, retain) NSString * canonicalURL;
 @property (nonatomic, retain) NSString * threadID;
 @property (nonatomic, retain) NSString * paginationID;

diff --git a/Example/Example/Data.m b/Example/Example/Data.m
@@ -14,7 +14,7 @@ @implementation Data
 
 @dynamic createdDate;
 @dynamic text;
-@dynamic dataID;
+@dynamic remoteID;
 @dynamic canonicalURL;
 @dynamic threadID;
 @dynamic paginationID;

diff --git a/Example/Example/Example.xcdatamodeld/Example.xcdatamodel/contents b/Example/Example/Example.xcdatamodeld/Example.xcdatamodel/contents
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="6252" systemVersion="14B17" minimumToolsVersion="Automatic" macOSVersion="Automatic" iOSVersion="Automatic">
+<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="6254" systemVersion="14D72i" minimumToolsVersion="Automatic" macOSVersion="Automatic" iOSVersion="Automatic">
     <entity name="Data" representedClassName="Data" syncable="YES">
         <attribute name="canonicalURL" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="createdDate" optional="YES" attributeType="Date" syncable="YES"/>
-        <attribute name="dataID" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="paginationID" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="remoteID" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="text" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="threadID" optional="YES" attributeType="String" syncable="YES"/>
         <relationship name="user" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="User" inverseName="datas" inverseEntity="User" syncable="YES"/>
@@ -13,13 +13,13 @@
         <attribute name="canonicalURL" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="createdDate" optional="YES" attributeType="Date" syncable="YES"/>
         <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
-        <attribute name="userID" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="remoteID" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="username" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="userType" optional="YES" attributeType="String" syncable="YES"/>
         <relationship name="datas" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="Data" inverseName="user" inverseEntity="Data" syncable="YES"/>
     </entity>
     <elements>
-        <element name="Data" positionX="-27" positionY="18" width="128" height="148"/>
-        <element name="User" positionX="54" positionY="90" width="128" height="148"/>
+        <element name="Data" positionX="-27" positionY="18" width="128" height="150"/>
+        <element name="User" positionX="54" positionY="90" width="128" height="150"/>
     </elements>
 </model>
diff --git a/Example/Example/User.h b/Example/Example/User.h
@@ -16,7 +16,7 @@
 @property (nonatomic, retain) NSString * username;
 @property (nonatomic, retain) NSDate * createdDate;
 @property (nonatomic, retain) NSString * canonicalURL;
-@property (nonatomic, retain) NSString * userID;
+@property (nonatomic, retain) NSString * remoteID;
 @property (nonatomic, retain) NSString * userType;
 @property (nonatomic, retain) NSString * name;
 @property (nonatomic, retain) NSSet *datas;

diff --git a/Example/Example/User.m b/Example/Example/User.m
@@ -15,7 +15,7 @@ @implementation User
 @dynamic username;
 @dynamic createdDate;
 @dynamic canonicalURL;
-@dynamic userID;
+@dynamic remoteID;
 @dynamic userType;
 @dynamic name;
 @dynamic datas;

diff --git a/Example/Example/ViewController.m b/Example/Example/ViewController.m
@@ -4,7 +4,7 @@
 #import "Data.h"
 
 #import "ANDYFetchedResultsTableDataSource.h"
-#import "ANDYDataStack.h"
+#import "DATAStack.h"
 #import "Kipu.h"
 #import "AppDelegate.h"
 

diff --git a/Example/Podfile b/Example/Podfile
@@ -2,5 +2,5 @@ source 'https://github.com/CocoaPods/Specs.git'
 
 platform :ios, '7.0'
 
-pod 'Kipu', git: 'https://github.com/NSElvis/Kipu.git'
+pod 'Kipu', git: 'https://github.com/NSElvis/Kipu.git', branch: 'migration/datastack'
 pod 'ANDYFetchedResultsTableDataSource'
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,40 +1,41 @@
 PODS:
-  - ANDYDataStack (2.0.2)
   - ANDYFetchedResultsTableDataSource (1.1)
+  - DATAStack (2.2.3)
   - Kipu (0.4):
-    - ANDYDataStack
+    - DATAStack
     - NSDictionary-ANDYSafeValue
     - NSManagedObject-ANDYMapChanges
     - NSManagedObject-HYPPropertyMapper
   - NSDictionary-ANDYSafeValue (0.3)
-  - NSManagedObject-ANDYMapChanges (0.5.1):
+  - NSManagedObject-ANDYMapChanges (0.6):
     - NSManagedObject-ANDYObjectIDs
   - NSManagedObject-ANDYObjectIDs (0.1)
-  - NSManagedObject-HYPPropertyMapper (2.8):
+  - NSManagedObject-HYPPropertyMapper (2.8.1):
     - NSString-HYPNetworking
   - NSString-HYPNetworking (0.1)
 
 DEPENDENCIES:
   - ANDYFetchedResultsTableDataSource
-  - Kipu (from `https://github.com/NSElvis/Kipu.git`)
+  - Kipu (from `https://github.com/NSElvis/Kipu.git`, branch `migration/datastack`)
 
 EXTERNAL SOURCES:
   Kipu:
+    :branch: migration/datastack
     :git: https://github.com/NSElvis/Kipu.git
 
 CHECKOUT OPTIONS:
   Kipu:
-    :commit: 660bed10f7ae53d076091e3f5c31805531f6f83f
+    :commit: fc37b89a53d533c0009488eda97f5b26593b9f56
     :git: https://github.com/NSElvis/Kipu.git
 
 SPEC CHECKSUMS:
-  ANDYDataStack: 381f77da0875647cdc64d53c17dd01291ea00e02
   ANDYFetchedResultsTableDataSource: d93c8c3eeb029a55dd2268c41f46a2d8be1457f8
-  Kipu: c23dbc1e872e7085a9085c886a69c2ec8231ff92
+  DATAStack: 0dc349315b3416d1347f6b45dd571d812c8dff6c
+  Kipu: c9811d8f56864b8c1f5e72784521cb94f9764623
   NSDictionary-ANDYSafeValue: ddd983e316a52201a40c70f4ab9ead8a63c569b6
-  NSManagedObject-ANDYMapChanges: 224cd299f56bbcb8466f495a22666aac877a4301
+  NSManagedObject-ANDYMapChanges: f5d20e903eafecb844adfa1a7e355a1f8cf083a8
   NSManagedObject-ANDYObjectIDs: d27bb3014026506848a8d164f3019ecaa2a4baca
-  NSManagedObject-HYPPropertyMapper: 1ad1837dc3e6e7e8a046010adacfd3fad8f084cd
+  NSManagedObject-HYPPropertyMapper: 13abcf971f00cf098ed5e148b1aa7fa2801f9e6a
   NSString-HYPNetworking: 941953383edbba2abd72014e4bfdd55fa4af8dff
 
 COCOAPODS: 0.35.0
diff --git a/Example/Pods/ANDYDataStack/ANDYDataStack/ANDYDataStack.h b/Example/Pods/ANDYDataStack/ANDYDataStack/ANDYDataStack.h
diff --git a/Example/Pods/ANDYDataStack/LICENSE → Example/Pods/DATAStack/LICENSE.md b/Example/Pods/ANDYDataStack/LICENSE → Example/Pods/DATAStack/LICENSE.md
diff --git a/Example/Pods/ANDYDataStack/README.md → Example/Pods/DATAStack/README.md b/Example/Pods/ANDYDataStack/README.md → Example/Pods/DATAStack/README.md
diff --git a/Example/Pods/DATAStack/Source/DATAStack.h b/Example/Pods/DATAStack/Source/DATAStack.h