v0.2.8 - Do not use magical record shorthands which causes bogus app …

…store rejection
collectionslabs · Sep 23, 2014 · 30a69f7 · 30a69f7
1 parent 19da5fe
commit 30a69f7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/CLToolkit.podspec b/CLToolkit.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         =  'CLToolkit'
-  s.version      =  '0.2.7'
+  s.version      =  '0.2.8'
   s.summary      =  'CLToolkit is a collections of common macros, classes and utilities for Mac / iOS.'
   s.homepage     =  'https://github.com/collections/CLToolkit'
   s.author       =  { 'Tony Xiao' => '[email protected]' }
@@ -61,7 +61,7 @@ Pod::Spec.new do |s|
 
     ss.dependency 'CLToolkit/Core'
     ss.dependency 'CLToolkit/Operation'
-    ss.dependency 'MagicalRecord/Shorthand', '~> 2.2'
+    ss.dependency 'MagicalRecord', '~> 2.2'
     ss.dependency 'Base64', '~> 1.0'
   end
 

diff --git a/CLToolkit/CoreData/CoreData.h b/CLToolkit/CoreData/CoreData.h
@@ -9,7 +9,6 @@
 #ifndef CLToolkit_CoreData_h
 #define CLToolkit_CoreData_h
 
-#define MR_SHORTHAND
 #import <CoreData/CoreData.h>
 #import <MagicalRecord/CoreData+MagicalRecord.h>
 #import "Core.h"

diff --git a/CLToolkit/CoreData/MagicalRecord+Reactive.m b/CLToolkit/CoreData/MagicalRecord+Reactive.m
@@ -84,19 +84,19 @@ - (RACSignal *)performBlockAndSave:(void (^)())block {
 
 - (RACSignal *)saveToPersistentStore {
     return [RACSubject mr_subject:^(MRCompletionHandler completionBlock) {
-        [self saveToPersistentStoreWithCompletion:completionBlock];
+        [self MR_saveToPersistentStoreWithCompletion:completionBlock];
     }];
 }
 
 - (RACSignal *)saveOnlySelf {
     return [RACSubject mr_subject:^(MRCompletionHandler completionBlock) {
-        [self saveOnlySelfWithCompletion:completionBlock];
+        [self MR_saveOnlySelfWithCompletion:completionBlock];
     }];
 }
 
 - (RACSignal *)saveWithOptions:(MRSaveContextOptions)mask {
     return [RACSubject mr_subject:^(MRCompletionHandler completionBlock) {
-        return [self saveWithOptions:mask completion:completionBlock];
+        return [self MR_saveWithOptions:mask completion:completionBlock];
     }];
 }
 

diff --git a/CLToolkit/Firebase/FObject.m b/CLToolkit/Firebase/FObject.m
@@ -168,7 +168,7 @@ - (void)bindFirebase {
         if (!self->_disposable) return; // Firebase remove observer bug
 
         if (snap.value == [NSNull null])
-            [self deleteEntity];
+            [self MR_deleteEntity];
     }]];
     [disposables addObject:[[self onPrepareDelete] subscribeNext:^(id x) {
         [self.ref removeValue];
@@ -245,7 +245,7 @@ - (void)didTurnIntoFault {
 #pragma mark Class Methods
 
 + (instancetype)findByFPath:(NSString *)fPath {
-    return [self findByFPath:fPath inContext:[NSManagedObjectContext defaultContext]];
+    return [self findByFPath:fPath inContext:[NSManagedObjectContext MR_defaultContext]];
 }
 
 + (instancetype)findByFPath:(NSString *)fPath inContext:(NSManagedObjectContext *)context {
@@ -271,7 +271,7 @@ + (instancetype)findByFPath:(NSString *)fPath inContext:(NSManagedObjectContext
 }
 
 + (NSEntityDescription *)entityForFPath:(NSString *)fPath {
-    for (NSEntityDescription *entity in [[NSManagedObjectModel defaultManagedObjectModel] entities]) {
+    for (NSEntityDescription *entity in [[NSManagedObjectModel MR_defaultManagedObjectModel] entities]) {
         NSString *entityName = [[entity.name.lowercaseString $append:@"s"] sliceFrom:1];
         if ([[fPath sliceFrom:1] hasPrefix:entityName])
             return entity;