Added some macros to handle backwards, non-ARC compatibility

magicalpanda · Nov 15, 2011 · 3e0b36c · 3e0b36c
1 parent e65b43a
commit 3e0b36c
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 53 deletions.
diff --git a/Source/Categories/NSManagedObject+MagicalRecord.m b/Source/Categories/NSManagedObject+MagicalRecord.m
@@ -128,9 +128,7 @@ + (NSArray *) MR_sortAscending:(BOOL)ascending attributes:(NSArray *)attributesT
     {
         NSSortDescriptor *sortDescriptor = [[NSSortDescriptor alloc] initWithKey:attributeName ascending:ascending];
         [attributes addObject:sortDescriptor];
-#ifndef NS_AUTOMATED_REFCOUNT_UNAVAILABLE
-        [sortDescriptor release];
-#endif
+        MR_RELEASE(sortDescriptor);
     }
 
 	return attributes;
@@ -150,10 +148,8 @@ + (NSFetchRequest *)MR_createFetchRequestInContext:(NSManagedObjectContext *)con
 {
 	NSFetchRequest *request = [[NSFetchRequest alloc] init];
 	[request setEntity:[self MR_entityDescriptionInContext:context]];
-
-#ifndef NS_AUTOMATED_REFCOUNT_UNAVAILABLE
-    [request autorelease];
-#endif
+    MR_AUTORELEASE(request);
+
     return request;
 }
 
@@ -301,9 +297,7 @@ + (NSFetchRequest *) MR_requestAllSortedBy:(NSString *)sortTerm ascending:(BOOL)
 
 	NSSortDescriptor *sortBy = [[NSSortDescriptor alloc] initWithKey:sortTerm ascending:ascending];
 	[request setSortDescriptors:[NSArray arrayWithObject:sortBy]];
-#ifndef NS_AUTOMATED_REFCOUNT_UNAVAILABLE
-    [sortBy autorelease];
-#endif
+    MR_AUTORELEASE(sortBy);
 
 	return request;
 }
@@ -321,12 +315,18 @@ + (NSFetchRequest *) MR_requestAllSortedBy:(NSString *)sortTerm ascending:(BOOL)
 	[request setPredicate:searchTerm];
 	[request setFetchBatchSize:[self MR_defaultBatchSize]];
 
-	NSSortDescriptor *sortBy = [[NSSortDescriptor alloc] initWithKey:sortTerm ascending:ascending];
-	[request setSortDescriptors:[NSArray arrayWithObject:sortBy]];
-#ifndef NS_AUTOMATED_REFCOUNT_UNAVAILABLE
-    [sortBy release];
-#endif
-
+    NSMutableArray* sortDescriptors = [[NSMutableArray alloc] init];
+    NSArray* sortKeys = [sortTerm componentsSeparatedByString:@","];
+    for (NSString* sortKey in sortKeys) 
+    {
+        NSSortDescriptor *sortDescriptor = [[NSSortDescriptor alloc] initWithKey:sortKey ascending:ascending];
+        [sortDescriptors addObject:sortDescriptor];
+        MR_AUTORELEASE(sortDescriptor);
+    }
+
+	[request setSortDescriptors:sortDescriptors];
+    MR_AUTORELEASE(sortDescriptors);
+
 	return request;
 }
 
@@ -400,10 +400,7 @@ + (NSFetchedResultsController *) MR_fetchController:(NSFetchRequest *)request de
                                           sectionNameKeyPath:groupKeyPath
                                                    cacheName:cacheName];
     controller.delegate = delegate;
-
-#ifndef NS_AUTOMATED_REFCOUNT_UNAVAILABLE
-    [controller autorelease];
-#endif
+    MR_AUTORELEASE(controller);
 
     return controller;
 }

diff --git a/Source/Categories/NSManagedObjectContext+MagicalRecord.m b/Source/Categories/NSManagedObjectContext+MagicalRecord.m
@@ -217,10 +217,7 @@ + (NSManagedObjectContext *) MR_contextWithStoreCoordinator:(NSPersistentStoreCo
         ARLog(@"Creating MOContext %@", [NSThread isMainThread] ? @" *** On Main Thread ***" : @"");
         context = [[NSManagedObjectContext alloc] init];
         [context setPersistentStoreCoordinator:coordinator];
-
-#ifndef NS_AUTOMATED_REFCOUNT_UNAVAILABLE
-        [context autorelease];
-#endif
+        MR_AUTORELEASE(context);
     }
     return context;
 }

diff --git a/Source/Categories/NSManagedObjectModel+MagicalRecord.m b/Source/Categories/NSManagedObjectModel+MagicalRecord.m
@@ -41,9 +41,7 @@ + (NSManagedObjectModel *) MR_mergedObjectModelFromMainBundle;
 + (NSManagedObjectModel *) MR_newManagedObjectModel 
 {
     NSManagedObjectModel *model = [self MR_mergedObjectModelFromMainBundle];
-#ifndef NS_AUTOMATED_REFCOUNT_UNAVAILABLE
-    [model autorelease];
-#endif
+    MR_AUTORELEASE(model);
     return model;
 }
 
@@ -72,9 +70,7 @@ + (NSManagedObjectModel *) MR_newManagedObjectModelNamed:(NSString *)modelFileNa
 + (NSManagedObjectModel *) MR_managedObjectModelNamed:(NSString *)modelFileName
 {
     NSManagedObjectModel *model = [self MR_newManagedObjectModelNamed:modelFileName];
-#ifndef NS_AUTOMATED_REFCOUNT_UNAVAILABLE
-    [model autorelease];
-#endif
+    MR_AUTORELEASE(model);
 	return model;
 }
 

diff --git a/Source/Categories/NSPersistentStore+MagicalRecord.m b/Source/Categories/NSPersistentStore+MagicalRecord.m
@@ -49,10 +49,7 @@ + (NSURL *) MR_urlForStoreName:(NSString *)storeFileName
 {
 	NSArray *paths = [NSArray arrayWithObjects:[self MR_applicationDocumentsDirectory], [self MR_applicationStorageDirectory], nil];
     NSFileManager *fm = [[NSFileManager alloc] init];
-
-#ifndef NS_AUTOMATED_REFCOUNT_UNAVAILABLE
-    [fm autorelease];
-#endif
+    MR_AUTORELEASE(fm);
 
     for (NSString *path in paths) 
     {

diff --git a/Source/Categories/NSPersistentStoreCoordinator+MagicalRecord.m b/Source/Categories/NSPersistentStoreCoordinator+MagicalRecord.m
@@ -78,10 +78,7 @@ + (NSPersistentStoreCoordinator *) MR_coordinatorWithPersitentStore:(NSPersisten
     NSPersistentStoreCoordinator *psc = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel:model];
 
     [psc MR_setupSqliteStoreNamed:[persistentStore URL] withOptions:nil];
-
-#ifndef NS_AUTOMATED_REFCOUNT_UNAVAILABLE
-    [psc autorelease];
-#endif
+    MR_AUTORELEASE(psc);
     return psc;
 }
 
@@ -91,10 +88,7 @@ + (NSPersistentStoreCoordinator *) MR_coordinatorWithSqliteStoreNamed:(NSString
     NSPersistentStoreCoordinator *psc = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel:model];
 
     [psc MR_setupSqliteStoreNamed:storeFileName withOptions:options];
-
-#ifndef NS_AUTOMATED_REFCOUNT_UNAVAILABLE
-    [psc autorelease];
-#endif
+    MR_AUTORELEASE(psc);
     return psc;
 }
 
@@ -125,11 +119,8 @@ + (NSPersistentStoreCoordinator *) MR_coordinatorWithAutoMigratingSqliteStoreNam
     {
         [coordinator performSelector:@selector(MR_setupAutoMigratingSqliteStoreNamed:) withObject:storeFileName afterDelay:0.5];
     }
-#ifndef NS_AUTOMATED_REFCOUNT_UNAVAILABLE
-    [coordinator autorelease];
-#endif
+    MR_AUTORELEASE(coordinator);
     return coordinator;
-
 }
 
 + (NSPersistentStoreCoordinator *) MR_coordinatorWithInMemoryStore
@@ -138,12 +129,9 @@ + (NSPersistentStoreCoordinator *) MR_coordinatorWithInMemoryStore
 	NSPersistentStoreCoordinator *psc = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel:model];
 
     [psc MR_addInMemoryStore];
+    MR_AUTORELEASE(coordinator);
 
-#ifndef NS_AUTOMATED_REFCOUNT_UNAVAILABLE
-    [psc autorelease];
-#endif
     return psc;
-
 }
 
 - (NSPersistentStore *) MR_addInMemoryStore
@@ -164,9 +152,7 @@ - (NSPersistentStore *) MR_addInMemoryStore
 + (NSPersistentStoreCoordinator *) MR_newPersistentStoreCoordinator
 {
 	NSPersistentStoreCoordinator *coordinator = [self MR_coordinatorWithSqliteStoreNamed:kMagicalRecordDefaultStoreFileName];
-#ifndef NS_AUTOMATED_REFCOUNT_UNAVAILABLE
-    [coordinator retain];
-#endif
+    MR_RETAIN(coordinator);
     return coordinator;
 
 }

diff --git a/Source/CoreData+MagicalRecord.h b/Source/CoreData+MagicalRecord.h
@@ -14,6 +14,16 @@
 
 #import <CoreData/CoreData.h>
 
+#ifndef NS_AUTOMATED_REFCOUNT_UNAVAILABLE
+#define MR_RETAIN(xx)           [xx retain];
+#define MR_RELEASE(xx)          [xx release];
+#define MR_AUTORELEASE(xx)      [xx autorelease];
+#else
+#define MR_RETAIN(xx)  ((void)0)
+#define MR_RELEASE(xx)  ((void)0)
+#define MR_AUTORELEASE(xx)  ((void)0)
+#endif
+
 #ifdef MR_SHORTHAND
 #import "MagicalRecordShorthand.h"
 #endif