Fixing test frameworks :(

Making each file more standalone for piecemeal includes, or to allow includes from other than the main PCH file
NOUSguide · May 9, 2012 · 5c5ea83 · 5c5ea83
1 parent 3d37bdb
commit 5c5ea83
Show file tree

Hide file tree

Showing 29 changed files with 364 additions and 72 deletions.
diff --git a/MagicalRecord/Categories/DataImport/NSAttributeDescription+MagicalDataImport.m b/MagicalRecord/Categories/DataImport/NSAttributeDescription+MagicalDataImport.m
@@ -7,6 +7,8 @@
 //
 
 #import "NSAttributeDescription+MagicalDataImport.h"
+#import "NSManagedObject+MagicalDataImport.h"
+#import "MagicalImportFunctions.h"
 
 @implementation NSAttributeDescription (MagicalRecord_DataImport)
 
@@ -43,4 +45,5 @@ - (id) MR_valueForKeyPath:(NSString *)keyPath fromObjectData:(id)objectData;
 
     return value == [NSNull null] ? nil : value;   
 }
+
 @end
diff --git a/MagicalRecord/Categories/DataImport/NSRelationshipDescription+MagicalDataImport.m b/MagicalRecord/Categories/DataImport/NSRelationshipDescription+MagicalDataImport.m
@@ -8,6 +8,7 @@
 
 #import "NSRelationshipDescription+MagicalDataImport.h"
 #import "NSManagedObject+MagicalDataImport.h"
+#import "MagicalImportFunctions.h"
 #import "MagicalRecord.h"
 
 @implementation NSRelationshipDescription (MagicalRecord_DataImport)

diff --git a/MagicalRecord/Categories/NSManagedObject/NSManagedObject+MagicalAggregation.m b/MagicalRecord/Categories/NSManagedObject/NSManagedObject+MagicalAggregation.m
@@ -7,6 +7,12 @@
 //
 
 #import "NSManagedObject+MagicalAggregation.h"
+#import "NSManagedObjectContext+MagicalRecord.h"
+#import "NSManagedObjectContext+MagicalThreading.h"
+#import "NSManagedObject+MagicalRequests.h"
+#import "NSManagedObject+MagicalRecord.h"
+#import "NSManagedObject+MagicalFinders.h"
+#import "MagicalRecord+ErrorHandling.h"
 
 @implementation NSManagedObject (MagicalAggregation)
 

diff --git a/MagicalRecord/Categories/NSManagedObject/NSManagedObject+MagicalFinders.m b/MagicalRecord/Categories/NSManagedObject/NSManagedObject+MagicalFinders.m
@@ -7,6 +7,9 @@
 //
 
 #import "NSManagedObject+MagicalFinders.h"
+#import "NSManagedObject+MagicalRequests.h"
+#import "NSManagedObject+MagicalRecord.h"
+#import "NSManagedObjectContext+MagicalThreading.h"
 
 @implementation NSManagedObject (MagicalFinders)
 

diff --git a/MagicalRecord/Categories/NSManagedObject/NSManagedObject+MagicalRequests.m b/MagicalRecord/Categories/NSManagedObject/NSManagedObject+MagicalRequests.m
@@ -7,6 +7,8 @@
 //
 
 #import "NSManagedObject+MagicalRequests.h"
+#import "NSManagedObject+MagicalRecord.h"
+#import "NSManagedObjectContext+MagicalThreading.h"
 
 @implementation NSManagedObject (MagicalRequests)
 

diff --git a/MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalObserving.m b/MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalObserving.m
@@ -7,6 +7,9 @@
 //
 
 #import "NSManagedObjectContext+MagicalObserving.h"
+#import "NSManagedObjectContext+MagicalRecord.h"
+#import "MagicalRecord.h"
+#import "MagicalRecord+iCloud.h"
 
 static void const * kMagicalRecordNotifiesMainContextAssociatedValueKey = @"kMagicalRecordNotifiesMainContextOnSave";
 NSString * const kMagicalRecordDidMergeChangesFromiCloudNotification = @"kMagicalRecordDidMergeChangesFromiCloudNotification";

diff --git a/MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalSaves.m b/MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalSaves.m
@@ -7,6 +7,9 @@
 //
 
 #import "NSManagedObjectContext+MagicalSaves.h"
+#import "MagicalRecord+ErrorHandling.h"
+#import "NSManagedObjectContext+MagicalRecord.h"
+#import "MagicalRecord.h"
 
 @interface NSManagedObjectContext (InternalMagicalSaves)
 

diff --git a/MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalThreading.m b/MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalThreading.m
@@ -7,6 +7,8 @@
 //
 
 #import "NSManagedObjectContext+MagicalThreading.h"
+#import "NSManagedObject+MagicalRecord.h"
+#import "NSManagedObjectContext+MagicalRecord.h"
 
 static NSString const * kMagicalRecordManagedObjectContextKey = @"MagicalRecord_NSManagedObjectContextForThreadKey";
 

diff --git a/MagicalRecord/Core/MagicalRecord+Setup.m b/MagicalRecord/Core/MagicalRecord+Setup.m
@@ -7,6 +7,9 @@
 //
 
 #import "MagicalRecord+Setup.h"
+#import "NSManagedObject+MagicalRecord.h"
+#import "NSPersistentStoreCoordinator+MagicalRecord.h"
+#import "NSManagedObjectContext+MagicalRecord.h"
 
 @implementation MagicalRecord (Setup)
 

diff --git a/MagicalRecord/Core/MagicalRecord+ShorthandSupport.h b/MagicalRecord/Core/MagicalRecord+ShorthandSupport.h
@@ -10,6 +10,8 @@
 
 @interface MagicalRecord (ShorthandSupport)
 
+#ifdef MR_SHORTHAND
 + (void) swizzleShorthandMethods;
+#endif
 
 @end
diff --git a/MagicalRecord/Core/MagicalRecord+iCloud.m b/MagicalRecord/Core/MagicalRecord+iCloud.m
@@ -7,6 +7,8 @@
 //
 
 #import "MagicalRecord+iCloud.h"
+#import "NSPersistentStoreCoordinator+MagicalRecord.h"
+#import "NSManagedObjectContext+MagicalRecord.h"
 
 static BOOL _iCloudEnabled = NO;
 

diff --git a/MagicalRecord/Core/MagicalRecord.h b/MagicalRecord/Core/MagicalRecord.h
@@ -9,6 +9,30 @@
 #define MAC_PLATFORM_ONLY YES
 #endif
 
+// enable to use caches for the fetchedResultsControllers (iOS only)
+// #define STORE_USE_CACHE
+
+#define kCreateNewCoordinatorOnBackgroundOperations     0
+
+#ifndef MR_ENABLE_ACTIVE_RECORD_LOGGING
+    #ifdef DEBUG
+        #define MR_ENABLE_ACTIVE_RECORD_LOGGING 1
+    #else
+        #define MR_ENABLE_ACTIVE_RECORD_LOGGING 0
+    #endif
+#endif
+
+#if MR_ENABLE_ACTIVE_RECORD_LOGGING != 0
+    #ifdef LOG_VERBOSE
+        extern int ddLogLevel;
+        #define MRLog(...)  DDLogVerbose(__VA_ARGS__)
+    #else
+        #define MRLog(...) NSLog(@"%s(%p) %@", __PRETTY_FUNCTION__, self, [NSString stringWithFormat:__VA_ARGS__])
+    #endif
+#else
+    #define MRLog(...) ((void)0)
+#endif
+
 #ifdef NS_BLOCKS_AVAILABLE
 
 @class NSManagedObjectContext;

diff --git a/MagicalRecord/CoreData+MagicalRecord.h b/MagicalRecord/CoreData+MagicalRecord.h
@@ -1,38 +1,14 @@
 
-// enable to use caches for the fetchedResultsControllers (iOS only)
-// #define STORE_USE_CACHE
-
-#define kCreateNewCoordinatorOnBackgroundOperations     0
-
-#ifndef MR_ENABLE_ACTIVE_RECORD_LOGGING
-  #ifdef DEBUG
-    #define MR_ENABLE_ACTIVE_RECORD_LOGGING 1
-  #else
-    #define MR_ENABLE_ACTIVE_RECORD_LOGGING 0
-  #endif
-#endif
-
-#ifdef __OBJC__
-
-#if MR_ENABLE_ACTIVE_RECORD_LOGGING != 0
-#ifdef LOG_VERBOSE
-    #define MRLog(...)  DDLogVerbose(__VA_ARGS__)
-#else
-    #define MRLog(...) NSLog(@"%s(%p) %@", __PRETTY_FUNCTION__, self, [NSString stringWithFormat:__VA_ARGS__])
-#endif
-#else
-    #define MRLog(...) ((void)0)
-#endif
-
-
 #ifndef NS_BLOCKS_AVAILABLE
-#warning MagicalRecord requires blocks
+    #warning MagicalRecord requires blocks
 #endif
 
+#ifdef __OBJC__
 //    #if !( __has_feature(objc_arc) && __has_feature(objc_arc_weak) )
 //        #error MagicalRecord now requires ARC to be enabled
 //    #endif
 
+    #import <CoreFoundation/CoreFoundation.h>
     #import <CoreData/CoreData.h>
 
     #ifdef MR_SHORTHAND
@@ -69,3 +45,18 @@
     #import "NSEntityDescription+MagicalDataImport.h"
 
 #endif
+g.h"
+    #import "NSPersistentStoreCoordinator+MagicalRecord.h"
+    #import "NSManagedObjectModel+MagicalRecord.h"
+    #import "NSPersistentStore+MagicalRecord.h"
+
+    #import "MagicalImportFunctions.h"
+    #import "NSManagedObject+MagicalDataImport.h"
+    #import "NSNumber+MagicalDataImport.h"
+    #import "NSObject+MagicalDataImport.h"
+    #import "NSString+MagicalDataImport.h"
+    #import "NSAttributeDescription+MagicalDataImport.h"
+    #import "NSRelationshipDescription+MagicalDataImport.h"
+    #import "NSEntityDescription+MagicalDataImport.h"
+
+#endif