From 8361ba1b532295e459f64d321807cd9601335922 Mon Sep 17 00:00:00 2001 From: John Rommel Estropia Date: Wed, 27 May 2015 22:51:02 +0900 Subject: [PATCH] Renaming project because of cocoapods name clash with HardcoreData :( --- .../project.pbxproj | 152 +++++++++--------- .../contents.xcworkspacedata | 2 +- .../xcshareddata/CoreStore.xccheckout | 53 ++++++ .../xcshareddata/HardcoreData.xccheckout | 0 .../WorkspaceSettings.xcsettings | 0 .../xcschemes/CoreStore.xcscheme | 110 +++++++++++++ .../xcschemes/xcschememanagement.plist | 27 ++++ .../NSManagedObject+Convenience.swift | 4 +- .../HardcoreData.h => CoreStore/CoreStore.h | 8 +- .../CoreStore.swift | 14 +- .../BaseDataTransaction+Querying.swift | 36 ++--- .../Concrete Clauses/From.swift | 2 +- .../Concrete Clauses/GroupBy.swift | 4 +- .../Concrete Clauses/OrderBy.swift | 4 +- .../Concrete Clauses/Select.swift | 30 ++-- .../Concrete Clauses/Tweak.swift | 2 +- .../Concrete Clauses/Where.swift | 4 +- .../CoreStore+Querying.swift | 10 +- .../DataStack+Querying.swift | 30 ++-- .../Protocol Clauses/ClauseTypes.swift | 2 +- {HardcoreData => CoreStore}/Info.plist | 0 .../Internal/AssociatedObjects.swift | 4 +- .../NSManagedObject+Transaction.swift | 12 +- .../NSManagedObjectContext+CoreStore.swift | 10 +- .../NSManagedObjectContext+Querying.swift | 36 ++--- .../NSManagedObjectContext+Setup.swift | 6 +- .../NSManagedObjectContext+Transaction.swift | 10 +- .../Internal/NotificationObserver.swift | 2 +- .../Internal/WeakObject.swift | 2 +- .../Logging/CoreStore+Logging.swift | 14 +- .../Logging/CoreStoreLogger.swift | 16 +- .../Logging/DefaultLogger.swift | 10 +- .../NSError+CoreStore.swift | 34 ++-- .../Observing/CoreStore+Observing.swift | 10 +- .../Observing/DataStack+Observing.swift | 8 +- .../Observing/ManagedObjectController.swift | 12 +- .../ManagedObjectListController.swift | 20 +-- .../Observing/ManagedObjectListObserver.swift | 8 +- .../Observing/ManagedObjectObserver.swift | 4 +- .../AsynchronousDataTransaction.swift | 28 ++-- .../BaseDataTransaction.swift | 20 +-- .../CoreStore+Transaction.swift | 8 +- .../DataStack+Transaction.swift | 10 +- .../DetachedDataTransaction.swift | 4 +- .../Saving and Processing/SaveResult.swift | 12 +- .../SynchronousDataTransaction.swift | 22 +-- .../Setting Up/CoreStore+Setup.swift | 10 +- .../Setting Up/DataStack.swift | 30 ++-- .../Setting Up/PersistentStoreResult.swift | 12 +- .../CoreStoreDemo.xcodeproj}/project.pbxproj | 100 ++++++------ .../contents.xcworkspacedata | 2 +- .../xcshareddata/CoreStoreDemo.xccheckout | 53 ++++++ .../xcshareddata/HardcoreDataDemo.xccheckout | 0 .../xcschemes/CoreStoreDemo.xcscheme | 88 ++++++++++ .../xcschemes/xcschememanagement.plist | 22 +++ .../CoreStoreDemo}/AppDelegate.swift | 2 +- .../Base.lproj/LaunchScreen.xib | 2 +- .../CoreStoreDemo}/Base.lproj/Main.storyboard | 20 +-- .../CoreStoreDemo.xcdatamodel}/contents | 6 +- .../AppIcon.appiconset/Contents.json | 0 .../first.imageset/Contents.json | 0 .../Images.xcassets/first.imageset/first.pdf | Bin .../second.imageset/Contents.json | 0 .../second.imageset/second.pdf | Bin .../CoreStoreDemo}/Info.plist | 0 ...ObjectListObserverDemoViewController.swift | 14 +- .../ObjectObserverDemoViewController.swift | 24 +-- .../ObserversViewController.swift | 2 +- .../Palette.swift | 4 +- .../PaletteTableViewCell.swift | 2 +- .../Stack Setup Demo/FacebookAccount.swift | 2 +- .../StackSetupDemoViewController.swift | 8 +- .../Stack Setup Demo/TwitterAccount.swift | 2 +- .../Stack Setup Demo/UserAccount.swift | 2 +- .../Transactions Demo/Place.swift | 2 +- .../TransactionsDemoViewController.swift | 20 +-- .../CoreStoreTests.swift | 36 ++--- .../Info.plist | 0 .../Model.xcdatamodel/contents | 6 +- .../TestEntity1.swift | 2 +- .../TestEntity2.swift | 2 +- .../.xccurrentversion | 8 - README.md | 50 +++--- 83 files changed, 847 insertions(+), 502 deletions(-) rename {HardcoreData.xcodeproj => CoreStore.xcodeproj}/project.pbxproj (82%) rename {HardcoreData.xcodeproj => CoreStore.xcodeproj}/project.xcworkspace/contents.xcworkspacedata (69%) create mode 100644 CoreStore.xcodeproj/project.xcworkspace/xcshareddata/CoreStore.xccheckout rename {HardcoreData.xcodeproj => CoreStore.xcodeproj}/project.xcworkspace/xcshareddata/HardcoreData.xccheckout (100%) rename {HardcoreData.xcodeproj => CoreStore.xcodeproj}/project.xcworkspace/xcuserdata/johnestropia.xcuserdatad/WorkspaceSettings.xcsettings (100%) create mode 100644 CoreStore.xcodeproj/xcuserdata/johnestropia.xcuserdatad/xcschemes/CoreStore.xcscheme create mode 100644 CoreStore.xcodeproj/xcuserdata/johnestropia.xcuserdatad/xcschemes/xcschememanagement.plist rename {HardcoreData => CoreStore}/Convenience Helpers/NSManagedObject+Convenience.swift (99%) rename HardcoreData/HardcoreData.h => CoreStore/CoreStore.h (88%) rename HardcoreData/HardcoreData.swift => CoreStore/CoreStore.swift (90%) rename {HardcoreData => CoreStore}/Fetching and Querying/BaseDataTransaction+Querying.swift (84%) rename {HardcoreData => CoreStore}/Fetching and Querying/Concrete Clauses/From.swift (99%) rename {HardcoreData => CoreStore}/Fetching and Querying/Concrete Clauses/GroupBy.swift (92%) rename {HardcoreData => CoreStore}/Fetching and Querying/Concrete Clauses/OrderBy.swift (95%) rename {HardcoreData => CoreStore}/Fetching and Querying/Concrete Clauses/Select.swift (94%) rename {HardcoreData => CoreStore}/Fetching and Querying/Concrete Clauses/Tweak.swift (99%) rename {HardcoreData => CoreStore}/Fetching and Querying/Concrete Clauses/Where.swift (95%) rename HardcoreData/Fetching and Querying/HardcoreData+Querying.swift => CoreStore/Fetching and Querying/CoreStore+Querying.swift (99%) rename {HardcoreData => CoreStore}/Fetching and Querying/DataStack+Querying.swift (87%) rename {HardcoreData => CoreStore}/Fetching and Querying/Protocol Clauses/ClauseTypes.swift (98%) rename {HardcoreData => CoreStore}/Info.plist (100%) rename {HardcoreData => CoreStore}/Internal/AssociatedObjects.swift (98%) rename {HardcoreData => CoreStore}/Internal/NSManagedObject+Transaction.swift (92%) rename HardcoreData/Internal/NSManagedObjectContext+HardcoreData.swift => CoreStore/Internal/NSManagedObjectContext+CoreStore.swift (93%) rename {HardcoreData => CoreStore}/Internal/NSManagedObjectContext+Querying.swift (92%) rename {HardcoreData => CoreStore}/Internal/NSManagedObjectContext+Setup.swift (95%) rename {HardcoreData => CoreStore}/Internal/NSManagedObjectContext+Transaction.swift (96%) rename {HardcoreData => CoreStore}/Internal/NotificationObserver.swift (99%) rename {HardcoreData => CoreStore}/Internal/WeakObject.swift (98%) rename HardcoreData/Logging/HardcoreData+Logging.swift => CoreStore/Logging/CoreStore+Logging.swift (89%) rename HardcoreData/Logging/HardcoreDataLogger.swift => CoreStore/Logging/CoreStoreLogger.swift (81%) rename {HardcoreData => CoreStore}/Logging/DefaultLogger.swift (84%) rename HardcoreData/NSError+HardcoreData.swift => CoreStore/NSError+CoreStore.swift (62%) rename HardcoreData/Observing/HardcoreData+Observing.swift => CoreStore/Observing/CoreStore+Observing.swift (98%) rename {HardcoreData => CoreStore}/Observing/DataStack+Observing.swift (93%) rename {HardcoreData => CoreStore}/Observing/ManagedObjectController.swift (96%) rename {HardcoreData => CoreStore}/Observing/ManagedObjectListController.swift (97%) rename {HardcoreData => CoreStore}/Observing/ManagedObjectListObserver.swift (97%) rename {HardcoreData => CoreStore}/Observing/ManagedObjectObserver.swift (97%) rename {HardcoreData => CoreStore}/Saving and Processing/AsynchronousDataTransaction.swift (76%) rename {HardcoreData => CoreStore}/Saving and Processing/BaseDataTransaction.swift (83%) rename HardcoreData/Saving and Processing/HardcoreData+Transaction.swift => CoreStore/Saving and Processing/CoreStore+Transaction.swift (96%) rename {HardcoreData => CoreStore}/Saving and Processing/DataStack+Transaction.swift (88%) rename {HardcoreData => CoreStore}/Saving and Processing/DetachedDataTransaction.swift (93%) rename {HardcoreData => CoreStore}/Saving and Processing/SaveResult.swift (90%) rename {HardcoreData => CoreStore}/Saving and Processing/SynchronousDataTransaction.swift (77%) rename HardcoreData/Setting Up/HardcoreData+Setup.swift => CoreStore/Setting Up/CoreStore+Setup.swift (97%) rename {HardcoreData => CoreStore}/Setting Up/DataStack.swift (94%) rename {HardcoreData => CoreStore}/Setting Up/PersistentStoreResult.swift (90%) rename {HardcoreDataDemo/HardcoreDataDemo.xcodeproj => CoreStoreDemo/CoreStoreDemo.xcodeproj}/project.pbxproj (84%) rename {HardcoreDataDemo/HardcoreDataDemo.xcodeproj => CoreStoreDemo/CoreStoreDemo.xcodeproj}/project.xcworkspace/contents.xcworkspacedata (67%) create mode 100644 CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/xcshareddata/CoreStoreDemo.xccheckout rename {HardcoreDataDemo/HardcoreDataDemo.xcodeproj => CoreStoreDemo/CoreStoreDemo.xcodeproj}/project.xcworkspace/xcshareddata/HardcoreDataDemo.xccheckout (100%) create mode 100644 CoreStoreDemo/CoreStoreDemo.xcodeproj/xcuserdata/johnestropia.xcuserdatad/xcschemes/CoreStoreDemo.xcscheme create mode 100644 CoreStoreDemo/CoreStoreDemo.xcodeproj/xcuserdata/johnestropia.xcuserdatad/xcschemes/xcschememanagement.plist rename {HardcoreDataDemo/HardcoreDataDemo => CoreStoreDemo/CoreStoreDemo}/AppDelegate.swift (95%) rename {HardcoreDataDemo/HardcoreDataDemo => CoreStoreDemo/CoreStoreDemo}/Base.lproj/LaunchScreen.xib (93%) rename {HardcoreDataDemo/HardcoreDataDemo => CoreStoreDemo/CoreStoreDemo}/Base.lproj/Main.storyboard (98%) rename {HardcoreDataDemo/HardcoreDataDemo/HardcoreDataDemo.xcdatamodeld/HardcoreDataDemo.xcdatamodel => CoreStoreDemo/CoreStoreDemo/CoreStoreDemo.xcdatamodeld/CoreStoreDemo.xcdatamodel}/contents (89%) rename {HardcoreDataDemo/HardcoreDataDemo => CoreStoreDemo/CoreStoreDemo}/Images.xcassets/AppIcon.appiconset/Contents.json (100%) rename {HardcoreDataDemo/HardcoreDataDemo => CoreStoreDemo/CoreStoreDemo}/Images.xcassets/first.imageset/Contents.json (100%) rename {HardcoreDataDemo/HardcoreDataDemo => CoreStoreDemo/CoreStoreDemo}/Images.xcassets/first.imageset/first.pdf (100%) rename {HardcoreDataDemo/HardcoreDataDemo => CoreStoreDemo/CoreStoreDemo}/Images.xcassets/second.imageset/Contents.json (100%) rename {HardcoreDataDemo/HardcoreDataDemo => CoreStoreDemo/CoreStoreDemo}/Images.xcassets/second.imageset/second.pdf (100%) rename {HardcoreDataDemo/HardcoreDataDemo => CoreStoreDemo/CoreStoreDemo}/Info.plist (100%) rename {HardcoreDataDemo/HardcoreDataDemo => CoreStoreDemo/CoreStoreDemo}/List and Object Observers Demo/ObjectListObserverDemoViewController.swift (95%) rename {HardcoreDataDemo/HardcoreDataDemo => CoreStoreDemo/CoreStoreDemo}/List and Object Observers Demo/ObjectObserverDemoViewController.swift (86%) rename {HardcoreDataDemo/HardcoreDataDemo => CoreStoreDemo/CoreStoreDemo}/List and Object Observers Demo/ObserversViewController.swift (97%) rename {HardcoreDataDemo/HardcoreDataDemo => CoreStoreDemo/CoreStoreDemo}/List and Object Observers Demo/Palette.swift (98%) rename {HardcoreDataDemo/HardcoreDataDemo => CoreStoreDemo/CoreStoreDemo}/List and Object Observers Demo/PaletteTableViewCell.swift (93%) rename {HardcoreDataDemo/HardcoreDataDemo => CoreStoreDemo/CoreStoreDemo}/Stack Setup Demo/FacebookAccount.swift (92%) rename {HardcoreDataDemo/HardcoreDataDemo => CoreStoreDemo/CoreStoreDemo}/Stack Setup Demo/StackSetupDemoViewController.swift (97%) rename {HardcoreDataDemo/HardcoreDataDemo => CoreStoreDemo/CoreStoreDemo}/Stack Setup Demo/TwitterAccount.swift (92%) rename {HardcoreDataDemo/HardcoreDataDemo => CoreStoreDemo/CoreStoreDemo}/Stack Setup Demo/UserAccount.swift (94%) rename {HardcoreDataDemo/HardcoreDataDemo => CoreStoreDemo/CoreStoreDemo}/Transactions Demo/Place.swift (98%) rename {HardcoreDataDemo/HardcoreDataDemo => CoreStoreDemo/CoreStoreDemo}/Transactions Demo/TransactionsDemoViewController.swift (92%) rename HardcoreDataTests/HardcoreDataTests.swift => CoreStoreTests/CoreStoreTests.swift (91%) rename {HardcoreDataTests => CoreStoreTests}/Info.plist (100%) rename {HardcoreDataTests => CoreStoreTests}/Model.xcdatamodeld/Model.xcdatamodel/contents (86%) rename {HardcoreDataTests => CoreStoreTests}/TestEntity1.swift (98%) rename {HardcoreDataTests => CoreStoreTests}/TestEntity2.swift (98%) delete mode 100644 HardcoreDataDemo/HardcoreDataDemo/HardcoreDataDemo.xcdatamodeld/.xccurrentversion diff --git a/HardcoreData.xcodeproj/project.pbxproj b/CoreStore.xcodeproj/project.pbxproj similarity index 82% rename from HardcoreData.xcodeproj/project.pbxproj rename to CoreStore.xcodeproj/project.pbxproj index 4dd7175..823b1b2 100644 --- a/HardcoreData.xcodeproj/project.pbxproj +++ b/CoreStore.xcodeproj/project.pbxproj @@ -7,12 +7,12 @@ objects = { /* Begin PBXBuildFile section */ - 2F03A53619C5C6DA005002A5 /* HardcoreData.h in Headers */ = {isa = PBXBuildFile; fileRef = 2F03A53519C5C6DA005002A5 /* HardcoreData.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 2F03A54019C5C6DA005002A5 /* HardcoreDataTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F03A53F19C5C6DA005002A5 /* HardcoreDataTests.swift */; }; + 2F03A53619C5C6DA005002A5 /* CoreStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 2F03A53519C5C6DA005002A5 /* CoreStore.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 2F03A54019C5C6DA005002A5 /* CoreStoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F03A53F19C5C6DA005002A5 /* CoreStoreTests.swift */; }; 2F03A54D19C5C872005002A5 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F03A54C19C5C872005002A5 /* CoreData.framework */; }; - 2F291E2719C6D3CF007AF63F /* HardcoreData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F291E2619C6D3CF007AF63F /* HardcoreData.swift */; }; - B504D0D61B02362500B2BBB1 /* HardcoreData+Setup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B504D0D51B02362500B2BBB1 /* HardcoreData+Setup.swift */; }; - B5D1E22C19FA9FBC003B2874 /* NSError+HardcoreData.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D1E22B19FA9FBC003B2874 /* NSError+HardcoreData.swift */; }; + 2F291E2719C6D3CF007AF63F /* CoreStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F291E2619C6D3CF007AF63F /* CoreStore.swift */; }; + B504D0D61B02362500B2BBB1 /* CoreStore+Setup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B504D0D51B02362500B2BBB1 /* CoreStore+Setup.swift */; }; + B5D1E22C19FA9FBC003B2874 /* NSError+CoreStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D1E22B19FA9FBC003B2874 /* NSError+CoreStore.swift */; }; B5D372841A39CD6900F583D9 /* Model.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B5D372821A39CD6900F583D9 /* Model.xcdatamodeld */; }; B5D372861A39CDDB00F583D9 /* TestEntity1.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D372851A39CDDB00F583D9 /* TestEntity1.swift */; }; B5D39A0219FD00C9000E91BB /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5D39A0119FD00C9000E91BB /* Foundation.framework */; }; @@ -22,13 +22,13 @@ B5E84EDF1AFF84500064E85B /* DataStack.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EDB1AFF84500064E85B /* DataStack.swift */; }; B5E84EE11AFF84500064E85B /* PersistentStoreResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EDE1AFF84500064E85B /* PersistentStoreResult.swift */; }; B5E84EE61AFF84610064E85B /* DefaultLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EE31AFF84610064E85B /* DefaultLogger.swift */; }; - B5E84EE71AFF84610064E85B /* HardcoreData+Logging.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EE41AFF84610064E85B /* HardcoreData+Logging.swift */; }; - B5E84EE81AFF84610064E85B /* HardcoreDataLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EE51AFF84610064E85B /* HardcoreDataLogger.swift */; }; + B5E84EE71AFF84610064E85B /* CoreStore+Logging.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EE41AFF84610064E85B /* CoreStore+Logging.swift */; }; + B5E84EE81AFF84610064E85B /* CoreStoreLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EE51AFF84610064E85B /* CoreStoreLogger.swift */; }; B5E84EF41AFF846E0064E85B /* AsynchronousDataTransaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EEA1AFF846E0064E85B /* AsynchronousDataTransaction.swift */; }; B5E84EF51AFF846E0064E85B /* BaseDataTransaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EEB1AFF846E0064E85B /* BaseDataTransaction.swift */; }; B5E84EF61AFF846E0064E85B /* DataStack+Transaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EEC1AFF846E0064E85B /* DataStack+Transaction.swift */; }; B5E84EF71AFF846E0064E85B /* DetachedDataTransaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EED1AFF846E0064E85B /* DetachedDataTransaction.swift */; }; - B5E84EF81AFF846E0064E85B /* HardcoreData+Transaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EEE1AFF846E0064E85B /* HardcoreData+Transaction.swift */; }; + B5E84EF81AFF846E0064E85B /* CoreStore+Transaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EEE1AFF846E0064E85B /* CoreStore+Transaction.swift */; }; B5E84EFB1AFF846E0064E85B /* SaveResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EF21AFF846E0064E85B /* SaveResult.swift */; }; B5E84EFC1AFF846E0064E85B /* SynchronousDataTransaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EF31AFF846E0064E85B /* SynchronousDataTransaction.swift */; }; B5E84F0D1AFF847B0064E85B /* BaseDataTransaction+Querying.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EFE1AFF847B0064E85B /* BaseDataTransaction+Querying.swift */; }; @@ -39,9 +39,9 @@ B5E84F121AFF847B0064E85B /* OrderBy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F041AFF847B0064E85B /* OrderBy.swift */; }; B5E84F131AFF847B0064E85B /* Where.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F051AFF847B0064E85B /* Where.swift */; }; B5E84F141AFF847B0064E85B /* DataStack+Querying.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F061AFF847B0064E85B /* DataStack+Querying.swift */; }; - B5E84F151AFF847B0064E85B /* HardcoreData+Querying.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F071AFF847B0064E85B /* HardcoreData+Querying.swift */; }; + B5E84F151AFF847B0064E85B /* CoreStore+Querying.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F071AFF847B0064E85B /* CoreStore+Querying.swift */; }; B5E84F201AFF84860064E85B /* DataStack+Observing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F1A1AFF84860064E85B /* DataStack+Observing.swift */; }; - B5E84F211AFF84860064E85B /* HardcoreData+Observing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F1B1AFF84860064E85B /* HardcoreData+Observing.swift */; }; + B5E84F211AFF84860064E85B /* CoreStore+Observing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F1B1AFF84860064E85B /* CoreStore+Observing.swift */; }; B5E84F221AFF84860064E85B /* ManagedObjectController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F1C1AFF84860064E85B /* ManagedObjectController.swift */; }; B5E84F231AFF84860064E85B /* ManagedObjectListController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F1D1AFF84860064E85B /* ManagedObjectListController.swift */; }; B5E84F241AFF84860064E85B /* ManagedObjectListObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F1E1AFF84860064E85B /* ManagedObjectListObserver.swift */; }; @@ -49,7 +49,7 @@ B5E84F281AFF84920064E85B /* NSManagedObject+Convenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F271AFF84920064E85B /* NSManagedObject+Convenience.swift */; }; B5E84F2E1AFF849C0064E85B /* AssociatedObjects.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F2A1AFF849C0064E85B /* AssociatedObjects.swift */; }; B5E84F2F1AFF849C0064E85B /* NotificationObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F2B1AFF849C0064E85B /* NotificationObserver.swift */; }; - B5E84F301AFF849C0064E85B /* NSManagedObjectContext+HardcoreData.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F2C1AFF849C0064E85B /* NSManagedObjectContext+HardcoreData.swift */; }; + B5E84F301AFF849C0064E85B /* NSManagedObjectContext+CoreStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F2C1AFF849C0064E85B /* NSManagedObjectContext+CoreStore.swift */; }; B5E84F311AFF849C0064E85B /* WeakObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F2D1AFF849C0064E85B /* WeakObject.swift */; }; B5E84F361AFF85470064E85B /* NSManagedObjectContext+Setup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F321AFF85470064E85B /* NSManagedObjectContext+Setup.swift */; }; B5E84F371AFF85470064E85B /* NSManagedObjectContext+Transaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F331AFF85470064E85B /* NSManagedObjectContext+Transaction.swift */; }; @@ -64,7 +64,7 @@ containerPortal = 2F03A52719C5C6DA005002A5 /* Project object */; proxyType = 1; remoteGlobalIDString = 2F03A52F19C5C6DA005002A5; - remoteInfo = HardcoreData; + remoteInfo = CoreStore; }; B5D808011A34715700A44484 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -83,16 +83,16 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 2F03A53019C5C6DA005002A5 /* HardcoreData.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = HardcoreData.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 2F03A53019C5C6DA005002A5 /* CoreStore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CoreStore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 2F03A53419C5C6DA005002A5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 2F03A53519C5C6DA005002A5 /* HardcoreData.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HardcoreData.h; sourceTree = ""; }; - 2F03A53B19C5C6DA005002A5 /* HardcoreDataTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = HardcoreDataTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 2F03A53519C5C6DA005002A5 /* CoreStore.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CoreStore.h; sourceTree = ""; }; + 2F03A53B19C5C6DA005002A5 /* CoreStoreTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CoreStoreTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 2F03A53E19C5C6DA005002A5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 2F03A53F19C5C6DA005002A5 /* HardcoreDataTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = HardcoreDataTests.swift; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; + 2F03A53F19C5C6DA005002A5 /* CoreStoreTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = CoreStoreTests.swift; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; 2F03A54C19C5C872005002A5 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; }; - 2F291E2619C6D3CF007AF63F /* HardcoreData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = HardcoreData.swift; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; - B504D0D51B02362500B2BBB1 /* HardcoreData+Setup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "HardcoreData+Setup.swift"; sourceTree = ""; }; - B5D1E22B19FA9FBC003B2874 /* NSError+HardcoreData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSError+HardcoreData.swift"; sourceTree = ""; }; + 2F291E2619C6D3CF007AF63F /* CoreStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = CoreStore.swift; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; + B504D0D51B02362500B2BBB1 /* CoreStore+Setup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CoreStore+Setup.swift"; sourceTree = ""; }; + B5D1E22B19FA9FBC003B2874 /* NSError+CoreStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSError+CoreStore.swift"; sourceTree = ""; }; B5D372831A39CD6900F583D9 /* Model.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Model.xcdatamodel; sourceTree = ""; }; B5D372851A39CDDB00F583D9 /* TestEntity1.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestEntity1.swift; sourceTree = ""; }; B5D39A0119FD00C9000E91BB /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; @@ -104,13 +104,13 @@ B5E84EDB1AFF84500064E85B /* DataStack.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DataStack.swift; sourceTree = ""; }; B5E84EDE1AFF84500064E85B /* PersistentStoreResult.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PersistentStoreResult.swift; sourceTree = ""; }; B5E84EE31AFF84610064E85B /* DefaultLogger.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DefaultLogger.swift; sourceTree = ""; }; - B5E84EE41AFF84610064E85B /* HardcoreData+Logging.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "HardcoreData+Logging.swift"; sourceTree = ""; }; - B5E84EE51AFF84610064E85B /* HardcoreDataLogger.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HardcoreDataLogger.swift; sourceTree = ""; }; + B5E84EE41AFF84610064E85B /* CoreStore+Logging.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CoreStore+Logging.swift"; sourceTree = ""; }; + B5E84EE51AFF84610064E85B /* CoreStoreLogger.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CoreStoreLogger.swift; sourceTree = ""; }; B5E84EEA1AFF846E0064E85B /* AsynchronousDataTransaction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AsynchronousDataTransaction.swift; sourceTree = ""; }; B5E84EEB1AFF846E0064E85B /* BaseDataTransaction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaseDataTransaction.swift; sourceTree = ""; }; B5E84EEC1AFF846E0064E85B /* DataStack+Transaction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "DataStack+Transaction.swift"; sourceTree = ""; }; B5E84EED1AFF846E0064E85B /* DetachedDataTransaction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DetachedDataTransaction.swift; sourceTree = ""; }; - B5E84EEE1AFF846E0064E85B /* HardcoreData+Transaction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "HardcoreData+Transaction.swift"; sourceTree = ""; }; + B5E84EEE1AFF846E0064E85B /* CoreStore+Transaction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CoreStore+Transaction.swift"; sourceTree = ""; }; B5E84EF21AFF846E0064E85B /* SaveResult.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SaveResult.swift; sourceTree = ""; }; B5E84EF31AFF846E0064E85B /* SynchronousDataTransaction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SynchronousDataTransaction.swift; sourceTree = ""; }; B5E84EFE1AFF847B0064E85B /* BaseDataTransaction+Querying.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "BaseDataTransaction+Querying.swift"; sourceTree = ""; }; @@ -121,9 +121,9 @@ B5E84F041AFF847B0064E85B /* OrderBy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrderBy.swift; sourceTree = ""; }; B5E84F051AFF847B0064E85B /* Where.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Where.swift; sourceTree = ""; }; B5E84F061AFF847B0064E85B /* DataStack+Querying.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "DataStack+Querying.swift"; sourceTree = ""; }; - B5E84F071AFF847B0064E85B /* HardcoreData+Querying.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "HardcoreData+Querying.swift"; sourceTree = ""; }; + B5E84F071AFF847B0064E85B /* CoreStore+Querying.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CoreStore+Querying.swift"; sourceTree = ""; }; B5E84F1A1AFF84860064E85B /* DataStack+Observing.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "DataStack+Observing.swift"; sourceTree = ""; }; - B5E84F1B1AFF84860064E85B /* HardcoreData+Observing.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "HardcoreData+Observing.swift"; sourceTree = ""; }; + B5E84F1B1AFF84860064E85B /* CoreStore+Observing.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CoreStore+Observing.swift"; sourceTree = ""; }; B5E84F1C1AFF84860064E85B /* ManagedObjectController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ManagedObjectController.swift; sourceTree = ""; }; B5E84F1D1AFF84860064E85B /* ManagedObjectListController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ManagedObjectListController.swift; sourceTree = ""; }; B5E84F1E1AFF84860064E85B /* ManagedObjectListObserver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ManagedObjectListObserver.swift; sourceTree = ""; }; @@ -131,7 +131,7 @@ B5E84F271AFF84920064E85B /* NSManagedObject+Convenience.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSManagedObject+Convenience.swift"; sourceTree = ""; }; B5E84F2A1AFF849C0064E85B /* AssociatedObjects.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AssociatedObjects.swift; sourceTree = ""; }; B5E84F2B1AFF849C0064E85B /* NotificationObserver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NotificationObserver.swift; sourceTree = ""; }; - B5E84F2C1AFF849C0064E85B /* NSManagedObjectContext+HardcoreData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSManagedObjectContext+HardcoreData.swift"; sourceTree = ""; }; + B5E84F2C1AFF849C0064E85B /* NSManagedObjectContext+CoreStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSManagedObjectContext+CoreStore.swift"; sourceTree = ""; }; B5E84F2D1AFF849C0064E85B /* WeakObject.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WeakObject.swift; sourceTree = ""; }; B5E84F321AFF85470064E85B /* NSManagedObjectContext+Setup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSManagedObjectContext+Setup.swift"; sourceTree = ""; }; B5E84F331AFF85470064E85B /* NSManagedObjectContext+Transaction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSManagedObjectContext+Transaction.swift"; sourceTree = ""; }; @@ -167,8 +167,8 @@ children = ( B5D806BB1A34715700A44484 /* Libraries */, 2F291E3119C6D4D3007AF63F /* Frameworks */, - 2F03A53219C5C6DA005002A5 /* HardcoreData */, - 2F03A53C19C5C6DA005002A5 /* HardcoreDataTests */, + 2F03A53219C5C6DA005002A5 /* CoreStore */, + 2F03A53C19C5C6DA005002A5 /* CoreStoreTests */, 2F03A53119C5C6DA005002A5 /* Products */, ); sourceTree = ""; @@ -176,18 +176,18 @@ 2F03A53119C5C6DA005002A5 /* Products */ = { isa = PBXGroup; children = ( - 2F03A53019C5C6DA005002A5 /* HardcoreData.framework */, - 2F03A53B19C5C6DA005002A5 /* HardcoreDataTests.xctest */, + 2F03A53019C5C6DA005002A5 /* CoreStore.framework */, + 2F03A53B19C5C6DA005002A5 /* CoreStoreTests.xctest */, ); name = Products; sourceTree = ""; }; - 2F03A53219C5C6DA005002A5 /* HardcoreData */ = { + 2F03A53219C5C6DA005002A5 /* CoreStore */ = { isa = PBXGroup; children = ( - 2F03A53519C5C6DA005002A5 /* HardcoreData.h */, - 2F291E2619C6D3CF007AF63F /* HardcoreData.swift */, - B5D1E22B19FA9FBC003B2874 /* NSError+HardcoreData.swift */, + 2F03A53519C5C6DA005002A5 /* CoreStore.h */, + 2F291E2619C6D3CF007AF63F /* CoreStore.swift */, + B5D1E22B19FA9FBC003B2874 /* NSError+CoreStore.swift */, B5E84EDA1AFF84500064E85B /* Setting Up */, B5E84EE21AFF84610064E85B /* Logging */, B5E84EE91AFF846E0064E85B /* Saving and Processing */, @@ -197,7 +197,7 @@ B5E84F291AFF849C0064E85B /* Internal */, 2F03A53319C5C6DA005002A5 /* Supporting Files */, ); - path = HardcoreData; + path = CoreStore; sourceTree = ""; }; 2F03A53319C5C6DA005002A5 /* Supporting Files */ = { @@ -210,15 +210,15 @@ name = "Supporting Files"; sourceTree = ""; }; - 2F03A53C19C5C6DA005002A5 /* HardcoreDataTests */ = { + 2F03A53C19C5C6DA005002A5 /* CoreStoreTests */ = { isa = PBXGroup; children = ( - 2F03A53F19C5C6DA005002A5 /* HardcoreDataTests.swift */, + 2F03A53F19C5C6DA005002A5 /* CoreStoreTests.swift */, B5D372851A39CDDB00F583D9 /* TestEntity1.swift */, B5D5E0CE1A4D6AAB006468AF /* TestEntity2.swift */, 2F03A53D19C5C6DA005002A5 /* Supporting Files */, ); - path = HardcoreDataTests; + path = CoreStoreTests; sourceTree = ""; }; 2F03A53D19C5C6DA005002A5 /* Supporting Files */ = { @@ -270,7 +270,7 @@ children = ( B5E84EDB1AFF84500064E85B /* DataStack.swift */, B5E84EDE1AFF84500064E85B /* PersistentStoreResult.swift */, - B504D0D51B02362500B2BBB1 /* HardcoreData+Setup.swift */, + B504D0D51B02362500B2BBB1 /* CoreStore+Setup.swift */, ); path = "Setting Up"; sourceTree = ""; @@ -279,8 +279,8 @@ isa = PBXGroup; children = ( B5E84EE31AFF84610064E85B /* DefaultLogger.swift */, - B5E84EE41AFF84610064E85B /* HardcoreData+Logging.swift */, - B5E84EE51AFF84610064E85B /* HardcoreDataLogger.swift */, + B5E84EE41AFF84610064E85B /* CoreStore+Logging.swift */, + B5E84EE51AFF84610064E85B /* CoreStoreLogger.swift */, ); path = Logging; sourceTree = ""; @@ -292,7 +292,7 @@ B5E84EEA1AFF846E0064E85B /* AsynchronousDataTransaction.swift */, B5E84EEC1AFF846E0064E85B /* DataStack+Transaction.swift */, B5E84EED1AFF846E0064E85B /* DetachedDataTransaction.swift */, - B5E84EEE1AFF846E0064E85B /* HardcoreData+Transaction.swift */, + B5E84EEE1AFF846E0064E85B /* CoreStore+Transaction.swift */, B5E84EF21AFF846E0064E85B /* SaveResult.swift */, B5E84EF31AFF846E0064E85B /* SynchronousDataTransaction.swift */, ); @@ -304,7 +304,7 @@ children = ( B5E84EFE1AFF847B0064E85B /* BaseDataTransaction+Querying.swift */, B5E84F061AFF847B0064E85B /* DataStack+Querying.swift */, - B5E84F071AFF847B0064E85B /* HardcoreData+Querying.swift */, + B5E84F071AFF847B0064E85B /* CoreStore+Querying.swift */, B5E84F0A1AFF847B0064E85B /* Protocol Clauses */, B5E84EFF1AFF847B0064E85B /* Concrete Clauses */, ); @@ -336,7 +336,7 @@ isa = PBXGroup; children = ( B5E84F1A1AFF84860064E85B /* DataStack+Observing.swift */, - B5E84F1B1AFF84860064E85B /* HardcoreData+Observing.swift */, + B5E84F1B1AFF84860064E85B /* CoreStore+Observing.swift */, B5E84F1C1AFF84860064E85B /* ManagedObjectController.swift */, B5E84F1F1AFF84860064E85B /* ManagedObjectObserver.swift */, B5E84F1D1AFF84860064E85B /* ManagedObjectListController.swift */, @@ -359,7 +359,7 @@ B5E84F2A1AFF849C0064E85B /* AssociatedObjects.swift */, B5E84F2B1AFF849C0064E85B /* NotificationObserver.swift */, B5E84F341AFF85470064E85B /* NSManagedObject+Transaction.swift */, - B5E84F2C1AFF849C0064E85B /* NSManagedObjectContext+HardcoreData.swift */, + B5E84F2C1AFF849C0064E85B /* NSManagedObjectContext+CoreStore.swift */, B5E84F351AFF85470064E85B /* NSManagedObjectContext+Querying.swift */, B5E84F321AFF85470064E85B /* NSManagedObjectContext+Setup.swift */, B5E84F331AFF85470064E85B /* NSManagedObjectContext+Transaction.swift */, @@ -375,16 +375,16 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 2F03A53619C5C6DA005002A5 /* HardcoreData.h in Headers */, + 2F03A53619C5C6DA005002A5 /* CoreStore.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 2F03A52F19C5C6DA005002A5 /* HardcoreData */ = { + 2F03A52F19C5C6DA005002A5 /* CoreStore */ = { isa = PBXNativeTarget; - buildConfigurationList = 2F03A54319C5C6DA005002A5 /* Build configuration list for PBXNativeTarget "HardcoreData" */; + buildConfigurationList = 2F03A54319C5C6DA005002A5 /* Build configuration list for PBXNativeTarget "CoreStore" */; buildPhases = ( 2F03A52B19C5C6DA005002A5 /* Sources */, 2F03A52C19C5C6DA005002A5 /* Frameworks */, @@ -395,14 +395,14 @@ ); dependencies = ( ); - name = HardcoreData; - productName = HardcoreData; - productReference = 2F03A53019C5C6DA005002A5 /* HardcoreData.framework */; + name = CoreStore; + productName = CoreStore; + productReference = 2F03A53019C5C6DA005002A5 /* CoreStore.framework */; productType = "com.apple.product-type.framework"; }; - 2F03A53A19C5C6DA005002A5 /* HardcoreDataTests */ = { + 2F03A53A19C5C6DA005002A5 /* CoreStoreTests */ = { isa = PBXNativeTarget; - buildConfigurationList = 2F03A54619C5C6DA005002A5 /* Build configuration list for PBXNativeTarget "HardcoreDataTests" */; + buildConfigurationList = 2F03A54619C5C6DA005002A5 /* Build configuration list for PBXNativeTarget "CoreStoreTests" */; buildPhases = ( 2F03A53719C5C6DA005002A5 /* Sources */, 2F03A53819C5C6DA005002A5 /* Frameworks */, @@ -413,9 +413,9 @@ dependencies = ( B5D372881A39CF4D00F583D9 /* PBXTargetDependency */, ); - name = HardcoreDataTests; - productName = HardcoreDataTests; - productReference = 2F03A53B19C5C6DA005002A5 /* HardcoreDataTests.xctest */; + name = CoreStoreTests; + productName = CoreStoreTests; + productReference = 2F03A53B19C5C6DA005002A5 /* CoreStoreTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ @@ -435,7 +435,7 @@ }; }; }; - buildConfigurationList = 2F03A52A19C5C6DA005002A5 /* Build configuration list for PBXProject "HardcoreData" */; + buildConfigurationList = 2F03A52A19C5C6DA005002A5 /* Build configuration list for PBXProject "CoreStore" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; @@ -454,8 +454,8 @@ ); projectRoot = ""; targets = ( - 2F03A52F19C5C6DA005002A5 /* HardcoreData */, - 2F03A53A19C5C6DA005002A5 /* HardcoreDataTests */, + 2F03A52F19C5C6DA005002A5 /* CoreStore */, + 2F03A53A19C5C6DA005002A5 /* CoreStoreTests */, ); }; /* End PBXProject section */ @@ -500,21 +500,21 @@ buildActionMask = 2147483647; files = ( B5E84F221AFF84860064E85B /* ManagedObjectController.swift in Sources */, - B504D0D61B02362500B2BBB1 /* HardcoreData+Setup.swift in Sources */, - B5D1E22C19FA9FBC003B2874 /* NSError+HardcoreData.swift in Sources */, + B504D0D61B02362500B2BBB1 /* CoreStore+Setup.swift in Sources */, + B5D1E22C19FA9FBC003B2874 /* NSError+CoreStore.swift in Sources */, B5E84F131AFF847B0064E85B /* Where.swift in Sources */, B5E84F141AFF847B0064E85B /* DataStack+Querying.swift in Sources */, B5E84F371AFF85470064E85B /* NSManagedObjectContext+Transaction.swift in Sources */, B5E84F0E1AFF847B0064E85B /* Tweak.swift in Sources */, B5E84F121AFF847B0064E85B /* OrderBy.swift in Sources */, B5E84F361AFF85470064E85B /* NSManagedObjectContext+Setup.swift in Sources */, - B5E84EE71AFF84610064E85B /* HardcoreData+Logging.swift in Sources */, + B5E84EE71AFF84610064E85B /* CoreStore+Logging.swift in Sources */, B5E84F111AFF847B0064E85B /* Select.swift in Sources */, B5E84EE11AFF84500064E85B /* PersistentStoreResult.swift in Sources */, B5E84F251AFF84860064E85B /* ManagedObjectObserver.swift in Sources */, B5E84F2F1AFF849C0064E85B /* NotificationObserver.swift in Sources */, B5E84F381AFF85470064E85B /* NSManagedObject+Transaction.swift in Sources */, - 2F291E2719C6D3CF007AF63F /* HardcoreData.swift in Sources */, + 2F291E2719C6D3CF007AF63F /* CoreStore.swift in Sources */, B5E84F411AFF8CCD0064E85B /* ClauseTypes.swift in Sources */, B5E84F0D1AFF847B0064E85B /* BaseDataTransaction+Querying.swift in Sources */, B5E84EF61AFF846E0064E85B /* DataStack+Transaction.swift in Sources */, @@ -527,16 +527,16 @@ B5E84EFC1AFF846E0064E85B /* SynchronousDataTransaction.swift in Sources */, B5E84F281AFF84920064E85B /* NSManagedObject+Convenience.swift in Sources */, B5E84F391AFF85470064E85B /* NSManagedObjectContext+Querying.swift in Sources */, - B5E84EE81AFF84610064E85B /* HardcoreDataLogger.swift in Sources */, + B5E84EE81AFF84610064E85B /* CoreStoreLogger.swift in Sources */, B5E84F311AFF849C0064E85B /* WeakObject.swift in Sources */, B5E84F101AFF847B0064E85B /* GroupBy.swift in Sources */, B5E84F201AFF84860064E85B /* DataStack+Observing.swift in Sources */, - B5E84EF81AFF846E0064E85B /* HardcoreData+Transaction.swift in Sources */, - B5E84F301AFF849C0064E85B /* NSManagedObjectContext+HardcoreData.swift in Sources */, - B5E84F211AFF84860064E85B /* HardcoreData+Observing.swift in Sources */, + B5E84EF81AFF846E0064E85B /* CoreStore+Transaction.swift in Sources */, + B5E84F301AFF849C0064E85B /* NSManagedObjectContext+CoreStore.swift in Sources */, + B5E84F211AFF84860064E85B /* CoreStore+Observing.swift in Sources */, B5E84EE61AFF84610064E85B /* DefaultLogger.swift in Sources */, B5E84EF41AFF846E0064E85B /* AsynchronousDataTransaction.swift in Sources */, - B5E84F151AFF847B0064E85B /* HardcoreData+Querying.swift in Sources */, + B5E84F151AFF847B0064E85B /* CoreStore+Querying.swift in Sources */, B5E84F241AFF84860064E85B /* ManagedObjectListObserver.swift in Sources */, B5E84F2E1AFF849C0064E85B /* AssociatedObjects.swift in Sources */, ); @@ -546,7 +546,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 2F03A54019C5C6DA005002A5 /* HardcoreDataTests.swift in Sources */, + 2F03A54019C5C6DA005002A5 /* CoreStoreTests.swift in Sources */, B5D372861A39CDDB00F583D9 /* TestEntity1.swift in Sources */, B5D372841A39CD6900F583D9 /* Model.xcdatamodeld in Sources */, B5D5E0CF1A4D6AAB006468AF /* TestEntity2.swift in Sources */, @@ -558,7 +558,7 @@ /* Begin PBXTargetDependency section */ B5D372881A39CF4D00F583D9 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 2F03A52F19C5C6DA005002A5 /* HardcoreData */; + target = 2F03A52F19C5C6DA005002A5 /* CoreStore */; targetProxy = B5D372871A39CF4D00F583D9 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -663,7 +663,7 @@ "$(inherited)", "$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/PhotoSearch-dzwflhandxxuvngptapvysfpcwdx/Build/Products/Debug-iphoneos", ); - INFOPLIST_FILE = HardcoreData/Info.plist; + INFOPLIST_FILE = CoreStore/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -687,7 +687,7 @@ "$(inherited)", "$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/PhotoSearch-dzwflhandxxuvngptapvysfpcwdx/Build/Products/Debug-iphoneos", ); - INFOPLIST_FILE = HardcoreData/Info.plist; + INFOPLIST_FILE = CoreStore/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -708,7 +708,7 @@ "DEBUG=1", "$(inherited)", ); - INFOPLIST_FILE = HardcoreDataTests/Info.plist; + INFOPLIST_FILE = CoreStoreTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -722,7 +722,7 @@ "$(SDKROOT)/Developer/Library/Frameworks", "$(inherited)", ); - INFOPLIST_FILE = HardcoreDataTests/Info.plist; + INFOPLIST_FILE = CoreStoreTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -731,7 +731,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 2F03A52A19C5C6DA005002A5 /* Build configuration list for PBXProject "HardcoreData" */ = { + 2F03A52A19C5C6DA005002A5 /* Build configuration list for PBXProject "CoreStore" */ = { isa = XCConfigurationList; buildConfigurations = ( 2F03A54119C5C6DA005002A5 /* Debug */, @@ -740,7 +740,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 2F03A54319C5C6DA005002A5 /* Build configuration list for PBXNativeTarget "HardcoreData" */ = { + 2F03A54319C5C6DA005002A5 /* Build configuration list for PBXNativeTarget "CoreStore" */ = { isa = XCConfigurationList; buildConfigurations = ( 2F03A54419C5C6DA005002A5 /* Debug */, @@ -749,7 +749,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 2F03A54619C5C6DA005002A5 /* Build configuration list for PBXNativeTarget "HardcoreDataTests" */ = { + 2F03A54619C5C6DA005002A5 /* Build configuration list for PBXNativeTarget "CoreStoreTests" */ = { isa = XCConfigurationList; buildConfigurations = ( 2F03A54719C5C6DA005002A5 /* Debug */, diff --git a/HardcoreData.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/CoreStore.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 69% rename from HardcoreData.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to CoreStore.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 3088d79..04107bb 100644 --- a/HardcoreData.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/CoreStore.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:CoreStore.xcodeproj"> diff --git a/CoreStore.xcodeproj/project.xcworkspace/xcshareddata/CoreStore.xccheckout b/CoreStore.xcodeproj/project.xcworkspace/xcshareddata/CoreStore.xccheckout new file mode 100644 index 0000000..867b6eb --- /dev/null +++ b/CoreStore.xcodeproj/project.xcworkspace/xcshareddata/CoreStore.xccheckout @@ -0,0 +1,53 @@ + + + + + IDESourceControlProjectFavoriteDictionaryKey + + IDESourceControlProjectIdentifier + F347F55F-7F5C-4476-9148-6E902F06E4AD + IDESourceControlProjectName + CoreStore + IDESourceControlProjectOriginsDictionary + + 4B60F1BCB491FF717C56441AE7783C74F417BE48 + github.com:JohnEstropia/CoreStore.git + 8B2E522D57154DFA93A06982C36315ECBEA4FA97 + github.com:JohnEstropia/GCDKit.git + + IDESourceControlProjectPath + CoreStore.xcodeproj + IDESourceControlProjectRelativeInstallPathDictionary + + 4B60F1BCB491FF717C56441AE7783C74F417BE48 + ../.. + 8B2E522D57154DFA93A06982C36315ECBEA4FA97 + ../..Libraries/GCDKit/ + + IDESourceControlProjectURL + github.com:JohnEstropia/CoreStore.git + IDESourceControlProjectVersion + 111 + IDESourceControlProjectWCCIdentifier + 4B60F1BCB491FF717C56441AE7783C74F417BE48 + IDESourceControlProjectWCConfigurations + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + 4B60F1BCB491FF717C56441AE7783C74F417BE48 + IDESourceControlWCCName + CoreStore + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + 8B2E522D57154DFA93A06982C36315ECBEA4FA97 + IDESourceControlWCCName + GCDKit + + + + diff --git a/HardcoreData.xcodeproj/project.xcworkspace/xcshareddata/HardcoreData.xccheckout b/CoreStore.xcodeproj/project.xcworkspace/xcshareddata/HardcoreData.xccheckout similarity index 100% rename from HardcoreData.xcodeproj/project.xcworkspace/xcshareddata/HardcoreData.xccheckout rename to CoreStore.xcodeproj/project.xcworkspace/xcshareddata/HardcoreData.xccheckout diff --git a/HardcoreData.xcodeproj/project.xcworkspace/xcuserdata/johnestropia.xcuserdatad/WorkspaceSettings.xcsettings b/CoreStore.xcodeproj/project.xcworkspace/xcuserdata/johnestropia.xcuserdatad/WorkspaceSettings.xcsettings similarity index 100% rename from HardcoreData.xcodeproj/project.xcworkspace/xcuserdata/johnestropia.xcuserdatad/WorkspaceSettings.xcsettings rename to CoreStore.xcodeproj/project.xcworkspace/xcuserdata/johnestropia.xcuserdatad/WorkspaceSettings.xcsettings diff --git a/CoreStore.xcodeproj/xcuserdata/johnestropia.xcuserdatad/xcschemes/CoreStore.xcscheme b/CoreStore.xcodeproj/xcuserdata/johnestropia.xcuserdatad/xcschemes/CoreStore.xcscheme new file mode 100644 index 0000000..7748d8a --- /dev/null +++ b/CoreStore.xcodeproj/xcuserdata/johnestropia.xcuserdatad/xcschemes/CoreStore.xcscheme @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CoreStore.xcodeproj/xcuserdata/johnestropia.xcuserdatad/xcschemes/xcschememanagement.plist b/CoreStore.xcodeproj/xcuserdata/johnestropia.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..081023b --- /dev/null +++ b/CoreStore.xcodeproj/xcuserdata/johnestropia.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,27 @@ + + + + + SchemeUserState + + CoreStore.xcscheme + + orderHint + 0 + + + SuppressBuildableAutocreation + + 2F03A52F19C5C6DA005002A5 + + primary + + + 2F03A53A19C5C6DA005002A5 + + primary + + + + + diff --git a/HardcoreData/Convenience Helpers/NSManagedObject+Convenience.swift b/CoreStore/Convenience Helpers/NSManagedObject+Convenience.swift similarity index 99% rename from HardcoreData/Convenience Helpers/NSManagedObject+Convenience.swift rename to CoreStore/Convenience Helpers/NSManagedObject+Convenience.swift index 0f9c6ee..9c88f94 100644 --- a/HardcoreData/Convenience Helpers/NSManagedObject+Convenience.swift +++ b/CoreStore/Convenience Helpers/NSManagedObject+Convenience.swift @@ -1,6 +1,6 @@ // // NSManagedObject+Convenience.swift -// HardcoreData +// CoreStore // // Copyright (c) 2015 John Rommel Estropia // @@ -46,4 +46,4 @@ public extension NSManagedObject { self.setPrimitiveValue(value, forKey: KVCKey) self.didChangeValueForKey(KVCKey) } -} \ No newline at end of file +} diff --git a/HardcoreData/HardcoreData.h b/CoreStore/CoreStore.h similarity index 88% rename from HardcoreData/HardcoreData.h rename to CoreStore/CoreStore.h index ddb745d..e8daf7f 100644 --- a/HardcoreData/HardcoreData.h +++ b/CoreStore/CoreStore.h @@ -1,6 +1,6 @@ // -// HardcoreData.h -// HardcoreData +// CoreStore.h +// CoreStore // // Copyright (c) 2014 John Rommel Estropia // @@ -25,6 +25,6 @@ #import -FOUNDATION_EXPORT double HardcoreDataVersionNumber; -FOUNDATION_EXPORT const unsigned char HardcoreDataVersionString[]; +FOUNDATION_EXPORT double CoreStoreVersionNumber; +FOUNDATION_EXPORT const unsigned char CoreStoreVersionString[]; diff --git a/HardcoreData/HardcoreData.swift b/CoreStore/CoreStore.swift similarity index 90% rename from HardcoreData/HardcoreData.swift rename to CoreStore/CoreStore.swift index e2fcbea..07c7038 100644 --- a/HardcoreData/HardcoreData.swift +++ b/CoreStore/CoreStore.swift @@ -1,6 +1,6 @@ // -// HardcoreData.swift -// HardcoreData +// CoreStore.swift +// CoreStore // // Copyright (c) 2014 John Rommel Estropia // @@ -30,15 +30,15 @@ import GCDKit /** Okay, okay. This one's shorter. */ -public typealias HCD = HardcoreData +public typealias HCD = CoreStore -// MARK: - HardcoreData +// MARK: - CoreStore /** -`HardcoreData` is the main entry point for all other APIs. +`CoreStore` is the main entry point for all other APIs. */ -public enum HardcoreData { +public enum CoreStore { // MARK: Public @@ -72,7 +72,7 @@ public enum HardcoreData { // MARK: Private - private static let defaultStackBarrierQueue = GCDQueue.createConcurrent("com.hardcoreData.defaultStackBarrierQueue") + private static let defaultStackBarrierQueue = GCDQueue.createConcurrent("com.coreStore.defaultStackBarrierQueue") private static var defaultStackInstance: DataStack? } diff --git a/HardcoreData/Fetching and Querying/BaseDataTransaction+Querying.swift b/CoreStore/Fetching and Querying/BaseDataTransaction+Querying.swift similarity index 84% rename from HardcoreData/Fetching and Querying/BaseDataTransaction+Querying.swift rename to CoreStore/Fetching and Querying/BaseDataTransaction+Querying.swift index c3bf8fe..336dedd 100644 --- a/HardcoreData/Fetching and Querying/BaseDataTransaction+Querying.swift +++ b/CoreStore/Fetching and Querying/BaseDataTransaction+Querying.swift @@ -1,6 +1,6 @@ // // BaseDataTransaction+Querying.swift -// HardcoreData +// CoreStore // // Copyright (c) 2015 John Rommel Estropia // @@ -42,7 +42,7 @@ public extension BaseDataTransaction { */ public func fetchOne(from: From, _ fetchClauses: FetchClause...) -> T? { - HardcoreData.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to fetch from a \(typeName(self)) outside its designated queue.") + CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to fetch from a \(typeName(self)) outside its designated queue.") return self.context.fetchOne(from, fetchClauses) } @@ -56,7 +56,7 @@ public extension BaseDataTransaction { */ public func fetchOne(from: From, _ fetchClauses: [FetchClause]) -> T? { - HardcoreData.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to fetch from a \(typeName(self)) outside its designated queue.") + CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to fetch from a \(typeName(self)) outside its designated queue.") return self.context.fetchOne(from, fetchClauses) } @@ -70,7 +70,7 @@ public extension BaseDataTransaction { */ public func fetchAll(from: From, _ fetchClauses: FetchClause...) -> [T]? { - HardcoreData.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to fetch from a \(typeName(self)) outside its designated queue.") + CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to fetch from a \(typeName(self)) outside its designated queue.") return self.context.fetchAll(from, fetchClauses) } @@ -84,7 +84,7 @@ public extension BaseDataTransaction { */ public func fetchAll(from: From, _ fetchClauses: [FetchClause]) -> [T]? { - HardcoreData.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to fetch from a \(typeName(self)) outside its designated queue.") + CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to fetch from a \(typeName(self)) outside its designated queue.") return self.context.fetchAll(from, fetchClauses) } @@ -98,7 +98,7 @@ public extension BaseDataTransaction { */ public func fetchCount(from: From, _ fetchClauses: FetchClause...) -> Int? { - HardcoreData.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to fetch from a \(typeName(self)) outside its designated queue.") + CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to fetch from a \(typeName(self)) outside its designated queue.") return self.context.fetchCount(from, fetchClauses) } @@ -112,7 +112,7 @@ public extension BaseDataTransaction { */ public func fetchCount(from: From, _ fetchClauses: [FetchClause]) -> Int? { - HardcoreData.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to fetch from a \(typeName(self)) outside its designated queue.") + CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to fetch from a \(typeName(self)) outside its designated queue.") return self.context.fetchCount(from, fetchClauses) } @@ -126,7 +126,7 @@ public extension BaseDataTransaction { */ public func fetchObjectID(from: From, _ fetchClauses: FetchClause...) -> NSManagedObjectID? { - HardcoreData.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to fetch from a \(typeName(self)) outside its designated queue.") + CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to fetch from a \(typeName(self)) outside its designated queue.") return self.context.fetchObjectID(from, fetchClauses) } @@ -140,7 +140,7 @@ public extension BaseDataTransaction { */ public func fetchObjectID(from: From, _ fetchClauses: [FetchClause]) -> NSManagedObjectID? { - HardcoreData.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to fetch from a \(typeName(self)) outside its designated queue.") + CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to fetch from a \(typeName(self)) outside its designated queue.") return self.context.fetchObjectID(from, fetchClauses) } @@ -154,7 +154,7 @@ public extension BaseDataTransaction { */ public func fetchObjectIDs(from: From, _ fetchClauses: FetchClause...) -> [NSManagedObjectID]? { - HardcoreData.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to fetch from a \(typeName(self)) outside its designated queue.") + CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to fetch from a \(typeName(self)) outside its designated queue.") return self.context.fetchObjectIDs(from, fetchClauses) } @@ -168,7 +168,7 @@ public extension BaseDataTransaction { */ public func fetchObjectIDs(from: From, _ fetchClauses: [FetchClause]) -> [NSManagedObjectID]? { - HardcoreData.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to fetch from a \(typeName(self)) outside its designated queue.") + CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to fetch from a \(typeName(self)) outside its designated queue.") return self.context.fetchObjectIDs(from, fetchClauses) } @@ -182,7 +182,7 @@ public extension BaseDataTransaction { */ public func deleteAll(from: From, _ deleteClauses: DeleteClause...) -> Int? { - HardcoreData.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to delete from a \(typeName(self)) outside its designated queue.") + CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to delete from a \(typeName(self)) outside its designated queue.") return self.context.deleteAll(from, deleteClauses) } @@ -196,7 +196,7 @@ public extension BaseDataTransaction { */ public func deleteAll(from: From, _ deleteClauses: [DeleteClause]) -> Int? { - HardcoreData.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to delete from a \(typeName(self)) outside its designated queue.") + CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to delete from a \(typeName(self)) outside its designated queue.") return self.context.deleteAll(from, deleteClauses) } @@ -213,7 +213,7 @@ public extension BaseDataTransaction { */ public func queryValue(from: From, _ selectClause: Select, _ queryClauses: QueryClause...) -> U? { - HardcoreData.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to query from a \(typeName(self)) outside its designated queue.") + CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to query from a \(typeName(self)) outside its designated queue.") return self.context.queryValue(from, selectClause, queryClauses) } @@ -230,7 +230,7 @@ public extension BaseDataTransaction { */ public func queryValue(from: From, _ selectClause: Select, _ queryClauses: [QueryClause]) -> U? { - HardcoreData.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to query from a \(typeName(self)) outside its designated queue.") + CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to query from a \(typeName(self)) outside its designated queue.") return self.context.queryValue(from, selectClause, queryClauses) } @@ -247,7 +247,7 @@ public extension BaseDataTransaction { */ public func queryAttributes(from: From, _ selectClause: Select, _ queryClauses: QueryClause...) -> [[NSString: AnyObject]]? { - HardcoreData.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to query from a \(typeName(self)) outside its designated queue.") + CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to query from a \(typeName(self)) outside its designated queue.") return self.context.queryAttributes(from, selectClause, queryClauses) } @@ -264,8 +264,8 @@ public extension BaseDataTransaction { */ public func queryAttributes(from: From, _ selectClause: Select, _ queryClauses: [QueryClause]) -> [[NSString: AnyObject]]? { - HardcoreData.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to query from a \(typeName(self)) outside its designated queue.") + CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to query from a \(typeName(self)) outside its designated queue.") return self.context.queryAttributes(from, selectClause, queryClauses) } -} \ No newline at end of file +} diff --git a/HardcoreData/Fetching and Querying/Concrete Clauses/From.swift b/CoreStore/Fetching and Querying/Concrete Clauses/From.swift similarity index 99% rename from HardcoreData/Fetching and Querying/Concrete Clauses/From.swift rename to CoreStore/Fetching and Querying/Concrete Clauses/From.swift index 6c6da55..5a12e89 100644 --- a/HardcoreData/Fetching and Querying/Concrete Clauses/From.swift +++ b/CoreStore/Fetching and Querying/Concrete Clauses/From.swift @@ -1,6 +1,6 @@ // // From.swift -// HardcoreData +// CoreStore // // Copyright (c) 2015 John Rommel Estropia // diff --git a/HardcoreData/Fetching and Querying/Concrete Clauses/GroupBy.swift b/CoreStore/Fetching and Querying/Concrete Clauses/GroupBy.swift similarity index 92% rename from HardcoreData/Fetching and Querying/Concrete Clauses/GroupBy.swift rename to CoreStore/Fetching and Querying/Concrete Clauses/GroupBy.swift index c9733de..b01c1ae 100644 --- a/HardcoreData/Fetching and Querying/Concrete Clauses/GroupBy.swift +++ b/CoreStore/Fetching and Querying/Concrete Clauses/GroupBy.swift @@ -1,6 +1,6 @@ // // GroupBy.swift -// HardcoreData +// CoreStore // // Copyright (c) 2015 John Rommel Estropia // @@ -74,7 +74,7 @@ public struct GroupBy: QueryClause { if fetchRequest.propertiesToGroupBy != nil { - HardcoreData.log(.Warning, message: "An existing \"propertiesToGroupBy\" for the <\(NSFetchRequest.self)> was overwritten by \(typeName(self)) query clause.") + CoreStore.log(.Warning, message: "An existing \"propertiesToGroupBy\" for the <\(NSFetchRequest.self)> was overwritten by \(typeName(self)) query clause.") } fetchRequest.propertiesToGroupBy = self.keyPaths diff --git a/HardcoreData/Fetching and Querying/Concrete Clauses/OrderBy.swift b/CoreStore/Fetching and Querying/Concrete Clauses/OrderBy.swift similarity index 95% rename from HardcoreData/Fetching and Querying/Concrete Clauses/OrderBy.swift rename to CoreStore/Fetching and Querying/Concrete Clauses/OrderBy.swift index 8c36cde..2c7acb7 100644 --- a/HardcoreData/Fetching and Querying/Concrete Clauses/OrderBy.swift +++ b/CoreStore/Fetching and Querying/Concrete Clauses/OrderBy.swift @@ -1,6 +1,6 @@ // // OrderBy.swift -// HardcoreData +// CoreStore // // Copyright (c) 2015 John Rommel Estropia // @@ -135,7 +135,7 @@ public struct OrderBy: FetchClause, QueryClause, DeleteClause { if fetchRequest.sortDescriptors != nil { - HardcoreData.log(.Warning, message: "Existing sortDescriptors for the <\(NSFetchRequest.self)> was overwritten by \(typeName(self)) query clause.") + CoreStore.log(.Warning, message: "Existing sortDescriptors for the <\(NSFetchRequest.self)> was overwritten by \(typeName(self)) query clause.") } fetchRequest.sortDescriptors = self.sortDescriptors diff --git a/HardcoreData/Fetching and Querying/Concrete Clauses/Select.swift b/CoreStore/Fetching and Querying/Concrete Clauses/Select.swift similarity index 94% rename from HardcoreData/Fetching and Querying/Concrete Clauses/Select.swift rename to CoreStore/Fetching and Querying/Concrete Clauses/Select.swift index 28ad208..ebe8b43 100644 --- a/HardcoreData/Fetching and Querying/Concrete Clauses/Select.swift +++ b/CoreStore/Fetching and Querying/Concrete Clauses/Select.swift @@ -1,6 +1,6 @@ // // Select.swift -// HardcoreData +// CoreStore // // Copyright (c) 2015 John Rommel Estropia // @@ -69,7 +69,7 @@ public enum SelectTerm: StringLiteralConvertible { /** Provides a `SelectTerm` to a `Select` clause for querying an entity attribute. A shorter way to do the same is to assign from the string keypath directly: - let fullName = HardcoreData.queryValue( + let fullName = CoreStore.queryValue( From(MyPersonEntity), Select(.Attribute("fullName")), Where("employeeID", isEqualTo: 1111) @@ -77,7 +77,7 @@ public enum SelectTerm: StringLiteralConvertible { is equivalent to: - let fullName = HardcoreData.queryValue( + let fullName = CoreStore.queryValue( From(MyPersonEntity), Select("fullName"), Where("employeeID", isEqualTo: 1111) @@ -94,7 +94,7 @@ public enum SelectTerm: StringLiteralConvertible { /** Provides a `SelectTerm` to a `Select` clause for querying the average value of an attribute. - let averageAge = HardcoreData.queryValue( + let averageAge = CoreStore.queryValue( From(MyPersonEntity), Select(.Average("age")) ) @@ -115,7 +115,7 @@ public enum SelectTerm: StringLiteralConvertible { /** Provides a `SelectTerm` to a `Select` clause for a count query. - let numberOfEmployees = HardcoreData.queryValue( + let numberOfEmployees = CoreStore.queryValue( From(MyPersonEntity), Select(.Count("employeeID")) ) @@ -136,7 +136,7 @@ public enum SelectTerm: StringLiteralConvertible { /** Provides a `SelectTerm` to a `Select` clause for querying the maximum value for an attribute. - let maximumAge = HardcoreData.queryValue( + let maximumAge = CoreStore.queryValue( From(MyPersonEntity), Select(.Maximum("age")) ) @@ -157,7 +157,7 @@ public enum SelectTerm: StringLiteralConvertible { /** Provides a `SelectTerm` to a `Select` clause for querying the median value for an attribute. - let medianAge = HardcoreData.queryValue( + let medianAge = CoreStore.queryValue( From(MyPersonEntity), Select(.Median("age")) ) @@ -178,7 +178,7 @@ public enum SelectTerm: StringLiteralConvertible { /** Provides a `SelectTerm` to a `Select` clause for querying the minimum value for an attribute. - let minimumAge = HardcoreData.queryValue( + let minimumAge = CoreStore.queryValue( From(MyPersonEntity), Select(.Median("age")) ) @@ -199,7 +199,7 @@ public enum SelectTerm: StringLiteralConvertible { /** Provides a `SelectTerm` to a `Select` clause for querying the standard deviation value for an attribute. - let stddevAge = HardcoreData.queryValue( + let stddevAge = CoreStore.queryValue( From(MyPersonEntity), Select(.StandardDeviation("age")) ) @@ -220,7 +220,7 @@ public enum SelectTerm: StringLiteralConvertible { /** Provides a `SelectTerm` to a `Select` clause for querying the sum value for an attribute. - let totalAge = HardcoreData.queryValue( + let totalAge = CoreStore.queryValue( From(MyPersonEntity), Select(.Sum("age")) ) @@ -271,14 +271,14 @@ The `Select` clause indicates the attribute / aggregate value to be queried. The You can bind the return type by specializing the initializer: - let maximumAge = HardcoreData.queryValue( + let maximumAge = CoreStore.queryValue( From(MyPersonEntity), Select(.Maximum("age")) ) or by casting the type of the return value: - let maximumAge: Int = HardcoreData.queryValue( + let maximumAge: Int = CoreStore.queryValue( From(MyPersonEntity), Select(.Maximum("age")) ) @@ -333,7 +333,7 @@ public struct Select { if fetchRequest.propertiesToFetch != nil { - HardcoreData.log(.Warning, message: "An existing \"propertiesToFetch\" for the <\(NSFetchRequest.self)> was overwritten by \(typeName(self)) query clause.") + CoreStore.log(.Warning, message: "An existing \"propertiesToFetch\" for the <\(NSFetchRequest.self)> was overwritten by \(typeName(self)) query clause.") } fetchRequest.includesPendingChanges = false @@ -355,7 +355,7 @@ public struct Select { } else { - HardcoreData.log(.Warning, message: "The property \"\(keyPath)\" does not exist in entity <\(entityDescription.managedObjectClassName)> and will be ignored by \(typeName(self)) query clause.") + CoreStore.log(.Warning, message: "The property \"\(keyPath)\" does not exist in entity <\(entityDescription.managedObjectClassName)> and will be ignored by \(typeName(self)) query clause.") } case ._Aggregate(let function, let keyPath, let alias): @@ -373,7 +373,7 @@ public struct Select { } else { - HardcoreData.log(.Warning, message: "The attribute \"\(keyPath)\" does not exist in entity <\(entityDescription.managedObjectClassName)> and will be ignored by \(typeName(self)) query clause.") + CoreStore.log(.Warning, message: "The attribute \"\(keyPath)\" does not exist in entity <\(entityDescription.managedObjectClassName)> and will be ignored by \(typeName(self)) query clause.") } } } diff --git a/HardcoreData/Fetching and Querying/Concrete Clauses/Tweak.swift b/CoreStore/Fetching and Querying/Concrete Clauses/Tweak.swift similarity index 99% rename from HardcoreData/Fetching and Querying/Concrete Clauses/Tweak.swift rename to CoreStore/Fetching and Querying/Concrete Clauses/Tweak.swift index b9405e4..080d74b 100644 --- a/HardcoreData/Fetching and Querying/Concrete Clauses/Tweak.swift +++ b/CoreStore/Fetching and Querying/Concrete Clauses/Tweak.swift @@ -1,6 +1,6 @@ // // Tweak.swift -// HardcoreData +// CoreStore // // Copyright (c) 2015 John Rommel Estropia // diff --git a/HardcoreData/Fetching and Querying/Concrete Clauses/Where.swift b/CoreStore/Fetching and Querying/Concrete Clauses/Where.swift similarity index 95% rename from HardcoreData/Fetching and Querying/Concrete Clauses/Where.swift rename to CoreStore/Fetching and Querying/Concrete Clauses/Where.swift index dc6002b..1f80d57 100644 --- a/HardcoreData/Fetching and Querying/Concrete Clauses/Where.swift +++ b/CoreStore/Fetching and Querying/Concrete Clauses/Where.swift @@ -1,6 +1,6 @@ // // Where.swift -// HardcoreData +// CoreStore // // Copyright (c) 2015 John Rommel Estropia // @@ -123,7 +123,7 @@ public struct Where: FetchClause, QueryClause, DeleteClause { if fetchRequest.predicate != nil { - HardcoreData.log(.Warning, message: "An existing predicate for the <\(NSFetchRequest.self)> was overwritten by \(typeName(self)) query clause.") + CoreStore.log(.Warning, message: "An existing predicate for the <\(NSFetchRequest.self)> was overwritten by \(typeName(self)) query clause.") } fetchRequest.predicate = self.predicate diff --git a/HardcoreData/Fetching and Querying/HardcoreData+Querying.swift b/CoreStore/Fetching and Querying/CoreStore+Querying.swift similarity index 99% rename from HardcoreData/Fetching and Querying/HardcoreData+Querying.swift rename to CoreStore/Fetching and Querying/CoreStore+Querying.swift index 56891b1..1698ce1 100644 --- a/HardcoreData/Fetching and Querying/HardcoreData+Querying.swift +++ b/CoreStore/Fetching and Querying/CoreStore+Querying.swift @@ -1,6 +1,6 @@ // -// HardcoreData+Querying.swift -// HardcoreData +// CoreStore+Querying.swift +// CoreStore // // Copyright (c) 2015 John Rommel Estropia // @@ -25,9 +25,9 @@ import Foundation -// MARK: - HardcoreData +// MARK: - CoreStore -public extension HardcoreData { +public extension CoreStore { // MARK: Public @@ -210,4 +210,4 @@ public extension HardcoreData { return self.defaultStack.queryAttributes(from, selectClause, queryClauses) } -} \ No newline at end of file +} diff --git a/HardcoreData/Fetching and Querying/DataStack+Querying.swift b/CoreStore/Fetching and Querying/DataStack+Querying.swift similarity index 87% rename from HardcoreData/Fetching and Querying/DataStack+Querying.swift rename to CoreStore/Fetching and Querying/DataStack+Querying.swift index a8fc8b8..dae22de 100644 --- a/HardcoreData/Fetching and Querying/DataStack+Querying.swift +++ b/CoreStore/Fetching and Querying/DataStack+Querying.swift @@ -1,6 +1,6 @@ // // DataStack+Querying.swift -// HardcoreData +// CoreStore // // Copyright (c) 2015 John Rommel Estropia // @@ -43,7 +43,7 @@ public extension DataStack { */ public func fetchOne(from: From, _ fetchClauses: FetchClause...) -> T? { - HardcoreData.assert(NSThread.isMainThread(), "Attempted to fetch from a \(typeName(self)) outside the main thread.") + CoreStore.assert(NSThread.isMainThread(), "Attempted to fetch from a \(typeName(self)) outside the main thread.") return self.mainContext.fetchOne(from, fetchClauses) } @@ -57,7 +57,7 @@ public extension DataStack { */ public func fetchOne(from: From, _ fetchClauses: [FetchClause]) -> T? { - HardcoreData.assert(NSThread.isMainThread(), "Attempted to fetch from a \(typeName(self)) outside the main thread.") + CoreStore.assert(NSThread.isMainThread(), "Attempted to fetch from a \(typeName(self)) outside the main thread.") return self.mainContext.fetchOne(from, fetchClauses) } @@ -71,7 +71,7 @@ public extension DataStack { */ public func fetchAll(from: From, _ fetchClauses: FetchClause...) -> [T]? { - HardcoreData.assert(NSThread.isMainThread(), "Attempted to fetch from a \(typeName(self)) outside the main thread.") + CoreStore.assert(NSThread.isMainThread(), "Attempted to fetch from a \(typeName(self)) outside the main thread.") return self.mainContext.fetchAll(from, fetchClauses) } @@ -85,7 +85,7 @@ public extension DataStack { */ public func fetchAll(from: From, _ fetchClauses: [FetchClause]) -> [T]? { - HardcoreData.assert(NSThread.isMainThread(), "Attempted to fetch from a \(typeName(self)) outside the main thread.") + CoreStore.assert(NSThread.isMainThread(), "Attempted to fetch from a \(typeName(self)) outside the main thread.") return self.mainContext.fetchAll(from, fetchClauses) } @@ -99,7 +99,7 @@ public extension DataStack { */ public func fetchCount(from: From, _ fetchClauses: FetchClause...) -> Int? { - HardcoreData.assert(NSThread.isMainThread(), "Attempted to fetch from a \(typeName(self)) outside the main thread.") + CoreStore.assert(NSThread.isMainThread(), "Attempted to fetch from a \(typeName(self)) outside the main thread.") return self.mainContext.fetchCount(from, fetchClauses) } @@ -113,7 +113,7 @@ public extension DataStack { */ public func fetchCount(from: From, _ fetchClauses: [FetchClause]) -> Int? { - HardcoreData.assert(NSThread.isMainThread(), "Attempted to fetch from a \(typeName(self)) outside the main thread.") + CoreStore.assert(NSThread.isMainThread(), "Attempted to fetch from a \(typeName(self)) outside the main thread.") return self.mainContext.fetchCount(from, fetchClauses) } @@ -127,7 +127,7 @@ public extension DataStack { */ public func fetchObjectID(from: From, _ fetchClauses: FetchClause...) -> NSManagedObjectID? { - HardcoreData.assert(NSThread.isMainThread(), "Attempted to fetch from a \(typeName(self)) outside the main thread.") + CoreStore.assert(NSThread.isMainThread(), "Attempted to fetch from a \(typeName(self)) outside the main thread.") return self.mainContext.fetchObjectID(from, fetchClauses) } @@ -141,7 +141,7 @@ public extension DataStack { */ public func fetchObjectID(from: From, _ fetchClauses: [FetchClause]) -> NSManagedObjectID? { - HardcoreData.assert(NSThread.isMainThread(), "Attempted to fetch from a \(typeName(self)) outside the main thread.") + CoreStore.assert(NSThread.isMainThread(), "Attempted to fetch from a \(typeName(self)) outside the main thread.") return self.mainContext.fetchObjectID(from, fetchClauses) } @@ -155,7 +155,7 @@ public extension DataStack { */ public func fetchObjectIDs(from: From, _ fetchClauses: FetchClause...) -> [NSManagedObjectID]? { - HardcoreData.assert(NSThread.isMainThread(), "Attempted to fetch from a \(typeName(self)) outside the main thread.") + CoreStore.assert(NSThread.isMainThread(), "Attempted to fetch from a \(typeName(self)) outside the main thread.") return self.mainContext.fetchObjectIDs(from, fetchClauses) } @@ -169,7 +169,7 @@ public extension DataStack { */ public func fetchObjectIDs(from: From, _ fetchClauses: [FetchClause]) -> [NSManagedObjectID]? { - HardcoreData.assert(NSThread.isMainThread(), "Attempted to fetch from a \(typeName(self)) outside the main thread.") + CoreStore.assert(NSThread.isMainThread(), "Attempted to fetch from a \(typeName(self)) outside the main thread.") return self.mainContext.fetchObjectIDs(from, fetchClauses) } @@ -186,7 +186,7 @@ public extension DataStack { */ public func queryValue(from: From, _ selectClause: Select, _ queryClauses: QueryClause...) -> U? { - HardcoreData.assert(NSThread.isMainThread(), "Attempted to query from a \(typeName(self)) outside the main thread.") + CoreStore.assert(NSThread.isMainThread(), "Attempted to query from a \(typeName(self)) outside the main thread.") return self.mainContext.queryValue(from, selectClause, queryClauses) } @@ -203,7 +203,7 @@ public extension DataStack { */ public func queryValue(from: From, _ selectClause: Select, _ queryClauses: [QueryClause]) -> U? { - HardcoreData.assert(NSThread.isMainThread(), "Attempted to query from a \(typeName(self)) outside the main thread.") + CoreStore.assert(NSThread.isMainThread(), "Attempted to query from a \(typeName(self)) outside the main thread.") return self.mainContext.queryValue(from, selectClause, queryClauses) } @@ -220,7 +220,7 @@ public extension DataStack { */ public func queryAttributes(from: From, _ selectClause: Select, _ queryClauses: QueryClause...) -> [[NSString: AnyObject]]? { - HardcoreData.assert(NSThread.isMainThread(), "Attempted to query from a \(typeName(self)) outside the main thread.") + CoreStore.assert(NSThread.isMainThread(), "Attempted to query from a \(typeName(self)) outside the main thread.") return self.mainContext.queryAttributes(from, selectClause, queryClauses) } @@ -237,7 +237,7 @@ public extension DataStack { */ public func queryAttributes(from: From, _ selectClause: Select, _ queryClauses: [QueryClause]) -> [[NSString: AnyObject]]? { - HardcoreData.assert(NSThread.isMainThread(), "Attempted to query from a \(typeName(self)) outside the main thread.") + CoreStore.assert(NSThread.isMainThread(), "Attempted to query from a \(typeName(self)) outside the main thread.") return self.mainContext.queryAttributes(from, selectClause, queryClauses) } diff --git a/HardcoreData/Fetching and Querying/Protocol Clauses/ClauseTypes.swift b/CoreStore/Fetching and Querying/Protocol Clauses/ClauseTypes.swift similarity index 98% rename from HardcoreData/Fetching and Querying/Protocol Clauses/ClauseTypes.swift rename to CoreStore/Fetching and Querying/Protocol Clauses/ClauseTypes.swift index 05c74e7..3275fa6 100644 --- a/HardcoreData/Fetching and Querying/Protocol Clauses/ClauseTypes.swift +++ b/CoreStore/Fetching and Querying/Protocol Clauses/ClauseTypes.swift @@ -1,6 +1,6 @@ // // ClauseTypes.swift -// HardcoreData +// CoreStore // // Copyright (c) 2014 John Rommel Estropia // diff --git a/HardcoreData/Info.plist b/CoreStore/Info.plist similarity index 100% rename from HardcoreData/Info.plist rename to CoreStore/Info.plist diff --git a/HardcoreData/Internal/AssociatedObjects.swift b/CoreStore/Internal/AssociatedObjects.swift similarity index 98% rename from HardcoreData/Internal/AssociatedObjects.swift rename to CoreStore/Internal/AssociatedObjects.swift index 578d583..34cb330 100644 --- a/HardcoreData/Internal/AssociatedObjects.swift +++ b/CoreStore/Internal/AssociatedObjects.swift @@ -1,6 +1,6 @@ // -// NSObject+HardcoreData.swift -// HardcoreData +// NSObject+CoreStore.swift +// CoreStore // // Copyright (c) 2014 John Rommel Estropia // diff --git a/HardcoreData/Internal/NSManagedObject+Transaction.swift b/CoreStore/Internal/NSManagedObject+Transaction.swift similarity index 92% rename from HardcoreData/Internal/NSManagedObject+Transaction.swift rename to CoreStore/Internal/NSManagedObject+Transaction.swift index e306105..66d9c49 100644 --- a/HardcoreData/Internal/NSManagedObject+Transaction.swift +++ b/CoreStore/Internal/NSManagedObject+Transaction.swift @@ -1,6 +1,6 @@ // // NSManagedObject+Transaction.swift -// HardcoreData +// CoreStore // // Copyright (c) 2014 John Rommel Estropia // @@ -70,8 +70,8 @@ internal extension NSManagedObject { } if didSucceed != true { - HardcoreData.handleError( - error ?? NSError(hardcoreDataErrorCode: .UnknownError), + CoreStore.handleError( + error ?? NSError(coreStoreErrorCode: .UnknownError), "Failed to obtain permanent ID for object.") return nil } @@ -83,9 +83,9 @@ internal extension NSManagedObject { return (existingObject as! T) } - HardcoreData.handleError( - error ?? NSError(hardcoreDataErrorCode: .UnknownError), + CoreStore.handleError( + error ?? NSError(coreStoreErrorCode: .UnknownError), "Failed to load existing <\(T.self)> in context.") return nil; } -} \ No newline at end of file +} diff --git a/HardcoreData/Internal/NSManagedObjectContext+HardcoreData.swift b/CoreStore/Internal/NSManagedObjectContext+CoreStore.swift similarity index 93% rename from HardcoreData/Internal/NSManagedObjectContext+HardcoreData.swift rename to CoreStore/Internal/NSManagedObjectContext+CoreStore.swift index 068fc88..68424fe 100644 --- a/HardcoreData/Internal/NSManagedObjectContext+HardcoreData.swift +++ b/CoreStore/Internal/NSManagedObjectContext+CoreStore.swift @@ -1,6 +1,6 @@ // -// NSManagedObjectContext+HardcoreData.swift -// HardcoreData +// NSManagedObjectContext+CoreStore.swift +// CoreStore // // Copyright (c) 2014 John Rommel Estropia // @@ -66,7 +66,7 @@ internal extension NSManagedObjectContext { return nil } - internal func setupForHardcoreDataWithContextName(contextName: String) { + internal func setupForCoreStoreWithContextName(contextName: String) { if self.respondsToSelector("setName:") { @@ -92,8 +92,8 @@ internal extension NSManagedObjectContext { return } - HardcoreData.handleError( - error ?? NSError(hardcoreDataErrorCode: .UnknownError), + CoreStore.handleError( + error ?? NSError(coreStoreErrorCode: .UnknownError), "Failed to obtain permanent ID(s) for \(numberOfInsertedObjects) inserted object(s)." ) } diff --git a/HardcoreData/Internal/NSManagedObjectContext+Querying.swift b/CoreStore/Internal/NSManagedObjectContext+Querying.swift similarity index 92% rename from HardcoreData/Internal/NSManagedObjectContext+Querying.swift rename to CoreStore/Internal/NSManagedObjectContext+Querying.swift index 75dcce0..3bce69f 100644 --- a/HardcoreData/Internal/NSManagedObjectContext+Querying.swift +++ b/CoreStore/Internal/NSManagedObjectContext+Querying.swift @@ -1,6 +1,6 @@ // // NSManagedObjectContext+Querying.swift -// HardcoreData +// CoreStore // // Copyright (c) 2015 John Rommel Estropia // @@ -59,8 +59,8 @@ internal extension NSManagedObjectContext { } if fetchResults == nil { - HardcoreData.handleError( - error ?? NSError(hardcoreDataErrorCode: .UnknownError), + CoreStore.handleError( + error ?? NSError(coreStoreErrorCode: .UnknownError), "Failed executing fetch request.") return nil } @@ -94,8 +94,8 @@ internal extension NSManagedObjectContext { } if fetchResults == nil { - HardcoreData.handleError( - error ?? NSError(hardcoreDataErrorCode: .UnknownError), + CoreStore.handleError( + error ?? NSError(coreStoreErrorCode: .UnknownError), "Failed executing fetch request.") return nil } @@ -126,8 +126,8 @@ internal extension NSManagedObjectContext { } if count == NSNotFound { - HardcoreData.handleError( - error ?? NSError(hardcoreDataErrorCode: .UnknownError), + CoreStore.handleError( + error ?? NSError(coreStoreErrorCode: .UnknownError), "Failed executing fetch request.") return nil } @@ -161,8 +161,8 @@ internal extension NSManagedObjectContext { } if fetchResults == nil { - HardcoreData.handleError( - error ?? NSError(hardcoreDataErrorCode: .UnknownError), + CoreStore.handleError( + error ?? NSError(coreStoreErrorCode: .UnknownError), "Failed executing fetch request.") return nil } @@ -196,8 +196,8 @@ internal extension NSManagedObjectContext { } if fetchResults == nil { - HardcoreData.handleError( - error ?? NSError(hardcoreDataErrorCode: .UnknownError), + CoreStore.handleError( + error ?? NSError(coreStoreErrorCode: .UnknownError), "Failed executing fetch request.") return nil } @@ -242,8 +242,8 @@ internal extension NSManagedObjectContext { } if numberOfDeletedObjects == nil { - HardcoreData.handleError( - error ?? NSError(hardcoreDataErrorCode: .UnknownError), + CoreStore.handleError( + error ?? NSError(coreStoreErrorCode: .UnknownError), "Failed executing fetch request.") return nil } @@ -286,8 +286,8 @@ internal extension NSManagedObjectContext { return nil } - HardcoreData.handleError( - error ?? NSError(hardcoreDataErrorCode: .UnknownError), + CoreStore.handleError( + error ?? NSError(coreStoreErrorCode: .UnknownError), "Failed executing fetch request.") return nil } @@ -322,9 +322,9 @@ internal extension NSManagedObjectContext { return Select.ReturnType.fromResultObjects(fetchResults) } - HardcoreData.handleError( - error ?? NSError(hardcoreDataErrorCode: .UnknownError), + CoreStore.handleError( + error ?? NSError(coreStoreErrorCode: .UnknownError), "Failed executing fetch request.") return nil } -} \ No newline at end of file +} diff --git a/HardcoreData/Internal/NSManagedObjectContext+Setup.swift b/CoreStore/Internal/NSManagedObjectContext+Setup.swift similarity index 95% rename from HardcoreData/Internal/NSManagedObjectContext+Setup.swift rename to CoreStore/Internal/NSManagedObjectContext+Setup.swift index 3e38ccb..53b84a1 100644 --- a/HardcoreData/Internal/NSManagedObjectContext+Setup.swift +++ b/CoreStore/Internal/NSManagedObjectContext+Setup.swift @@ -1,6 +1,6 @@ // // NSManagedObjectContext+Setup.swift -// HardcoreData +// CoreStore // // Copyright (c) 2015 John Rommel Estropia // @@ -65,7 +65,7 @@ internal extension NSManagedObjectContext { context.persistentStoreCoordinator = coordinator context.mergePolicy = NSMergeByPropertyObjectTrumpMergePolicy context.undoManager = nil - context.setupForHardcoreDataWithContextName("com.hardcoredata.rootcontext") + context.setupForCoreStoreWithContextName("com.corestore.rootcontext") return context } @@ -76,7 +76,7 @@ internal extension NSManagedObjectContext { context.parentContext = rootContext context.shouldCascadeSavesToParent = true context.undoManager = nil - context.setupForHardcoreDataWithContextName("com.hardcoredata.maincontext") + context.setupForCoreStoreWithContextName("com.corestore.maincontext") context.observerForDidSaveNotification = NotificationObserver( notificationName: NSManagedObjectContextDidSaveNotification, object: rootContext, diff --git a/HardcoreData/Internal/NSManagedObjectContext+Transaction.swift b/CoreStore/Internal/NSManagedObjectContext+Transaction.swift similarity index 96% rename from HardcoreData/Internal/NSManagedObjectContext+Transaction.swift rename to CoreStore/Internal/NSManagedObjectContext+Transaction.swift index 8012a2f..4f3173d 100644 --- a/HardcoreData/Internal/NSManagedObjectContext+Transaction.swift +++ b/CoreStore/Internal/NSManagedObjectContext+Transaction.swift @@ -1,6 +1,6 @@ // // NSManagedObjectContext+Transaction.swift -// HardcoreData +// CoreStore // // Copyright (c) 2015 John Rommel Estropia // @@ -58,7 +58,7 @@ internal extension NSManagedObjectContext { let context = NSManagedObjectContext(concurrencyType: concurrencyType) context.parentContext = self context.parentStack = self.parentStack - context.setupForHardcoreDataWithContextName("com.hardcoredata.temporarycontext") + context.setupForCoreStoreWithContextName("com.corestore.temporarycontext") context.shouldCascadeSavesToParent = (self.parentStack?.rootSavingContext == self) context.retainsRegisteredObjects = true @@ -98,7 +98,7 @@ internal extension NSManagedObjectContext { } else if let error = saveError { - HardcoreData.handleError( + CoreStore.handleError( error, "Failed to save <\(NSManagedObjectContext.self)>.") result = SaveResult(error) @@ -157,7 +157,7 @@ internal extension NSManagedObjectContext { } else if let error = saveError { - HardcoreData.handleError( + CoreStore.handleError( error, "Failed to save <\(NSManagedObjectContext.self)>.") if let completion = completion { @@ -185,4 +185,4 @@ internal extension NSManagedObjectContext { static var parentTransaction: Void? } -} \ No newline at end of file +} diff --git a/HardcoreData/Internal/NotificationObserver.swift b/CoreStore/Internal/NotificationObserver.swift similarity index 99% rename from HardcoreData/Internal/NotificationObserver.swift rename to CoreStore/Internal/NotificationObserver.swift index 62c7771..ad4d899 100644 --- a/HardcoreData/Internal/NotificationObserver.swift +++ b/CoreStore/Internal/NotificationObserver.swift @@ -1,6 +1,6 @@ // // NotificationObserver.swift -// HardcoreData +// CoreStore // // Copyright (c) 2014 John Rommel Estropia // diff --git a/HardcoreData/Internal/WeakObject.swift b/CoreStore/Internal/WeakObject.swift similarity index 98% rename from HardcoreData/Internal/WeakObject.swift rename to CoreStore/Internal/WeakObject.swift index 08a502d..a074d24 100644 --- a/HardcoreData/Internal/WeakObject.swift +++ b/CoreStore/Internal/WeakObject.swift @@ -1,6 +1,6 @@ // // WeakObject.swift -// HardcoreData +// CoreStore // // Copyright (c) 2015 John Rommel Estropia // diff --git a/HardcoreData/Logging/HardcoreData+Logging.swift b/CoreStore/Logging/CoreStore+Logging.swift similarity index 89% rename from HardcoreData/Logging/HardcoreData+Logging.swift rename to CoreStore/Logging/CoreStore+Logging.swift index f0ff785..c0284f0 100644 --- a/HardcoreData/Logging/HardcoreData+Logging.swift +++ b/CoreStore/Logging/CoreStore+Logging.swift @@ -1,6 +1,6 @@ // -// HardcoreData+Logging.swift -// HardcoreData +// CoreStore+Logging.swift +// CoreStore // // Copyright (c) 2015 John Rommel Estropia // @@ -26,16 +26,16 @@ import Foundation -// MARK: - HardcoreData +// MARK: - CoreStore -public extension HardcoreData { +public extension CoreStore { // MARK: Public /** - The `HardcoreDataLogger` instance to be used. The default logger is an instance of a `DefaultLogger`. + The `CoreStoreLogger` instance to be used. The default logger is an instance of a `DefaultLogger`. */ - public static var logger: HardcoreDataLogger = DefaultLogger() + public static var logger: CoreStoreLogger = DefaultLogger() // MARK: Internal @@ -72,4 +72,4 @@ public extension HardcoreData { lineNumber: lineNumber, functionName: functionName) } -} \ No newline at end of file +} diff --git a/HardcoreData/Logging/HardcoreDataLogger.swift b/CoreStore/Logging/CoreStoreLogger.swift similarity index 81% rename from HardcoreData/Logging/HardcoreDataLogger.swift rename to CoreStore/Logging/CoreStoreLogger.swift index f5cafba..631b266 100644 --- a/HardcoreData/Logging/HardcoreDataLogger.swift +++ b/CoreStore/Logging/CoreStoreLogger.swift @@ -1,6 +1,6 @@ // -// HardcoreDataLogger.swift -// HardcoreData +// CoreStoreLogger.swift +// CoreStore // // Copyright (c) 2015 John Rommel Estropia // @@ -40,15 +40,15 @@ public enum LogLevel { } -// MARK: - HardcoreDataLogger +// MARK: - CoreStoreLogger /** -Custom loggers should implement the `HardcoreDataLogger` protocol and pass its instance to `HardcoreData.logger`. Calls to `log(...)`, `handleError(...)`, and `assert(...)` are not tied to a specific queue/thread, so it is the implementer's job to handle thread-safety. +Custom loggers should implement the `CoreStoreLogger` protocol and pass its instance to `CoreStore.logger`. Calls to `log(...)`, `handleError(...)`, and `assert(...)` are not tied to a specific queue/thread, so it is the implementer's job to handle thread-safety. */ -public protocol HardcoreDataLogger { +public protocol CoreStoreLogger { /** - Handles log messages sent by the `HardcoreData` framework. + Handles log messages sent by the `CoreStore` framework. :level: the severity of the log message :message: the log message @@ -59,7 +59,7 @@ public protocol HardcoreDataLogger { func log(#level: LogLevel, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString) /** - Handles errors sent by the `HardcoreData` framework. + Handles errors sent by the `CoreStore` framework. :error: the error :message: the error message @@ -70,7 +70,7 @@ public protocol HardcoreDataLogger { func handleError(#error: NSError, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString) /** - Handles assertions made throughout the `HardcoreData` framework. + Handles assertions made throughout the `CoreStore` framework. :condition: the assertion condition :message: the assertion message diff --git a/HardcoreData/Logging/DefaultLogger.swift b/CoreStore/Logging/DefaultLogger.swift similarity index 84% rename from HardcoreData/Logging/DefaultLogger.swift rename to CoreStore/Logging/DefaultLogger.swift index f86cacf..7961dd5 100644 --- a/HardcoreData/Logging/DefaultLogger.swift +++ b/CoreStore/Logging/DefaultLogger.swift @@ -1,6 +1,6 @@ // // DefaultLogger.swift -// HardcoreData +// CoreStore // // Copyright (c) 2015 John Rommel Estropia // @@ -29,13 +29,13 @@ import Foundation // MARK: - DefaultLogger /** -The `DefaultLogger` is a basic implementation of the `HardcoreDataLogger` protocol. +The `DefaultLogger` is a basic implementation of the `CoreStoreLogger` protocol. - The `log(...)` method calls `println(...)` to print the level, source file name, line number, function name, and the log message. - The `handleError(...)` method calls `println(...)` to print the source file name, line number, function name, and the error message. - The `assert(...)` method calls `assert(...)` on the arguments. */ -public final class DefaultLogger: HardcoreDataLogger { +public final class DefaultLogger: CoreStoreLogger { public func log(#level: LogLevel, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString) { @@ -47,14 +47,14 @@ public final class DefaultLogger: HardcoreDataLogger { case .Warning: levelString = "Warning" case .Fatal: levelString = "Fatal" } - Swift.println("[HardcoreData:\(levelString)] \(fileName.stringValue.lastPathComponent):\(lineNumber) \(functionName)\n ↪︎ \(message)\n") + Swift.println("[CoreStore:\(levelString)] \(fileName.stringValue.lastPathComponent):\(lineNumber) \(functionName)\n ↪︎ \(message)\n") #endif } public func handleError(#error: NSError, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString) { #if DEBUG - Swift.println("[HardcoreData:Error] \(fileName.stringValue.lastPathComponent):\(lineNumber) \(functionName)\n ↪︎ \(message): \(error)\n") + Swift.println("[CoreStore:Error] \(fileName.stringValue.lastPathComponent):\(lineNumber) \(functionName)\n ↪︎ \(message): \(error)\n") #endif } diff --git a/HardcoreData/NSError+HardcoreData.swift b/CoreStore/NSError+CoreStore.swift similarity index 62% rename from HardcoreData/NSError+HardcoreData.swift rename to CoreStore/NSError+CoreStore.swift index 203fec7..cfa5fb2 100644 --- a/HardcoreData/NSError+HardcoreData.swift +++ b/CoreStore/NSError+CoreStore.swift @@ -1,6 +1,6 @@ // -// NSError+HardcoreData.swift -// HardcoreData +// NSError+CoreStore.swift +// CoreStore // // Copyright (c) 2014 John Rommel Estropia // @@ -26,14 +26,14 @@ import Foundation /** -The `NSError` error domain for `HardcoreData`. +The `NSError` error domain for `CoreStore`. */ -public let HardcoreDataErrorDomain = "com.hardcoredata.error" +public let CoreStoreErrorDomain = "com.corestore.error" /** -The `NSError` error codes for `HardcoreDataErrorDomain`. +The `NSError` error codes for `CoreStoreErrorDomain`. */ -public enum HardcoreDataErrorCode: Int { +public enum CoreStoreErrorCode: Int { /** A failure occured because of an unknown error. @@ -47,33 +47,33 @@ public enum HardcoreDataErrorCode: Int { } -// MARK: - NSError+HardcoreData +// MARK: - NSError+CoreStore public extension NSError { /** - If the error's domain is equal to `HardcoreDataErrorDomain`, returns the associated `HardcoreDataErrorCode`. For other domains, returns `nil`. + If the error's domain is equal to `CoreStoreErrorDomain`, returns the associated `CoreStoreErrorCode`. For other domains, returns `nil`. */ - public var hardcoreDataErrorCode: HardcoreDataErrorCode? { + public var coreStoreErrorCode: CoreStoreErrorCode? { - return (self.domain == HardcoreDataErrorDomain - ? HardcoreDataErrorCode(rawValue: self.code) + return (self.domain == CoreStoreErrorDomain + ? CoreStoreErrorCode(rawValue: self.code) : nil) } // MARK: Internal - internal convenience init(hardcoreDataErrorCode: HardcoreDataErrorCode) { + internal convenience init(coreStoreErrorCode: CoreStoreErrorCode) { - self.init(hardcoreDataErrorCode: hardcoreDataErrorCode, userInfo: nil) + self.init(coreStoreErrorCode: coreStoreErrorCode, userInfo: nil) } - internal convenience init(hardcoreDataErrorCode: HardcoreDataErrorCode, userInfo: [NSObject: AnyObject]?) { + internal convenience init(coreStoreErrorCode: CoreStoreErrorCode, userInfo: [NSObject: AnyObject]?) { self.init( - domain: HardcoreDataErrorDomain, - code: hardcoreDataErrorCode.rawValue, + domain: CoreStoreErrorDomain, + code: coreStoreErrorCode.rawValue, userInfo: userInfo) } -} \ No newline at end of file +} diff --git a/HardcoreData/Observing/HardcoreData+Observing.swift b/CoreStore/Observing/CoreStore+Observing.swift similarity index 98% rename from HardcoreData/Observing/HardcoreData+Observing.swift rename to CoreStore/Observing/CoreStore+Observing.swift index 1c788dc..ed733db 100644 --- a/HardcoreData/Observing/HardcoreData+Observing.swift +++ b/CoreStore/Observing/CoreStore+Observing.swift @@ -1,6 +1,6 @@ // -// HardcoreData+Observing.swift -// HardcoreData +// CoreStore+Observing.swift +// CoreStore // // Copyright (c) 2015 John Rommel Estropia // @@ -27,9 +27,9 @@ import Foundation import CoreData -// MARK: - HardcoreData +// MARK: - CoreStore -public extension HardcoreData { +public extension CoreStore { // MARK: Public @@ -93,4 +93,4 @@ public extension HardcoreData { return self.defaultStack.observeSectionedList(from, sectionedBy, fetchClauses) } -} \ No newline at end of file +} diff --git a/HardcoreData/Observing/DataStack+Observing.swift b/CoreStore/Observing/DataStack+Observing.swift similarity index 93% rename from HardcoreData/Observing/DataStack+Observing.swift rename to CoreStore/Observing/DataStack+Observing.swift index f93d55e..346cd00 100644 --- a/HardcoreData/Observing/DataStack+Observing.swift +++ b/CoreStore/Observing/DataStack+Observing.swift @@ -1,6 +1,6 @@ // // DataStack+Observing.swift -// HardcoreData +// CoreStore // // Copyright (c) 2015 John Rommel Estropia // @@ -42,7 +42,7 @@ public extension DataStack { */ public func observeObject(object: T) -> ManagedObjectController { - HardcoreData.assert(NSThread.isMainThread(), "Attempted to observe objects from \(typeName(self)) outside the main thread.") + CoreStore.assert(NSThread.isMainThread(), "Attempted to observe objects from \(typeName(self)) outside the main thread.") return ManagedObjectController( dataStack: self, @@ -71,7 +71,7 @@ public extension DataStack { */ public func observeObjectList(from: From, _ fetchClauses: [FetchClause]) -> ManagedObjectListController { - HardcoreData.assert(NSThread.isMainThread(), "Attempted to observe objects from \(typeName(self)) outside the main thread.") + CoreStore.assert(NSThread.isMainThread(), "Attempted to observe objects from \(typeName(self)) outside the main thread.") return ManagedObjectListController( dataStack: self, @@ -104,7 +104,7 @@ public extension DataStack { */ public func observeSectionedList(from: From, _ sectionedBy: SectionedBy, _ fetchClauses: [FetchClause]) -> ManagedObjectListController { - HardcoreData.assert(NSThread.isMainThread(), "Attempted to observe objects from \(typeName(self)) outside the main thread.") + CoreStore.assert(NSThread.isMainThread(), "Attempted to observe objects from \(typeName(self)) outside the main thread.") return ManagedObjectListController( dataStack: self, diff --git a/HardcoreData/Observing/ManagedObjectController.swift b/CoreStore/Observing/ManagedObjectController.swift similarity index 96% rename from HardcoreData/Observing/ManagedObjectController.swift rename to CoreStore/Observing/ManagedObjectController.swift index f28d048..261092d 100644 --- a/HardcoreData/Observing/ManagedObjectController.swift +++ b/CoreStore/Observing/ManagedObjectController.swift @@ -1,6 +1,6 @@ // // ManagedObjectController.swift -// HardcoreData +// CoreStore // // Copyright (c) 2015 John Rommel Estropia // @@ -47,7 +47,7 @@ private struct NotificationKey { /** The `ManagedObjectController` monitors changes to a single `NSManagedObject` instance. Observers that implement the `ManagedObjectObserver` protocol may then register themselves to the `ManagedObjectController`'s `addObserver(_:)` method: - let objectController = HardcoreData.observeObject(object) + let objectController = CoreStore.observeObject(object) objectController.addObserver(self) The created `ManagedObjectController` instance needs to be held on (retained) for as long as the object needs to be observed. @@ -87,7 +87,7 @@ public final class ManagedObjectController { */ public func addObserver(observer: U) { - HardcoreData.assert(NSThread.isMainThread(), "Attempted to add an observer of type \(typeName(observer)) outside the main thread.") + CoreStore.assert(NSThread.isMainThread(), "Attempted to add an observer of type \(typeName(observer)) outside the main thread.") self.removeObserver(observer) @@ -155,7 +155,7 @@ public final class ManagedObjectController { */ public func removeObserver(observer: U) { - HardcoreData.assert(NSThread.isMainThread(), "Attempted to remove an observer of type \(typeName(observer)) outside the main thread.") + CoreStore.assert(NSThread.isMainThread(), "Attempted to remove an observer of type \(typeName(observer)) outside the main thread.") let nilValue: AnyObject? = nil setAssociatedRetainedObject(nilValue, forKey: &NotificationKey.willChangeObject, inObject: observer) @@ -199,8 +199,8 @@ public final class ManagedObjectController { var error: NSError? if !fetchedResultsController.performFetch(&error) { - HardcoreData.handleError( - error ?? NSError(hardcoreDataErrorCode: .UnknownError), + CoreStore.handleError( + error ?? NSError(coreStoreErrorCode: .UnknownError), "Failed to perform fetch on <\(NSFetchedResultsController.self)>.") } diff --git a/HardcoreData/Observing/ManagedObjectListController.swift b/CoreStore/Observing/ManagedObjectListController.swift similarity index 97% rename from HardcoreData/Observing/ManagedObjectListController.swift rename to CoreStore/Observing/ManagedObjectListController.swift index 5538ded..d067756 100644 --- a/HardcoreData/Observing/ManagedObjectListController.swift +++ b/CoreStore/Observing/ManagedObjectListController.swift @@ -1,6 +1,6 @@ // // ManagedObjectListController.swift -// HardcoreData +// CoreStore // // Copyright (c) 2015 John Rommel Estropia // @@ -33,7 +33,7 @@ import GCDKit /** The `SectionedBy` clause indicates the key path to use to group the `ManagedObjectListController` objects into sections. An optional closure can also be provided to transform the value into an appropriate section name: - let listController = HardcoreData.observeSectionedList( + let listController = CoreStore.observeSectionedList( From(MyPersonEntity), SectionedBy("age") { "Age \($0)" }, OrderBy(.Ascending("lastName")) @@ -78,7 +78,7 @@ public struct SectionedBy { /** The `ManagedObjectListController` monitors changes to a list of `NSManagedObject` instances. Observers that implement the `ManagedObjectListChangeObserver` protocol may then register themselves to the `ManagedObjectListController`'s `addObserver(_:)` method: - let listController = HardcoreData.observeObjectList( + let listController = CoreStore.observeObjectList( From(MyPersonEntity), Where("title", isEqualTo: "Engineer"), OrderBy(.Ascending("lastName")) @@ -96,7 +96,7 @@ Accessing the list with an index above the valid range will throw an exception. Creating a sectioned-list is also possible with the `observeSectionedList(...)` method: - let listController = HardcoreData.observeSectionedList( + let listController = CoreStore.observeSectionedList( From(MyPersonEntity), SectionedBy("age") { "Age \($0)" }, Where("title", isEqualTo: "Engineer"), @@ -188,7 +188,7 @@ public final class ManagedObjectListController { */ public func addObserver(observer: U) { - HardcoreData.assert(NSThread.isMainThread(), "Attempted to add an observer of type \(typeName(observer)) outside the main thread.") + CoreStore.assert(NSThread.isMainThread(), "Attempted to add an observer of type \(typeName(observer)) outside the main thread.") self.removeObserver(observer) @@ -231,7 +231,7 @@ public final class ManagedObjectListController { */ public func addObserver(observer: U) { - HardcoreData.assert(NSThread.isMainThread(), "Attempted to add an observer of type \(typeName(observer)) outside the main thread.") + CoreStore.assert(NSThread.isMainThread(), "Attempted to add an observer of type \(typeName(observer)) outside the main thread.") self.removeObserver(observer) @@ -340,7 +340,7 @@ public final class ManagedObjectListController { */ public func addObserver(observer: U) { - HardcoreData.assert(NSThread.isMainThread(), "Attempted to add an observer of type \(typeName(observer)) outside the main thread.") + CoreStore.assert(NSThread.isMainThread(), "Attempted to add an observer of type \(typeName(observer)) outside the main thread.") self.removeObserver(observer) @@ -478,7 +478,7 @@ public final class ManagedObjectListController { */ public func removeObserver(observer: U) { - HardcoreData.assert(NSThread.isMainThread(), "Attempted to remove an observer of type \(typeName(observer)) outside the main thread.") + CoreStore.assert(NSThread.isMainThread(), "Attempted to remove an observer of type \(typeName(observer)) outside the main thread.") let nilValue: AnyObject? = nil setAssociatedRetainedObject(nilValue, forKey: &NotificationKey.willChangeList, inObject: observer) @@ -540,8 +540,8 @@ public final class ManagedObjectListController { var error: NSError? if !fetchedResultsController.performFetch(&error) { - HardcoreData.handleError( - error ?? NSError(hardcoreDataErrorCode: .UnknownError), + CoreStore.handleError( + error ?? NSError(coreStoreErrorCode: .UnknownError), "Failed to perform fetch on <\(NSFetchedResultsController.self)>.") } } diff --git a/HardcoreData/Observing/ManagedObjectListObserver.swift b/CoreStore/Observing/ManagedObjectListObserver.swift similarity index 97% rename from HardcoreData/Observing/ManagedObjectListObserver.swift rename to CoreStore/Observing/ManagedObjectListObserver.swift index 06064b5..dd2b87e 100644 --- a/HardcoreData/Observing/ManagedObjectListObserver.swift +++ b/CoreStore/Observing/ManagedObjectListObserver.swift @@ -1,6 +1,6 @@ // // ManagedObjectListObserver.swift -// HardcoreData +// CoreStore // // Copyright (c) 2015 John Rommel Estropia // @@ -32,7 +32,7 @@ import CoreData /** Implement the `ManagedObjectListChangeObserver` protocol to observe changes to a list of `NSManagedObject`'s. `ManagedObjectListChangeObserver`'s may register themselves to a `ManagedObjectListController`'s `addObserver(_:)` method: - let listController = HardcoreData.observeObjectList( + let listController = CoreStore.observeObjectList( From(MyPersonEntity), OrderBy(.Ascending("lastName")) ) @@ -66,7 +66,7 @@ public protocol ManagedObjectListChangeObserver: class { /** Implement the `ManagedObjectListObjectObserver` protocol to observe detailed changes to a list's object. `ManagedObjectListObjectObserver`'s may register themselves to a `ManagedObjectListController`'s `addObserver(_:)` method: - let listController = HardcoreData.observeObjectList( + let listController = CoreStore.observeObjectList( From(MyPersonEntity), OrderBy(.Ascending("lastName")) ) @@ -118,7 +118,7 @@ public protocol ManagedObjectListObjectObserver: ManagedObjectListChangeObserver /** Implement the `ManagedObjectListSectionObserver` protocol to observe changes to a list's section info. `ManagedObjectListSectionObserver`'s may register themselves to a `ManagedObjectListController`'s `addObserver(_:)` method: - let listController = HardcoreData.observeSectionedList( + let listController = CoreStore.observeSectionedList( From(MyPersonEntity), SectionedBy("age") { "Age \($0)" }, OrderBy(.Ascending("lastName")) diff --git a/HardcoreData/Observing/ManagedObjectObserver.swift b/CoreStore/Observing/ManagedObjectObserver.swift similarity index 97% rename from HardcoreData/Observing/ManagedObjectObserver.swift rename to CoreStore/Observing/ManagedObjectObserver.swift index 6f235d2..ae53068 100644 --- a/HardcoreData/Observing/ManagedObjectObserver.swift +++ b/CoreStore/Observing/ManagedObjectObserver.swift @@ -1,6 +1,6 @@ // // ManagedObjectObserver.swift -// HardcoreData +// CoreStore // // Copyright (c) 2015 John Rommel Estropia // @@ -32,7 +32,7 @@ import CoreData /** Implement the `ManagedObjectObserver` protocol to observe changes to a single `NSManagedObject` instance. `ManagedObjectObserver`'s may register themselves to a `ManagedObjectController`'s `addObserver(_:)` method: - let objectController = HardcoreData.observeObject(object) + let objectController = CoreStore.observeObject(object) objectController.addObserver(self) */ public protocol ManagedObjectObserver: class { diff --git a/HardcoreData/Saving and Processing/AsynchronousDataTransaction.swift b/CoreStore/Saving and Processing/AsynchronousDataTransaction.swift similarity index 76% rename from HardcoreData/Saving and Processing/AsynchronousDataTransaction.swift rename to CoreStore/Saving and Processing/AsynchronousDataTransaction.swift index 9a5f159..0e2e9cb 100644 --- a/HardcoreData/Saving and Processing/AsynchronousDataTransaction.swift +++ b/CoreStore/Saving and Processing/AsynchronousDataTransaction.swift @@ -1,6 +1,6 @@ // // AsynchronousDataTransaction.swift -// HardcoreData +// CoreStore // // Copyright (c) 2015 John Rommel Estropia // @@ -31,7 +31,7 @@ import GCDKit // MARK: - AsynchronousDataTransaction /** -The `AsynchronousDataTransaction` provides an interface for `NSManagedObject` creates, updates, and deletes. A transaction object should typically be only used from within a transaction block initiated from `DataStack.beginAsynchronous(_:)`, or from `HardcoreData.beginAsynchronous(_:)`. +The `AsynchronousDataTransaction` provides an interface for `NSManagedObject` creates, updates, and deletes. A transaction object should typically be only used from within a transaction block initiated from `DataStack.beginAsynchronous(_:)`, or from `CoreStore.beginAsynchronous(_:)`. */ public final class AsynchronousDataTransaction: BaseDataTransaction { @@ -44,8 +44,8 @@ public final class AsynchronousDataTransaction: BaseDataTransaction { */ public func commit(completion: (result: SaveResult) -> Void) { - HardcoreData.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to commit a \(typeName(self)) outside its designated queue.") - HardcoreData.assert(!self.isCommitted, "Attempted to commit a \(typeName(self)) more than once.") + CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to commit a \(typeName(self)) outside its designated queue.") + CoreStore.assert(!self.isCommitted, "Attempted to commit a \(typeName(self)) more than once.") self.isCommitted = true let semaphore = GCDSemaphore(0) @@ -63,8 +63,8 @@ public final class AsynchronousDataTransaction: BaseDataTransaction { */ public func commit() { - HardcoreData.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to commit a \(typeName(self)) outside its designated queue.") - HardcoreData.assert(!self.isCommitted, "Attempted to commit a \(typeName(self)) more than once.") + CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to commit a \(typeName(self)) outside its designated queue.") + CoreStore.assert(!self.isCommitted, "Attempted to commit a \(typeName(self)) more than once.") self.isCommitted = true self.result = self.context.saveSynchronously() @@ -78,8 +78,8 @@ public final class AsynchronousDataTransaction: BaseDataTransaction { */ public func beginSynchronous(closure: (transaction: SynchronousDataTransaction) -> Void) -> SaveResult? { - HardcoreData.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to begin a child transaction from a \(typeName(self)) outside its designated queue.") - HardcoreData.assert(!self.isCommitted, "Attempted to begin a child transaction from an already committed \(typeName(self)).") + CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to begin a child transaction from a \(typeName(self)) outside its designated queue.") + CoreStore.assert(!self.isCommitted, "Attempted to begin a child transaction from an already committed \(typeName(self)).") return SynchronousDataTransaction( mainContext: self.context, @@ -98,7 +98,7 @@ public final class AsynchronousDataTransaction: BaseDataTransaction { */ public override func create(into: Into) -> T { - HardcoreData.assert(!self.isCommitted, "Attempted to create an entity of type <\(T.self)> from an already committed \(typeName(self)).") + CoreStore.assert(!self.isCommitted, "Attempted to create an entity of type <\(T.self)> from an already committed \(typeName(self)).") return super.create(into) } @@ -111,7 +111,7 @@ public final class AsynchronousDataTransaction: BaseDataTransaction { */ public override func fetch(object: T?) -> T? { - HardcoreData.assert(!self.isCommitted, "Attempted to update an entity of type \(typeName(object)) from an already committed \(typeName(self)).") + CoreStore.assert(!self.isCommitted, "Attempted to update an entity of type \(typeName(object)) from an already committed \(typeName(self)).") return super.fetch(object) } @@ -123,7 +123,7 @@ public final class AsynchronousDataTransaction: BaseDataTransaction { */ public override func delete(object: NSManagedObject?) { - HardcoreData.assert(!self.isCommitted, "Attempted to delete an entity of type \(typeName(object)) from an already committed \(typeName(self)).") + CoreStore.assert(!self.isCommitted, "Attempted to delete an entity of type \(typeName(object)) from an already committed \(typeName(self)).") super.delete(object) } @@ -133,7 +133,7 @@ public final class AsynchronousDataTransaction: BaseDataTransaction { */ public override func rollback() { - HardcoreData.assert(!self.isCommitted, "Attempted to rollback an already committed \(typeName(self)).") + CoreStore.assert(!self.isCommitted, "Attempted to rollback an already committed \(typeName(self)).") super.rollback() } @@ -155,7 +155,7 @@ public final class AsynchronousDataTransaction: BaseDataTransaction { self.closure(transaction: self) if !self.isCommitted && self.hasChanges { - HardcoreData.log(.Warning, message: "The closure for the \(typeName(self)) completed without being committed. All changes made within the transaction were discarded.") + CoreStore.log(.Warning, message: "The closure for the \(typeName(self)) completed without being committed. All changes made within the transaction were discarded.") } } } @@ -167,7 +167,7 @@ public final class AsynchronousDataTransaction: BaseDataTransaction { self.closure(transaction: self) if !self.isCommitted && self.hasChanges { - HardcoreData.log(.Warning, message: "The closure for the \(typeName(self)) completed without being committed. All changes made within the transaction were discarded.") + CoreStore.log(.Warning, message: "The closure for the \(typeName(self)) completed without being committed. All changes made within the transaction were discarded.") } } return self.result diff --git a/HardcoreData/Saving and Processing/BaseDataTransaction.swift b/CoreStore/Saving and Processing/BaseDataTransaction.swift similarity index 83% rename from HardcoreData/Saving and Processing/BaseDataTransaction.swift rename to CoreStore/Saving and Processing/BaseDataTransaction.swift index 5e35501..e98a08b 100644 --- a/HardcoreData/Saving and Processing/BaseDataTransaction.swift +++ b/CoreStore/Saving and Processing/BaseDataTransaction.swift @@ -1,6 +1,6 @@ // // BaseDataTransaction.swift -// HardcoreData +// CoreStore // // Copyright (c) 2014 John Rommel Estropia // @@ -133,7 +133,7 @@ public /*abstract*/ class BaseDataTransaction { */ public func create(into: Into) -> T { - HardcoreData.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to create an entity of type <\(T.self)> outside its designated queue.") + CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to create an entity of type <\(T.self)> outside its designated queue.") let context = self.context let object = T.createInContext(context) @@ -146,10 +146,10 @@ public /*abstract*/ class BaseDataTransaction { context.assignObject(object, toPersistentStore: persistentStore) case (.None, true): - HardcoreData.assert(false, "Attempted to create an entity of type \(typeName(object)) with ambiguous destination persistent store, but the configuration name was not specified.") + CoreStore.assert(false, "Attempted to create an entity of type \(typeName(object)) with ambiguous destination persistent store, but the configuration name was not specified.") default: - HardcoreData.assert(false, "Attempted to create an entity of type \(typeName(object)), but a destination persistent store containing the entity type could not be found.") + CoreStore.assert(false, "Attempted to create an entity of type \(typeName(object)), but a destination persistent store containing the entity type could not be found.") } } else { @@ -162,11 +162,11 @@ public /*abstract*/ class BaseDataTransaction { default: if let configuration = into.configuration { - HardcoreData.assert(false, "Attempted to create an entity of type \(typeName(object)) into the configuration \"\(configuration)\", which it doesn't belong to.") + CoreStore.assert(false, "Attempted to create an entity of type \(typeName(object)) into the configuration \"\(configuration)\", which it doesn't belong to.") } else { - HardcoreData.assert(false, "Attempted to create an entity of type \(typeName(object)) into the default configuration, which it doesn't belong to.") + CoreStore.assert(false, "Attempted to create an entity of type \(typeName(object)) into the default configuration, which it doesn't belong to.") } } } @@ -182,7 +182,7 @@ public /*abstract*/ class BaseDataTransaction { */ public func fetch(object: T?) -> T? { - HardcoreData.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to update an entity of type \(typeName(object)) outside its designated queue.") + CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to update an entity of type \(typeName(object)) outside its designated queue.") return object?.inContext(self.context) } @@ -194,7 +194,7 @@ public /*abstract*/ class BaseDataTransaction { */ public func delete(object: NSManagedObject?) { - HardcoreData.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to delete an entity of type \(typeName(object)) outside its designated queue.") + CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to delete an entity of type \(typeName(object)) outside its designated queue.") object?.inContext(self.context)?.deleteFromContext() } @@ -206,7 +206,7 @@ public /*abstract*/ class BaseDataTransaction { */ public func rollback() { - HardcoreData.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to rollback a \(typeName(self)) outside its designated queue.") + CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to rollback a \(typeName(self)) outside its designated queue.") self.context.reset() } @@ -216,7 +216,7 @@ public /*abstract*/ class BaseDataTransaction { internal let context: NSManagedObjectContext internal let transactionQueue: GCDQueue - internal let childTransactionQueue: GCDQueue = .createSerial("com.hardcoredata.datastack.childtransactionqueue") + internal let childTransactionQueue: GCDQueue = .createSerial("com.corestore.datastack.childtransactionqueue") internal var isCommitted = false internal var result: SaveResult? diff --git a/HardcoreData/Saving and Processing/HardcoreData+Transaction.swift b/CoreStore/Saving and Processing/CoreStore+Transaction.swift similarity index 96% rename from HardcoreData/Saving and Processing/HardcoreData+Transaction.swift rename to CoreStore/Saving and Processing/CoreStore+Transaction.swift index 79757ea..b2fd5b0 100644 --- a/HardcoreData/Saving and Processing/HardcoreData+Transaction.swift +++ b/CoreStore/Saving and Processing/CoreStore+Transaction.swift @@ -1,6 +1,6 @@ // -// HardcoreData+Transaction.swift -// HardcoreData +// CoreStore+Transaction.swift +// CoreStore // // Copyright (c) 2015 John Rommel Estropia // @@ -26,9 +26,9 @@ import Foundation -// MARK: - HardcoreData +// MARK: - CoreStore -public extension HardcoreData { +public extension CoreStore { // MARK: Public diff --git a/HardcoreData/Saving and Processing/DataStack+Transaction.swift b/CoreStore/Saving and Processing/DataStack+Transaction.swift similarity index 88% rename from HardcoreData/Saving and Processing/DataStack+Transaction.swift rename to CoreStore/Saving and Processing/DataStack+Transaction.swift index 90ae751..c3aa4bc 100644 --- a/HardcoreData/Saving and Processing/DataStack+Transaction.swift +++ b/CoreStore/Saving and Processing/DataStack+Transaction.swift @@ -1,6 +1,6 @@ // // DataStack+Transaction.swift -// HardcoreData +// CoreStore // // Copyright (c) 2015 John Rommel Estropia // @@ -41,7 +41,7 @@ public extension DataStack { */ public func beginAsynchronous(closure: (transaction: AsynchronousDataTransaction) -> Void) { - HardcoreData.assert(NSThread.isMainThread(), "Attempted to begin a transaction from a \(typeName(self)) outside the main thread.") + CoreStore.assert(NSThread.isMainThread(), "Attempted to begin a transaction from a \(typeName(self)) outside the main thread.") AsynchronousDataTransaction( mainContext: self.rootSavingContext, @@ -57,7 +57,7 @@ public extension DataStack { */ public func beginSynchronous(closure: (transaction: SynchronousDataTransaction) -> Void) -> SaveResult? { - HardcoreData.assert(NSThread.isMainThread(), "Attempted to begin a transaction from a \(typeName(self)) outside the main thread.") + CoreStore.assert(NSThread.isMainThread(), "Attempted to begin a transaction from a \(typeName(self)) outside the main thread.") return SynchronousDataTransaction( mainContext: self.rootSavingContext, @@ -72,10 +72,10 @@ public extension DataStack { */ public func beginDetached() -> DetachedDataTransaction { - HardcoreData.assert(NSThread.isMainThread(), "Attempted to begin a transaction from a \(typeName(self)) outside the main thread.") + CoreStore.assert(NSThread.isMainThread(), "Attempted to begin a transaction from a \(typeName(self)) outside the main thread.") return DetachedDataTransaction( mainContext: self.rootSavingContext, queue: .Main) } -} \ No newline at end of file +} diff --git a/HardcoreData/Saving and Processing/DetachedDataTransaction.swift b/CoreStore/Saving and Processing/DetachedDataTransaction.swift similarity index 93% rename from HardcoreData/Saving and Processing/DetachedDataTransaction.swift rename to CoreStore/Saving and Processing/DetachedDataTransaction.swift index d490881..d577d03 100644 --- a/HardcoreData/Saving and Processing/DetachedDataTransaction.swift +++ b/CoreStore/Saving and Processing/DetachedDataTransaction.swift @@ -1,6 +1,6 @@ // // DetachedDataTransaction.swift -// HardcoreData +// CoreStore // // Copyright (c) 2015 John Rommel Estropia // @@ -43,7 +43,7 @@ public final class DetachedDataTransaction: BaseDataTransaction { */ public func commit(completion: (result: SaveResult) -> Void) { - HardcoreData.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to commit a \(typeName(self)) outside its designated queue.") + CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to commit a \(typeName(self)) outside its designated queue.") self.context.saveAsynchronouslyWithCompletion { (result) -> Void in diff --git a/HardcoreData/Saving and Processing/SaveResult.swift b/CoreStore/Saving and Processing/SaveResult.swift similarity index 90% rename from HardcoreData/Saving and Processing/SaveResult.swift rename to CoreStore/Saving and Processing/SaveResult.swift index 20cd032..ea140f7 100644 --- a/HardcoreData/Saving and Processing/SaveResult.swift +++ b/CoreStore/Saving and Processing/SaveResult.swift @@ -1,6 +1,6 @@ // // SaveResult.swift -// HardcoreData +// CoreStore // // Copyright (c) 2014 John Rommel Estropia // @@ -32,7 +32,7 @@ import Foundation The `SaveResult` indicates the result of a `commit(...)` for a transaction. The `SaveResult` can be treated as a boolean: - HardcoreData.beginAsynchronous { transaction in + CoreStore.beginAsynchronous { transaction in // ... let result = transaction.commit() if result { @@ -45,7 +45,7 @@ The `SaveResult` can be treated as a boolean: or as an `enum`, where the resulting associated object can also be inspected: - HardcoreData.beginAsynchronous { transaction in + CoreStore.beginAsynchronous { transaction in // ... let result = transaction.commit() switch result { @@ -84,15 +84,15 @@ public enum SaveResult { self = .Failure(error) } - internal init(_ errorCode: HardcoreDataErrorCode) { + internal init(_ errorCode: CoreStoreErrorCode) { self.init(errorCode, userInfo: nil) } - internal init(_ errorCode: HardcoreDataErrorCode, userInfo: [NSObject: AnyObject]?) { + internal init(_ errorCode: CoreStoreErrorCode, userInfo: [NSObject: AnyObject]?) { self.init(NSError( - hardcoreDataErrorCode: errorCode, + coreStoreErrorCode: errorCode, userInfo: userInfo)) } } diff --git a/HardcoreData/Saving and Processing/SynchronousDataTransaction.swift b/CoreStore/Saving and Processing/SynchronousDataTransaction.swift similarity index 77% rename from HardcoreData/Saving and Processing/SynchronousDataTransaction.swift rename to CoreStore/Saving and Processing/SynchronousDataTransaction.swift index afb0ca0..a54edef 100644 --- a/HardcoreData/Saving and Processing/SynchronousDataTransaction.swift +++ b/CoreStore/Saving and Processing/SynchronousDataTransaction.swift @@ -1,6 +1,6 @@ // // SynchronousDataTransaction.swift -// HardcoreData +// CoreStore // // Copyright (c) 2015 John Rommel Estropia // @@ -31,7 +31,7 @@ import GCDKit // MARK: - SynchronousDataTransaction /** -The `SynchronousDataTransaction` provides an interface for `NSManagedObject` creates, updates, and deletes. A transaction object should typically be only used from within a transaction block initiated from `DataStack.beginSynchronous(_:)`, or from `HardcoreData.beginSynchronous(_:)`. +The `SynchronousDataTransaction` provides an interface for `NSManagedObject` creates, updates, and deletes. A transaction object should typically be only used from within a transaction block initiated from `DataStack.beginSynchronous(_:)`, or from `CoreStore.beginSynchronous(_:)`. */ public final class SynchronousDataTransaction: BaseDataTransaction { @@ -42,8 +42,8 @@ public final class SynchronousDataTransaction: BaseDataTransaction { */ public func commit() { - HardcoreData.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to commit a \(typeName(self)) outside its designated queue.") - HardcoreData.assert(!self.isCommitted, "Attempted to commit a \(typeName(self)) more than once.") + CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to commit a \(typeName(self)) outside its designated queue.") + CoreStore.assert(!self.isCommitted, "Attempted to commit a \(typeName(self)) more than once.") self.isCommitted = true self.result = self.context.saveSynchronously() @@ -57,8 +57,8 @@ public final class SynchronousDataTransaction: BaseDataTransaction { */ public func beginSynchronous(closure: (transaction: SynchronousDataTransaction) -> Void) -> SaveResult? { - HardcoreData.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to begin a child transaction from a \(typeName(self)) outside its designated queue.") - HardcoreData.assert(!self.isCommitted, "Attempted to begin a child transaction from an already committed \(typeName(self)).") + CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to begin a child transaction from a \(typeName(self)) outside its designated queue.") + CoreStore.assert(!self.isCommitted, "Attempted to begin a child transaction from an already committed \(typeName(self)).") return SynchronousDataTransaction( mainContext: self.context, @@ -77,7 +77,7 @@ public final class SynchronousDataTransaction: BaseDataTransaction { */ public override func create(into: Into) -> T { - HardcoreData.assert(!self.isCommitted, "Attempted to create an entity of type <\(T.self)> from an already committed \(typeName(self)).") + CoreStore.assert(!self.isCommitted, "Attempted to create an entity of type <\(T.self)> from an already committed \(typeName(self)).") return super.create(into) } @@ -90,7 +90,7 @@ public final class SynchronousDataTransaction: BaseDataTransaction { */ public override func fetch(object: T?) -> T? { - HardcoreData.assert(!self.isCommitted, "Attempted to update an entity of type \(typeName(object)) from an already committed \(typeName(self)).") + CoreStore.assert(!self.isCommitted, "Attempted to update an entity of type \(typeName(object)) from an already committed \(typeName(self)).") return super.fetch(object) } @@ -102,7 +102,7 @@ public final class SynchronousDataTransaction: BaseDataTransaction { */ public override func delete(object: NSManagedObject?) { - HardcoreData.assert(!self.isCommitted, "Attempted to delete an entity of type \(typeName(object)) from an already committed \(typeName(self)).") + CoreStore.assert(!self.isCommitted, "Attempted to delete an entity of type \(typeName(object)) from an already committed \(typeName(self)).") super.delete(object) } @@ -112,7 +112,7 @@ public final class SynchronousDataTransaction: BaseDataTransaction { */ public override func rollback() { - HardcoreData.assert(!self.isCommitted, "Attempted to rollback an already committed \(typeName(self)).") + CoreStore.assert(!self.isCommitted, "Attempted to rollback an already committed \(typeName(self)).") super.rollback() } @@ -127,7 +127,7 @@ public final class SynchronousDataTransaction: BaseDataTransaction { self.closure(transaction: self) if !self.isCommitted && self.hasChanges { - HardcoreData.log(.Warning, message: "The closure for the \(typeName(self)) completed without being committed. All changes made within the transaction were discarded.") + CoreStore.log(.Warning, message: "The closure for the \(typeName(self)) completed without being committed. All changes made within the transaction were discarded.") } } return self.result diff --git a/HardcoreData/Setting Up/HardcoreData+Setup.swift b/CoreStore/Setting Up/CoreStore+Setup.swift similarity index 97% rename from HardcoreData/Setting Up/HardcoreData+Setup.swift rename to CoreStore/Setting Up/CoreStore+Setup.swift index 817f31f..d6c5661 100644 --- a/HardcoreData/Setting Up/HardcoreData+Setup.swift +++ b/CoreStore/Setting Up/CoreStore+Setup.swift @@ -1,6 +1,6 @@ // -// HardcoreData+Setup.swift -// HardcoreData +// CoreStore+Setup.swift +// CoreStore // // Copyright (c) 2015 John Rommel Estropia // @@ -28,9 +28,9 @@ import CoreData import GCDKit -// MARK: - HardcoreData +// MARK: - CoreStore -public extension HardcoreData { +public extension CoreStore { /** Adds an in-memory store to the `defaultStack`. @@ -81,4 +81,4 @@ public extension HardcoreData { ) } -} \ No newline at end of file +} diff --git a/HardcoreData/Setting Up/DataStack.swift b/CoreStore/Setting Up/DataStack.swift similarity index 94% rename from HardcoreData/Setting Up/DataStack.swift rename to CoreStore/Setting Up/DataStack.swift index 9d73923..4dcd52b 100644 --- a/HardcoreData/Setting Up/DataStack.swift +++ b/CoreStore/Setting Up/DataStack.swift @@ -1,6 +1,6 @@ // // DataStack.swift -// HardcoreData +// CoreStore // // Copyright (c) 2014 John Rommel Estropia // @@ -52,7 +52,7 @@ public final class DataStack { public convenience init() { let mergedModel: NSManagedObjectModel! = NSManagedObjectModel.mergedModelFromBundles(NSBundle.allBundles()) - HardcoreData.assert(mergedModel != nil, "Could not create a merged <\(NSManagedObjectModel.self)> from all bundles.") + CoreStore.assert(mergedModel != nil, "Could not create a merged <\(NSManagedObjectModel.self)> from all bundles.") self.init(managedObjectModel: mergedModel) } @@ -65,10 +65,10 @@ public final class DataStack { public convenience init(modelName: String) { let modelFilePath: String! = NSBundle.mainBundle().pathForResource(modelName, ofType: "momd") - HardcoreData.assert(modelFilePath != nil, "Could not find a \"momd\" resource from the main bundle.") + CoreStore.assert(modelFilePath != nil, "Could not find a \"momd\" resource from the main bundle.") let managedObjectModel: NSManagedObjectModel! = NSManagedObjectModel(contentsOfURL: NSURL(fileURLWithPath: modelFilePath)!) - HardcoreData.assert(managedObjectModel != nil, "Could not create an <\(NSManagedObjectModel.self)> from the resource at path \"\(modelFilePath)\".") + CoreStore.assert(managedObjectModel != nil, "Could not create an <\(NSManagedObjectModel.self)> from the resource at path \"\(modelFilePath)\".") self.init(managedObjectModel: managedObjectModel) } @@ -131,15 +131,15 @@ public final class DataStack { if let error = error { - HardcoreData.handleError( + CoreStore.handleError( error, "Failed to add in-memory <\(NSPersistentStore.self)>.") return PersistentStoreResult(error) } else { - HardcoreData.handleError( - NSError(hardcoreDataErrorCode: .UnknownError), + CoreStore.handleError( + NSError(coreStoreErrorCode: .UnknownError), "Failed to add in-memory <\(NSPersistentStore.self)>.") return PersistentStoreResult(.UnknownError) } @@ -190,8 +190,8 @@ public final class DataStack { return PersistentStoreResult(store) } - HardcoreData.handleError( - NSError(hardcoreDataErrorCode: .DifferentPersistentStoreExistsAtURL), + CoreStore.handleError( + NSError(coreStoreErrorCode: .DifferentPersistentStoreExistsAtURL), "Failed to add SQLite <\(NSPersistentStore.self)> at \"\(fileURL)\" because a different <\(NSPersistentStore.self)> at that URL already exists.") return PersistentStoreResult(.DifferentPersistentStoreExistsAtURL) @@ -205,8 +205,8 @@ public final class DataStack { attributes: nil, error: &directoryError) { - HardcoreData.handleError( - directoryError ?? NSError(hardcoreDataErrorCode: .UnknownError), + CoreStore.handleError( + directoryError ?? NSError(coreStoreErrorCode: .UnknownError), "Failed to create directory for SQLite store at \"\(fileURL)\".") return PersistentStoreResult(directoryError!) } @@ -268,8 +268,8 @@ public final class DataStack { } } - HardcoreData.handleError( - persistentStoreError ?? NSError(hardcoreDataErrorCode: .UnknownError), + CoreStore.handleError( + persistentStoreError ?? NSError(coreStoreErrorCode: .UnknownError), "Failed to add SQLite <\(NSPersistentStore.self)> at \"\(fileURL)\".") return PersistentStoreResult(.UnknownError) @@ -280,7 +280,7 @@ public final class DataStack { internal let rootSavingContext: NSManagedObjectContext internal let mainContext: NSManagedObjectContext - internal let childTransactionQueue: GCDQueue = .createSerial("com.hardcoredata.datastack.childtransactionqueue") + internal let childTransactionQueue: GCDQueue = .createSerial("com.corestore.datastack.childtransactionqueue") internal func entityNameForEntityClass(entityClass: NSManagedObject.Type) -> String? { @@ -344,7 +344,7 @@ public final class DataStack { private let coordinator: NSPersistentStoreCoordinator private let entityNameMapping: [EntityClassNameType: EntityNameType] - private let storeMetadataUpdateQueue = GCDQueue.createConcurrent("com.hardcoreData.persistentStoreBarrierQueue") + private let storeMetadataUpdateQueue = GCDQueue.createConcurrent("com.coreStore.persistentStoreBarrierQueue") private var configurationStoreMapping = [ConfigurationNameType: NSPersistentStore]() private var entityConfigurationsMapping = [EntityClassNameType: Set]() diff --git a/HardcoreData/Setting Up/PersistentStoreResult.swift b/CoreStore/Setting Up/PersistentStoreResult.swift similarity index 90% rename from HardcoreData/Setting Up/PersistentStoreResult.swift rename to CoreStore/Setting Up/PersistentStoreResult.swift index 4f08531..85c8466 100644 --- a/HardcoreData/Setting Up/PersistentStoreResult.swift +++ b/CoreStore/Setting Up/PersistentStoreResult.swift @@ -1,6 +1,6 @@ // // PersistentStoreResult.swift -// HardcoreData +// CoreStore // // Copyright (c) 2014 John Rommel Estropia // @@ -33,7 +33,7 @@ import CoreData The `PersistentStoreResult` indicates the result of initializing the persistent store. The `PersistentStoreResult` can be treated as a boolean: - let result = HardcoreData.addSQLiteStore() + let result = CoreStore.addSQLiteStore() if result { // succeeded } @@ -43,7 +43,7 @@ The `PersistentStoreResult` can be treated as a boolean: or as an `enum`, where the resulting associated object can also be inspected: - let result = HardcoreData.addSQLiteStore() + let result = CoreStore.addSQLiteStore() switch result { case .Success(let persistentStore): // persistentStore is the related NSPersistentStore instance @@ -79,15 +79,15 @@ public enum PersistentStoreResult { self = .Failure(error) } - internal init(_ errorCode: HardcoreDataErrorCode) { + internal init(_ errorCode: CoreStoreErrorCode) { self.init(errorCode, userInfo: nil) } - internal init(_ errorCode: HardcoreDataErrorCode, userInfo: [NSObject: AnyObject]?) { + internal init(_ errorCode: CoreStoreErrorCode, userInfo: [NSObject: AnyObject]?) { self.init(NSError( - hardcoreDataErrorCode: errorCode, + coreStoreErrorCode: errorCode, userInfo: userInfo)) } } diff --git a/HardcoreDataDemo/HardcoreDataDemo.xcodeproj/project.pbxproj b/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj similarity index 84% rename from HardcoreDataDemo/HardcoreDataDemo.xcodeproj/project.pbxproj rename to CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj index b89babf..65a27f2 100644 --- a/HardcoreDataDemo/HardcoreDataDemo.xcodeproj/project.pbxproj +++ b/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj @@ -17,14 +17,14 @@ B52977E11B120F8A003D50A5 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B52977E01B120F8A003D50A5 /* CoreLocation.framework */; }; B52977E41B121635003D50A5 /* Place.swift in Sources */ = {isa = PBXBuildFile; fileRef = B52977E31B121635003D50A5 /* Place.swift */; }; B54AAD4F1AF4D26E00848AE0 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54AAD4E1AF4D26E00848AE0 /* AppDelegate.swift */; }; - B54AAD521AF4D26E00848AE0 /* HardcoreDataDemo.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B54AAD501AF4D26E00848AE0 /* HardcoreDataDemo.xcdatamodeld */; }; + B54AAD521AF4D26E00848AE0 /* CoreStoreDemo.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B54AAD501AF4D26E00848AE0 /* CoreStoreDemo.xcdatamodeld */; }; B54AAD591AF4D26E00848AE0 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B54AAD571AF4D26E00848AE0 /* Main.storyboard */; }; B54AAD5B1AF4D26E00848AE0 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B54AAD5A1AF4D26E00848AE0 /* Images.xcassets */; }; B54AAD5E1AF4D26E00848AE0 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = B54AAD5C1AF4D26E00848AE0 /* LaunchScreen.xib */; }; B566E32A1B117B1F00F4F0C6 /* StackSetupDemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B566E3291B117B1F00F4F0C6 /* StackSetupDemoViewController.swift */; }; B566E3321B11DF3200F4F0C6 /* UserAccount.swift in Sources */ = {isa = PBXBuildFile; fileRef = B566E3311B11DF3200F4F0C6 /* UserAccount.swift */; }; - B583A9201AF5F542001F76AF /* HardcoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B583A91B1AF5F4F4001F76AF /* HardcoreData.framework */; }; - B583A9211AF5F542001F76AF /* HardcoreData.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B583A91B1AF5F4F4001F76AF /* HardcoreData.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + B583A9201AF5F542001F76AF /* CoreStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B583A91B1AF5F4F4001F76AF /* CoreStore.framework */; }; + B583A9211AF5F542001F76AF /* CoreStore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B583A91B1AF5F4F4001F76AF /* CoreStore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; B5E7240F1B11F993006FB83F /* TwitterAccount.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E7240E1B11F993006FB83F /* TwitterAccount.swift */; }; B5E724111B11F994006FB83F /* FacebookAccount.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E724101B11F994006FB83F /* FacebookAccount.swift */; }; /* End PBXBuildFile section */ @@ -32,31 +32,31 @@ /* Begin PBXContainerItemProxy section */ B583A91A1AF5F4F4001F76AF /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = B583A9141AF5F4F3001F76AF /* HardcoreData.xcodeproj */; + containerPortal = B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */; proxyType = 2; remoteGlobalIDString = 2F03A53019C5C6DA005002A5; - remoteInfo = HardcoreData; + remoteInfo = CoreStore; }; B583A91C1AF5F4F4001F76AF /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = B583A9141AF5F4F3001F76AF /* HardcoreData.xcodeproj */; + containerPortal = B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */; proxyType = 2; remoteGlobalIDString = 2F03A53B19C5C6DA005002A5; - remoteInfo = HardcoreDataTests; + remoteInfo = CoreStoreTests; }; B583A91E1AF5F512001F76AF /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = B583A9141AF5F4F3001F76AF /* HardcoreData.xcodeproj */; + containerPortal = B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */; proxyType = 1; remoteGlobalIDString = 2F03A52F19C5C6DA005002A5; - remoteInfo = HardcoreData; + remoteInfo = CoreStore; }; B583A9221AF5F542001F76AF /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = B583A9141AF5F4F3001F76AF /* HardcoreData.xcodeproj */; + containerPortal = B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */; proxyType = 1; remoteGlobalIDString = 2F03A52F19C5C6DA005002A5; - remoteInfo = HardcoreData; + remoteInfo = CoreStore; }; /* End PBXContainerItemProxy section */ @@ -67,7 +67,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - B583A9211AF5F542001F76AF /* HardcoreData.framework in Embed Frameworks */, + B583A9211AF5F542001F76AF /* CoreStore.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -84,17 +84,17 @@ B52977DE1B120F83003D50A5 /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = System/Library/Frameworks/MapKit.framework; sourceTree = SDKROOT; }; B52977E01B120F8A003D50A5 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; }; B52977E31B121635003D50A5 /* Place.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Place.swift; sourceTree = ""; }; - B54AAD491AF4D26E00848AE0 /* HardcoreDataDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HardcoreDataDemo.app; sourceTree = BUILT_PRODUCTS_DIR; }; + B54AAD491AF4D26E00848AE0 /* CoreStoreDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CoreStoreDemo.app; sourceTree = BUILT_PRODUCTS_DIR; }; B54AAD4D1AF4D26E00848AE0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; B54AAD4E1AF4D26E00848AE0 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - B54AAD511AF4D26E00848AE0 /* HardcoreDataDemo.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = HardcoreDataDemo.xcdatamodel; sourceTree = ""; }; + B54AAD511AF4D26E00848AE0 /* CoreStoreDemo.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = CoreStoreDemo.xcdatamodel; sourceTree = ""; }; B54AAD581AF4D26E00848AE0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; B54AAD5A1AF4D26E00848AE0 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; B54AAD5D1AF4D26E00848AE0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; B566E3291B117B1F00F4F0C6 /* StackSetupDemoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StackSetupDemoViewController.swift; sourceTree = ""; }; B566E3311B11DF3200F4F0C6 /* UserAccount.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserAccount.swift; sourceTree = ""; }; - B583A9141AF5F4F3001F76AF /* HardcoreData.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = HardcoreData.xcodeproj; path = ../HardcoreData.xcodeproj; sourceTree = ""; }; - B583A9251AF5F547001F76AF /* GCDKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = GCDKit.framework; path = "/Users/johnestropia/Library/Developer/Xcode/DerivedData/HardcoreDataDemo-ftknhsqfpsthfogvisxisgpbbhsj/Build/Products/Debug-iphoneos/GCDKit.framework"; sourceTree = ""; }; + B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = CoreStore.xcodeproj; path = ../CoreStore.xcodeproj; sourceTree = ""; }; + B583A9251AF5F547001F76AF /* GCDKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = GCDKit.framework; path = "/Users/johnestropia/Library/Developer/Xcode/DerivedData/CoreStoreDemo-ftknhsqfpsthfogvisxisgpbbhsj/Build/Products/Debug-iphoneos/GCDKit.framework"; sourceTree = ""; }; B5E7240E1B11F993006FB83F /* TwitterAccount.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TwitterAccount.swift; sourceTree = ""; }; B5E724101B11F994006FB83F /* FacebookAccount.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FacebookAccount.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -106,7 +106,7 @@ files = ( B52977E11B120F8A003D50A5 /* CoreLocation.framework in Frameworks */, B52977DF1B120F83003D50A5 /* MapKit.framework in Frameworks */, - B583A9201AF5F542001F76AF /* HardcoreData.framework in Frameworks */, + B583A9201AF5F542001F76AF /* CoreStore.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -137,7 +137,7 @@ B52977E21B120F90003D50A5 /* Frameworks */ = { isa = PBXGroup; children = ( - B583A9141AF5F4F3001F76AF /* HardcoreData.xcodeproj */, + B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */, B52977E01B120F8A003D50A5 /* CoreLocation.framework */, B52977DE1B120F83003D50A5 /* MapKit.framework */, B583A9251AF5F547001F76AF /* GCDKit.framework */, @@ -149,7 +149,7 @@ isa = PBXGroup; children = ( B52977E21B120F90003D50A5 /* Frameworks */, - B54AAD4B1AF4D26E00848AE0 /* HardcoreDataDemo */, + B54AAD4B1AF4D26E00848AE0 /* CoreStoreDemo */, B54AAD4A1AF4D26E00848AE0 /* Products */, ); sourceTree = ""; @@ -157,12 +157,12 @@ B54AAD4A1AF4D26E00848AE0 /* Products */ = { isa = PBXGroup; children = ( - B54AAD491AF4D26E00848AE0 /* HardcoreDataDemo.app */, + B54AAD491AF4D26E00848AE0 /* CoreStoreDemo.app */, ); name = Products; sourceTree = ""; }; - B54AAD4B1AF4D26E00848AE0 /* HardcoreDataDemo */ = { + B54AAD4B1AF4D26E00848AE0 /* CoreStoreDemo */ = { isa = PBXGroup; children = ( B54AAD4E1AF4D26E00848AE0 /* AppDelegate.swift */, @@ -172,10 +172,10 @@ B54AAD571AF4D26E00848AE0 /* Main.storyboard */, B54AAD5A1AF4D26E00848AE0 /* Images.xcassets */, B54AAD5C1AF4D26E00848AE0 /* LaunchScreen.xib */, - B54AAD501AF4D26E00848AE0 /* HardcoreDataDemo.xcdatamodeld */, + B54AAD501AF4D26E00848AE0 /* CoreStoreDemo.xcdatamodeld */, B54AAD4C1AF4D26E00848AE0 /* Supporting Files */, ); - path = HardcoreDataDemo; + path = CoreStoreDemo; sourceTree = ""; }; B54AAD4C1AF4D26E00848AE0 /* Supporting Files */ = { @@ -200,8 +200,8 @@ B583A9151AF5F4F3001F76AF /* Products */ = { isa = PBXGroup; children = ( - B583A91B1AF5F4F4001F76AF /* HardcoreData.framework */, - B583A91D1AF5F4F4001F76AF /* HardcoreDataTests.xctest */, + B583A91B1AF5F4F4001F76AF /* CoreStore.framework */, + B583A91D1AF5F4F4001F76AF /* CoreStoreTests.xctest */, ); name = Products; sourceTree = ""; @@ -209,9 +209,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - B54AAD481AF4D26E00848AE0 /* HardcoreDataDemo */ = { + B54AAD481AF4D26E00848AE0 /* CoreStoreDemo */ = { isa = PBXNativeTarget; - buildConfigurationList = B54AAD6D1AF4D26E00848AE0 /* Build configuration list for PBXNativeTarget "HardcoreDataDemo" */; + buildConfigurationList = B54AAD6D1AF4D26E00848AE0 /* Build configuration list for PBXNativeTarget "CoreStoreDemo" */; buildPhases = ( B54AAD451AF4D26E00848AE0 /* Sources */, B54AAD461AF4D26E00848AE0 /* Frameworks */, @@ -224,9 +224,9 @@ B583A91F1AF5F512001F76AF /* PBXTargetDependency */, B583A9231AF5F542001F76AF /* PBXTargetDependency */, ); - name = HardcoreDataDemo; - productName = HardcoreDataDemo; - productReference = B54AAD491AF4D26E00848AE0 /* HardcoreDataDemo.app */; + name = CoreStoreDemo; + productName = CoreStoreDemo; + productReference = B54AAD491AF4D26E00848AE0 /* CoreStoreDemo.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -243,7 +243,7 @@ }; }; }; - buildConfigurationList = B54AAD441AF4D26E00848AE0 /* Build configuration list for PBXProject "HardcoreDataDemo" */; + buildConfigurationList = B54AAD441AF4D26E00848AE0 /* Build configuration list for PBXProject "CoreStoreDemo" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; @@ -257,28 +257,28 @@ projectReferences = ( { ProductGroup = B583A9151AF5F4F3001F76AF /* Products */; - ProjectRef = B583A9141AF5F4F3001F76AF /* HardcoreData.xcodeproj */; + ProjectRef = B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */; }, ); projectRoot = ""; targets = ( - B54AAD481AF4D26E00848AE0 /* HardcoreDataDemo */, + B54AAD481AF4D26E00848AE0 /* CoreStoreDemo */, ); }; /* End PBXProject section */ /* Begin PBXReferenceProxy section */ - B583A91B1AF5F4F4001F76AF /* HardcoreData.framework */ = { + B583A91B1AF5F4F4001F76AF /* CoreStore.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; - path = HardcoreData.framework; + path = CoreStore.framework; remoteRef = B583A91A1AF5F4F4001F76AF /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - B583A91D1AF5F4F4001F76AF /* HardcoreDataTests.xctest */ = { + B583A91D1AF5F4F4001F76AF /* CoreStoreTests.xctest */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; - path = HardcoreDataTests.xctest; + path = CoreStoreTests.xctest; remoteRef = B583A91C1AF5F4F4001F76AF /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -310,7 +310,7 @@ B5E724111B11F994006FB83F /* FacebookAccount.swift in Sources */, B5E7240F1B11F993006FB83F /* TwitterAccount.swift in Sources */, B566E3321B11DF3200F4F0C6 /* UserAccount.swift in Sources */, - B54AAD521AF4D26E00848AE0 /* HardcoreDataDemo.xcdatamodeld in Sources */, + B54AAD521AF4D26E00848AE0 /* CoreStoreDemo.xcdatamodeld in Sources */, B503FAE11AFDC71700F90881 /* Palette.swift in Sources */, B503FAE21AFDC71700F90881 /* PaletteTableViewCell.swift in Sources */, B503FADF1AFDC71700F90881 /* ObjectListObserverDemoViewController.swift in Sources */, @@ -323,12 +323,12 @@ /* Begin PBXTargetDependency section */ B583A91F1AF5F512001F76AF /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = HardcoreData; + name = CoreStore; targetProxy = B583A91E1AF5F512001F76AF /* PBXContainerItemProxy */; }; B583A9231AF5F542001F76AF /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = HardcoreData; + name = CoreStore; targetProxy = B583A9221AF5F542001F76AF /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -440,9 +440,9 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", - "$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/HardcoreDataDemo-ftknhsqfpsthfogvisxisgpbbhsj/Build/Products/Debug-iphoneos", + "$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/CoreStoreDemo-ftknhsqfpsthfogvisxisgpbbhsj/Build/Products/Debug-iphoneos", ); - INFOPLIST_FILE = HardcoreDataDemo/Info.plist; + INFOPLIST_FILE = CoreStoreDemo/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -455,9 +455,9 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", - "$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/HardcoreDataDemo-ftknhsqfpsthfogvisxisgpbbhsj/Build/Products/Debug-iphoneos", + "$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/CoreStoreDemo-ftknhsqfpsthfogvisxisgpbbhsj/Build/Products/Debug-iphoneos", ); - INFOPLIST_FILE = HardcoreDataDemo/Info.plist; + INFOPLIST_FILE = CoreStoreDemo/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -467,7 +467,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - B54AAD441AF4D26E00848AE0 /* Build configuration list for PBXProject "HardcoreDataDemo" */ = { + B54AAD441AF4D26E00848AE0 /* Build configuration list for PBXProject "CoreStoreDemo" */ = { isa = XCConfigurationList; buildConfigurations = ( B54AAD6B1AF4D26E00848AE0 /* Debug */, @@ -476,7 +476,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - B54AAD6D1AF4D26E00848AE0 /* Build configuration list for PBXNativeTarget "HardcoreDataDemo" */ = { + B54AAD6D1AF4D26E00848AE0 /* Build configuration list for PBXNativeTarget "CoreStoreDemo" */ = { isa = XCConfigurationList; buildConfigurations = ( B54AAD6E1AF4D26E00848AE0 /* Debug */, @@ -488,13 +488,13 @@ /* End XCConfigurationList section */ /* Begin XCVersionGroup section */ - B54AAD501AF4D26E00848AE0 /* HardcoreDataDemo.xcdatamodeld */ = { + B54AAD501AF4D26E00848AE0 /* CoreStoreDemo.xcdatamodeld */ = { isa = XCVersionGroup; children = ( - B54AAD511AF4D26E00848AE0 /* HardcoreDataDemo.xcdatamodel */, + B54AAD511AF4D26E00848AE0 /* CoreStoreDemo.xcdatamodel */, ); - currentVersion = B54AAD511AF4D26E00848AE0 /* HardcoreDataDemo.xcdatamodel */; - path = HardcoreDataDemo.xcdatamodeld; + currentVersion = B54AAD511AF4D26E00848AE0 /* CoreStoreDemo.xcdatamodel */; + path = CoreStoreDemo.xcdatamodeld; sourceTree = ""; versionGroupType = wrapper.xcdatamodel; }; diff --git a/HardcoreDataDemo/HardcoreDataDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 67% rename from HardcoreDataDemo/HardcoreDataDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 8443451..5100eb1 100644 --- a/HardcoreDataDemo/HardcoreDataDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:CoreStoreDemo.xcodeproj"> diff --git a/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/xcshareddata/CoreStoreDemo.xccheckout b/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/xcshareddata/CoreStoreDemo.xccheckout new file mode 100644 index 0000000..2ea2ce2 --- /dev/null +++ b/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/xcshareddata/CoreStoreDemo.xccheckout @@ -0,0 +1,53 @@ + + + + + IDESourceControlProjectFavoriteDictionaryKey + + IDESourceControlProjectIdentifier + B6855E48-4B19-4321-B1C7-CB2706E12777 + IDESourceControlProjectName + CoreStoreDemo + IDESourceControlProjectOriginsDictionary + + 4B60F1BCB491FF717C56441AE7783C74F417BE48 + github.com:JohnEstropia/CoreStore.git + 8B2E522D57154DFA93A06982C36315ECBEA4FA97 + github.com:JohnEstropia/GCDKit.git + + IDESourceControlProjectPath + CoreStoreDemo/CoreStoreDemo.xcodeproj + IDESourceControlProjectRelativeInstallPathDictionary + + 4B60F1BCB491FF717C56441AE7783C74F417BE48 + ../../.. + 8B2E522D57154DFA93A06982C36315ECBEA4FA97 + ../../../Libraries/GCDKit/ + + IDESourceControlProjectURL + github.com:JohnEstropia/CoreStore.git + IDESourceControlProjectVersion + 111 + IDESourceControlProjectWCCIdentifier + 4B60F1BCB491FF717C56441AE7783C74F417BE48 + IDESourceControlProjectWCConfigurations + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + 4B60F1BCB491FF717C56441AE7783C74F417BE48 + IDESourceControlWCCName + CoreStore + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + 8B2E522D57154DFA93A06982C36315ECBEA4FA97 + IDESourceControlWCCName + GCDKit + + + + diff --git a/HardcoreDataDemo/HardcoreDataDemo.xcodeproj/project.xcworkspace/xcshareddata/HardcoreDataDemo.xccheckout b/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/xcshareddata/HardcoreDataDemo.xccheckout similarity index 100% rename from HardcoreDataDemo/HardcoreDataDemo.xcodeproj/project.xcworkspace/xcshareddata/HardcoreDataDemo.xccheckout rename to CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/xcshareddata/HardcoreDataDemo.xccheckout diff --git a/CoreStoreDemo/CoreStoreDemo.xcodeproj/xcuserdata/johnestropia.xcuserdatad/xcschemes/CoreStoreDemo.xcscheme b/CoreStoreDemo/CoreStoreDemo.xcodeproj/xcuserdata/johnestropia.xcuserdatad/xcschemes/CoreStoreDemo.xcscheme new file mode 100644 index 0000000..4ec6eab --- /dev/null +++ b/CoreStoreDemo/CoreStoreDemo.xcodeproj/xcuserdata/johnestropia.xcuserdatad/xcschemes/CoreStoreDemo.xcscheme @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CoreStoreDemo/CoreStoreDemo.xcodeproj/xcuserdata/johnestropia.xcuserdatad/xcschemes/xcschememanagement.plist b/CoreStoreDemo/CoreStoreDemo.xcodeproj/xcuserdata/johnestropia.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..3ee8606 --- /dev/null +++ b/CoreStoreDemo/CoreStoreDemo.xcodeproj/xcuserdata/johnestropia.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,22 @@ + + + + + SchemeUserState + + CoreStoreDemo.xcscheme + + orderHint + 0 + + + SuppressBuildableAutocreation + + B54AAD481AF4D26E00848AE0 + + primary + + + + + diff --git a/HardcoreDataDemo/HardcoreDataDemo/AppDelegate.swift b/CoreStoreDemo/CoreStoreDemo/AppDelegate.swift similarity index 95% rename from HardcoreDataDemo/HardcoreDataDemo/AppDelegate.swift rename to CoreStoreDemo/CoreStoreDemo/AppDelegate.swift index 05b3abb..0630c24 100644 --- a/HardcoreDataDemo/HardcoreDataDemo/AppDelegate.swift +++ b/CoreStoreDemo/CoreStoreDemo/AppDelegate.swift @@ -1,6 +1,6 @@ // // AppDelegate.swift -// HardcoreDataDemo +// CoreStoreDemo // // Created by John Rommel Estropia on 2015/05/02. // Copyright (c) 2015 John Rommel Estropia. All rights reserved. diff --git a/HardcoreDataDemo/HardcoreDataDemo/Base.lproj/LaunchScreen.xib b/CoreStoreDemo/CoreStoreDemo/Base.lproj/LaunchScreen.xib similarity index 93% rename from HardcoreDataDemo/HardcoreDataDemo/Base.lproj/LaunchScreen.xib rename to CoreStoreDemo/CoreStoreDemo/Base.lproj/LaunchScreen.xib index 0855330..08ae6ad 100644 --- a/HardcoreDataDemo/HardcoreDataDemo/Base.lproj/LaunchScreen.xib +++ b/CoreStoreDemo/CoreStoreDemo/Base.lproj/LaunchScreen.xib @@ -17,7 +17,7 @@ -