kylefang/MagicalRecord
1
0
Fork 0
mirror of https://github.com/zhigang1992/MagicalRecord.git synced 2026-04-29 12:35:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/magicalpanda/MagicalRecord

Browse Source
This commit is contained in:
Brian Doig
2012-02-22 10:32:48 -08:00
parent bf3bab1782 3c03715da2
commit fddba06635
14 changed files with 391 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -16,4 +16,5 @@ build/
UserInterfaceState.xcuserstate
/Magical Record.xcodeproj/project.xcworkspace/xcuserdata/saul.xcuserdatad/UserInterfaceState.xcuserstate
/Magical Record.xcodeproj/xcuserdata/saul.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
/Magical Record.xcodeproj/xcuserdata/saul.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
/Magical Record.xcodeproj/xcuserdata/gfurman.xcuserdatad

32
Magical Record.xcodeproj/project.pbxproj
View File

@@ -129,6 +129,11 @@
C7E736DF1402FE64005657C9 /* SingleEntityWithNoRelationships.json in Resources */ = {isa = PBXBuildFile; fileRef = C7E736DE1402FE64005657C9 /* SingleEntityWithNoRelationships.json */; };
C7F5EEB2148DC76700964607 /* NSObject+MagicalDataImport.m in Sources */ = {isa = PBXBuildFile; fileRef = C7F5EEB1148DC76700964607 /* NSObject+MagicalDataImport.m */; };
C7F5EEB3148DC76700964607 /* NSObject+MagicalDataImport.m in Sources */ = {isa = PBXBuildFile; fileRef = C7F5EEB1148DC76700964607 /* NSObject+MagicalDataImport.m */; };
FD73E53F14AC462F00922CA4 /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C721C84313D0C6460097AB6F /* OCMock.framework */; };
FD73E54214AC484100922CA4 /* MappedEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = FD73E54114AC484100922CA4 /* MappedEntity.m */; };
FD73E54514AC485300922CA4 /* _MappedEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = FD73E54414AC485300922CA4 /* _MappedEntity.m */; };
FD73E54614AC4AC700922CA4 /* MagicalDataImportTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = C7913B9C13FAFC13007E09CC /* MagicalDataImportTestCase.m */; };
FD73E54914AC4D9A00922CA4 /* OCMock.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = FD73E54814AC4D9A00922CA4 /* OCMock.framework */; };
/* End PBXBuildFile section */
/* Begin PBXBuildRule section */
@@ -177,6 +182,16 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
FD73E54714AC4D5200922CA4 /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
FD73E54914AC4D9A00922CA4 /* OCMock.framework in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
@@ -350,6 +365,11 @@
C7E736DE1402FE64005657C9 /* SingleEntityWithNoRelationships.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = SingleEntityWithNoRelationships.json; path = "Unit Tests/Fixtures/SingleEntityWithNoRelationships.json"; sourceTree = "<group>"; };
C7F5EEB0148DC76700964607 /* NSObject+MagicalDataImport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSObject+MagicalDataImport.h"; path = "DataImport/NSObject+MagicalDataImport.h"; sourceTree = "<group>"; };
C7F5EEB1148DC76700964607 /* NSObject+MagicalDataImport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSObject+MagicalDataImport.m"; path = "DataImport/NSObject+MagicalDataImport.m"; sourceTree = "<group>"; };
FD73E54014AC484100922CA4 /* MappedEntity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MappedEntity.h; sourceTree = "<group>"; };
FD73E54114AC484100922CA4 /* MappedEntity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MappedEntity.m; sourceTree = "<group>"; };
FD73E54314AC485300922CA4 /* _MappedEntity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _MappedEntity.h; sourceTree = "<group>"; };
FD73E54414AC485300922CA4 /* _MappedEntity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = _MappedEntity.m; sourceTree = "<group>"; };
FD73E54814AC4D9A00922CA4 /* OCMock.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OCMock.framework; path = "Mac App Unit Tests/Frameworks/OCMock.framework"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -361,6 +381,7 @@
C721C82413D0C45E0097AB6F /* Foundation.framework in Frameworks */,
C76AF7F213DBC12500CE2E05 /* OCHamcrest.framework in Frameworks */,
C721C84E13D0C6460097AB6F /* GHUnit.framework in Frameworks */,
FD73E53F14AC462F00922CA4 /* OCMock.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -405,6 +426,7 @@
C721C7A013D0A3750097AB6F = {
isa = PBXGroup;
children = (
FD73E54814AC4D9A00922CA4 /* OCMock.framework */,
C75C7D69147220D300D0C2FE /* generateShorthandFile.rb */,
C721C85513D0C7030097AB6F /* Source */,
C77E5FA513D0CBA600298F87 /* Unit Tests */,
@@ -718,6 +740,10 @@
C7BD885113DBF88F00274567 /* TestEntities */ = {
isa = PBXGroup;
children = (
FD73E54314AC485300922CA4 /* _MappedEntity.h */,
FD73E54414AC485300922CA4 /* _MappedEntity.m */,
FD73E54014AC484100922CA4 /* MappedEntity.h */,
FD73E54114AC484100922CA4 /* MappedEntity.m */,
C7BD885213DBF88F00274567 /* _AbstractRelatedEntity.h */,
C7BD885313DBF88F00274567 /* _AbstractRelatedEntity.m */,
C7BD885413DBF88F00274567 /* _ConcreteRelatedEntity.h */,
@@ -796,6 +822,7 @@
C721C7DA13D0C3A00097AB6F /* Resources */,
C753897513DB6310002B2F57 /* Copy GHUnit into App Bundle */,
C76AF7F313DBC33100CE2E05 /* Copy OCHamcrest into App Bundle */,
FD73E54714AC4D5200922CA4 /* CopyFiles */,
);
buildRules = (
);
@@ -902,7 +929,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "cd \"Unit Tests/Fixtures/Mac\" && mogenerator -m TestModel.xcdatamodeld/TestModel.xcdatamodel -O TestEntities";
shellScript = "cd \"Unit Tests/Fixtures/Mac\" && /usr/local/bin/mogenerator -m TestModel.xcdatamodeld/TestModel.xcdatamodel -O TestEntities";
};
C7B8733A1472CFA20046776C /* Generate Shorthand Headers */ = {
isa = PBXShellScriptBuildPhase;
@@ -946,6 +973,7 @@
C721C87213D0C7030097AB6F /* NSPersistentStore+MagicalRecord.m in Sources */,
C721C87413D0C7030097AB6F /* NSPersistentStoreCoordinator+MagicalRecord.m in Sources */,
C76AF7F713DBD63E00CE2E05 /* NSManagedObject+MagicalDataImport.m in Sources */,
FD73E54614AC4AC700922CA4 /* MagicalDataImportTestCase.m in Sources */,
C721C87613D0C7030097AB6F /* MagicalRecordHelpers.m in Sources */,
C753897413DB61CE002B2F57 /* GHUnitTestMain.m in Sources */,
C76AF7E513DBC08F00CE2E05 /* FixtureHelpers.m in Sources */,
@@ -974,6 +1002,8 @@
C7005F2214153A060061B9F4 /* NSEntityDescription+MagicalDataImport.m in Sources */,
C7F5EEB2148DC76700964607 /* NSObject+MagicalDataImport.m in Sources */,
C758AFD51493C6DC0051E570 /* NSString+MagicalDataImport.m in Sources */,
FD73E54214AC484100922CA4 /* MappedEntity.m in Sources */,
FD73E54514AC485300922CA4 /* _MappedEntity.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

5
Magical Record.xcodeproj/xcuserdata/gfurman.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
type = "1"
version = "1.0">
</Bucket>

19
Magical Record.xcodeproj/xcuserdata/gfurman.xcuserdatad/xcschemes/xcschememanagement.plist Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>C721C7DB13D0C3A00097AB6F</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>C721C7FC13D0C3CD0097AB6F</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>

14
README.md
View File

@@ -41,6 +41,20 @@ Each call instantiates one of each piece of the Core Data stack, and provides ge
And, before your app exits, you can use the clean up method:
[MagicalRecordHelpers cleanUp];
## iCloud Support
Apps built for iOS5+ and OSX Lion 10.7.2+ can take advantage of iCloud to sync Core Data stores. To implement this functionality with Magical Record, use **one** of the following setup calls instead of those listed in the previous section:
+ (void) setupCoreDataStackWithiCloudContainer:(NSString *)icloudBucket localStoreNamed:(NSString *)localStore;
+ (void) setupCoreDataStackWithiCloudContainer:(NSString *)containerID contentNameKey:(NSString *)contentNameKey localStoreNamed:(NSString *)localStoreName cloudStorePathComponent:(NSString *)pathSubcomponent;
+ (void) setupCoreDataStackWithiCloudContainer:(NSString *)containerID contentNameKey:(NSString *)contentNameKey localStoreNamed:(NSString *)localStoreName cloudStorePathComponent:(NSString *)pathSubcomponent completion:(void(^)(void))completion;
For further details, and to ensure that your application is suitable for iCloud, please see [Apple's iCloud Notes](https://developer.apple.com/library/ios/#releasenotes/DataManagement/RN-iCloudCoreData/_index.html).
In particular note that the first helper method, + (void) setupCoreDataStackWithiCloudContainer:(NSString *)icloudBucket localStoreNamed:(NSString *)localStore, automatically generates the **NSPersistentStoreUbiquitousContentNameKey** based on your application's Bundle Identifier.
If you are managing multiple different iCloud stores it is highly recommended that you use one of the other helper methods to specify your own **contentNameKey**
### Default Managed Object Context

60
Rakefile Normal file
View File

@@ -0,0 +1,60 @@
@ios_fixtures = "Unit Tests/Fixtures/iOS"
@target = ""
@project = ""
@fixtures = ""
namespace :setup do
task :ios do
end
task :osx do
@target = "Mac App Unit Tests"
@project = "Magical Record.xcodeproj"
@fixtures = "Unit Tests/Fixtures/Mac"
end
end
namespace :clean do
task :osx => ["setup:osx"] do
rm_rf "#{@fixtures}/TestEntities"
end
end
namespace :build do
task :run do
results = system("xcodebuild -project '#{@project}' -target '#{@target}'")
puts results
end
namespace :db do
task :create do
Dir.chdir(@fixtures) do
puts `/usr/local/bin/mogenerator -m TestModel.xcdatamodeld/TestModel.xcdatamodel -O TestEntities`
end
end
end
task :osx => ["setup:osx", "clean:osx", "build:db:create", "build:run"]
task :ios => [] do
end
end
namespace :test do
task :osx => ["build:osx"] do
puts "testing osx"
end
task :ios do
puts "testing ios"
end
end
task :test => ["test:osx", "test:ios"]
task :default => :test

3
Source/MagicalRecordHelpers.m
View File

@@ -197,7 +197,8 @@ void replaceSelectorForTargetWithSourceImpAndSwizzle(Class originalClass, SEL or
+ (void) setupCoreDataStackWithiCloudContainer:(NSString *)icloudBucket localStoreNamed:(NSString *)localStore;
{
[self setupCoreDataStackWithiCloudContainer:icloudBucket contentNameKey:nil localStoreNamed:localStore cloudStorePathComponent:nil];
NSString *contentNameKey = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleIdentifier"];
[self setupCoreDataStackWithiCloudContainer:icloudBucket contentNameKey:contentNameKey localStoreNamed:localStore cloudStorePathComponent:nil];
}
+ (void) setupCoreDataStackWithiCloudContainer:(NSString *)containerID contentNameKey:(NSString *)contentNameKey localStoreNamed:(NSString *)localStoreName cloudStorePathComponent:(NSString *)pathSubcomponent;

5
Unit Tests/Fixtures/Mac/TestEntities/MappedEntity.h Normal file
View File

@@ -0,0 +1,5 @@
#import "_MappedEntity.h"
@interface MappedEntity : _MappedEntity {}
// Custom logic goes here.
@end

7
Unit Tests/Fixtures/Mac/TestEntities/MappedEntity.m Normal file
View File

@@ -0,0 +1,7 @@
#import "MappedEntity.h"
@implementation MappedEntity
// Custom logic goes here.
@end

105
Unit Tests/Fixtures/Mac/TestEntities/_MappedEntity.h Normal file
View File

@@ -0,0 +1,105 @@
// DO NOT EDIT. This file is machine-generated and constantly overwritten.
// Make changes to MappedEntity.h instead.
#import <CoreData/CoreData.h>
@interface MappedEntityID : NSManagedObjectID {}
@end
@interface _MappedEntity : NSManagedObject {}
+ (id)insertInManagedObjectContext:(NSManagedObjectContext*)moc_;
+ (NSString*)entityName;
+ (NSEntityDescription*)entityInManagedObjectContext:(NSManagedObjectContext*)moc_;
- (MappedEntityID*)objectID;
@property (nonatomic, retain) NSNumber *mappedEntityID;
@property short mappedEntityIDValue;
- (short)mappedEntityIDValue;
- (void)setMappedEntityIDValue:(short)value_;
//- (BOOL)validateMappedEntityID:(id*)value_ error:(NSError**)error_;
@property (nonatomic, retain) NSString *nestedAttribute;
//- (BOOL)validateNestedAttribute:(id*)value_ error:(NSError**)error_;
@property (nonatomic, retain) NSString *sampleAttribute;
//- (BOOL)validateSampleAttribute:(id*)value_ error:(NSError**)error_;
@property (nonatomic, retain) NSNumber *testMappedEntityID;
@property long long testMappedEntityIDValue;
- (long long)testMappedEntityIDValue;
- (void)setTestMappedEntityIDValue:(long long)value_;
//- (BOOL)validateTestMappedEntityID:(id*)value_ error:(NSError**)error_;
@end
@interface _MappedEntity (CoreDataGeneratedAccessors)
@end
@interface _MappedEntity (CoreDataGeneratedPrimitiveAccessors)
- (NSNumber*)primitiveMappedEntityID;
- (void)setPrimitiveMappedEntityID:(NSNumber*)value;
- (short)primitiveMappedEntityIDValue;
- (void)setPrimitiveMappedEntityIDValue:(short)value_;
- (NSString*)primitiveNestedAttribute;
- (void)setPrimitiveNestedAttribute:(NSString*)value;
- (NSString*)primitiveSampleAttribute;
- (void)setPrimitiveSampleAttribute:(NSString*)value;
- (NSNumber*)primitiveTestMappedEntityID;
- (void)setPrimitiveTestMappedEntityID:(NSNumber*)value;
- (long long)primitiveTestMappedEntityIDValue;
- (void)setPrimitiveTestMappedEntityIDValue:(long long)value_;
@end

117
Unit Tests/Fixtures/Mac/TestEntities/_MappedEntity.m Normal file
View File

@@ -0,0 +1,117 @@
// DO NOT EDIT. This file is machine-generated and constantly overwritten.
// Make changes to MappedEntity.m instead.
#import "_MappedEntity.h"
@implementation MappedEntityID
@end
@implementation _MappedEntity
+ (id)insertInManagedObjectContext:(NSManagedObjectContext*)moc_ {
NSParameterAssert(moc_);
return [NSEntityDescription insertNewObjectForEntityForName:@"MappedEntity" inManagedObjectContext:moc_];
}
+ (NSString*)entityName {
return @"MappedEntity";
}
+ (NSEntityDescription*)entityInManagedObjectContext:(NSManagedObjectContext*)moc_ {
NSParameterAssert(moc_);
return [NSEntityDescription entityForName:@"MappedEntity" inManagedObjectContext:moc_];
}
- (MappedEntityID*)objectID {
return (MappedEntityID*)[super objectID];
}
+ (NSSet *)keyPathsForValuesAffectingValueForKey:(NSString *)key {
NSSet *keyPaths = [super keyPathsForValuesAffectingValueForKey:key];
if ([key isEqualToString:@"mappedEntityIDValue"]) {
NSSet *affectingKey = [NSSet setWithObject:@"mappedEntityID"];
keyPaths = [keyPaths setByAddingObjectsFromSet:affectingKey];
}
if ([key isEqualToString:@"testMappedEntityIDValue"]) {
NSSet *affectingKey = [NSSet setWithObject:@"testMappedEntityID"];
keyPaths = [keyPaths setByAddingObjectsFromSet:affectingKey];
}
return keyPaths;
}
@dynamic mappedEntityID;
- (short)mappedEntityIDValue {
NSNumber *result = [self mappedEntityID];
return [result shortValue];
}
- (void)setMappedEntityIDValue:(short)value_ {
[self setMappedEntityID:[NSNumber numberWithShort:value_]];
}
- (short)primitiveMappedEntityIDValue {
NSNumber *result = [self primitiveMappedEntityID];
return [result shortValue];
}
- (void)setPrimitiveMappedEntityIDValue:(short)value_ {
[self setPrimitiveMappedEntityID:[NSNumber numberWithShort:value_]];
}
@dynamic nestedAttribute;
@dynamic sampleAttribute;
@dynamic testMappedEntityID;
- (long long)testMappedEntityIDValue {
NSNumber *result = [self testMappedEntityID];
return [result longLongValue];
}
- (void)setTestMappedEntityIDValue:(long long)value_ {
[self setTestMappedEntityID:[NSNumber numberWithLongLong:value_]];
}
- (long long)primitiveTestMappedEntityIDValue {
NSNumber *result = [self primitiveTestMappedEntityID];
return [result longLongValue];
}
- (void)setPrimitiveTestMappedEntityIDValue:(long long)value_ {
[self setPrimitiveTestMappedEntityID:[NSNumber numberWithLongLong:value_]];
}
@end

20
Unit Tests/Fixtures/Mac/TestModel.xcdatamodeld/TestModel.xcdatamodel/contents
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<model name="" userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="851" systemVersion="11A511" minimumToolsVersion="Automatic" macOSVersion="Automatic" iOSVersion="Automatic">
<model name="" userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="878" systemVersion="11C74" minimumToolsVersion="Automatic" macOSVersion="Automatic" iOSVersion="Automatic">
<entity name="AbstractRelatedEntity" representedClassName="AbstractRelatedEntity" isAbstract="YES">
<attribute name="sampleBaseAttribute" optional="YES" attributeType="String"/>
<relationship name="mainTestEntity" optional="YES" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="SingleRelatedEntity" inverseName="testRelationship" inverseEntity="SingleRelatedEntity"/>
@@ -8,6 +8,23 @@
<attribute name="sampleConcreteAttribute" optional="YES" attributeType="String"/>
</entity>
<entity name="EntityWithDiffernentClassName" representedClassName="DifferentClassNameMapping"/>
<entity name="MappedEntity" representedClassName="MappedEntity">
<attribute name="mappedEntityID" optional="YES" attributeType="Integer 16" defaultValueString="0"/>
<attribute name="nestedAttribute" optional="YES" attributeType="String">
<userInfo>
<entry key="mappedKeyName" value="attributeValue.nestedValue"/>
</userInfo>
</attribute>
<attribute name="sampleAttribute" optional="YES" attributeType="String"/>
<attribute name="testMappedEntityID" optional="YES" attributeType="Integer 64" defaultValueString="0">
<userInfo>
<entry key="mappedKeyName" value="id"/>
</userInfo>
</attribute>
<userInfo>
<entry key="primaryAttributeKey" value="mapped"/>
</userInfo>
</entity>
<entity name="SingleEntityWithNoRelationships" representedClassName="SingleEntityWithNoRelationships">
<attribute name="booleanTestAttribute" optional="YES" attributeType="Boolean"/>
<attribute name="colorTestAttribute" optional="YES" attributeType="Transformable">
@@ -33,5 +50,6 @@
<element name="EntityWithDiffernentClassName" positionX="-540" positionY="-1665" width="173" height="45"/>
<element name="SingleEntityWithNoRelationships" positionX="-108" positionY="-1521" width="180" height="195"/>
<element name="SingleRelatedEntity" positionX="-362" positionY="-149631" width="128" height="60"/>
<element name="MappedEntity" positionX="160" positionY="192" width="128" height="105"/>
</elements>
</model>

5
Unit Tests/MagicalDataImportTestCase.h
View File

@@ -6,8 +6,11 @@
// Copyright (c) 2011 Magical Panda Software LLC. All rights reserved.
//
#ifdef MAC_PLATFORM_ONLY
#import <GHUnit/GHUnit.h>
#else
#import <GHUnitIOS/GHUnit.h>
#endif
@interface MagicalDataImportTestCase : GHTestCase
@property (nonatomic, retain) id testEntityData;

1
Unit Tests/MagicalRecordHelperTests.m
View File

@@ -7,6 +7,7 @@
//
#import "MagicalRecordHelperTests.h"
#import "OCMockObject.h"
@protocol MagicalRecordErrorHandlerProtocol <NSObject>