Tony Arnold
8faae62fbc
Merge branch 'hotfix/save-changes-for-2.1' into develop
...
Conflicts:
MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalSaves.m
Project Files/Magical Record.xcodeproj/project.pbxproj
2012-12-16 20:58:40 +11:00
Tony Arnold
1af1201096
Update shorthand methods and import the magical saves category so that MRSaveCompletionHandler resolves
2012-12-16 20:39:34 +11:00
Tony Arnold
4316422da7
Update README with details of the changes in this branch
2012-12-16 20:39:34 +11:00
Tony Arnold
c2fa8c4859
All deprecated and non-deprecated methods have tests to ensure their function
2012-12-16 20:39:34 +11:00
Tony Arnold
2c66056016
The deprecated saveWithBlock: method should do it's work on the current thread
2012-12-16 20:39:34 +11:00
Tony Arnold
a28d4210ac
Flesh out tests for MagicalRecord+Actions and the NSManagedObjectContext+MagicalSaves category
2012-12-16 20:39:34 +11:00
Tony Arnold
55af799d60
Add Kiwi for saner asynchronous testing and remove existing GHUnit tests for save methods
2012-12-16 20:39:29 +11:00
Tony Arnold
d0e771d778
Update gitignore and remove user specific xcuserdata
2012-12-16 20:39:01 +11:00
Tony Arnold
af84aff8f1
Fix compilation problems under latest Xcode.
2012-12-16 20:39:01 +11:00
Tony Arnold
c763d4ad91
Update existing save tests to reflect save changes. Also begin adding tests for deprecated methods to ensure consistent behaviour in unmodified code.
2012-12-16 20:39:01 +11:00
Tony Arnold
4f35e4e399
Implement new save methods
2012-12-16 20:38:59 +11:00
Tony Arnold
f25a5bcfb5
Merge branch 'master' into develop
2012-11-28 08:37:33 +11:00
Tony Arnold
f6cf96d266
Merge pull request #322 from tonyarnold/develop
...
Pass errorCallback through convenience method
2012-11-27 13:14:30 -08:00
Tony Arnold
537670080b
Pass errorCallback through convenience method
2012-11-28 08:12:51 +11:00
Saul Mora
144062347c
Minor formatting updates
2012-11-25 23:31:19 -07:00
Stephen Vanterpool
cfccd407f4
Re-Added obtaining permanent ids automatically
2012-11-13 19:58:55 -08:00
Stephen Vanterpool
20f02bac9f
Updating changelog
2012-11-04 15:21:43 -08:00
Stephen Vanterpool
5e836fb9a5
Merge branch 'release/2.0.8' into develop
2012-11-04 15:20:08 -08:00
Stephen Vanterpool
8861927036
Merge branch 'release/2.0.8'
2012-11-04 15:19:52 -08:00
Stephen Vanterpool
fb81b5b737
Bumping podspec version
2012-11-04 15:17:29 -08:00
Stephen Vanterpool
b5e5716307
Merge branch 'develop' of github.com:magicalpanda/MagicalRecord into develop
2012-11-01 11:39:27 -07:00
Stephen Vanterpool
3656e74d63
Fixed Issue #294 - MR_requestAllSortedBy:ascending:inContext: did not use correct context
2012-11-01 11:39:19 -07:00
Saul Mora
c0a1657acc
Added fetchAllWithDelegate: method for NSFRC
2012-10-30 19:17:52 -07:00
Saul Mora
0af0731093
Merging with origin/develop
2012-10-30 09:05:06 -07:00
Saul Mora
0fb7d36f4d
Separate printing context chain method into its own method
...
change contextWorkingName to property workingName
2012-10-30 09:03:56 -07:00
Stephen Vanterpool
f7c4350e9d
removed MR_saveErrorHandler, as it and MR_saveWithErrorCallback were essentially duplicates
...
MR_save now only saves the current context (it was essentially doing a MR_saveNestedContexts). If you need to save all the way out to disk, use MR_saveNestedContexts.
Removed the action queue, unneccesary since core data introduced it's own queue support
2012-10-25 16:18:43 -07:00
Saul Mora
64a81c6ff3
don't check the error, rely only on the return value of methods to determine success
2012-10-23 23:08:10 -07:00
Saul Mora
3c24ce151b
no message
2012-10-23 23:06:48 -07:00
Saul Mora
2eaec27410
Cleanup contextWillSave method
...
Update deleting incompatible store
2012-10-23 23:05:52 -07:00
Stephen Vanterpool
da70884b34
Adding changelog
2012-10-21 08:28:43 -07:00
Stephen Vanterpool
4b97d0e97e
Fixed issue #287 - MR_findByAttribute:withValue:andOrderBy:ascending:inContext does not pass context through
2012-10-21 07:54:20 -07:00
Stephen Vanterpool
87ad44a923
Merge branch 'release/2.0.7' into develop
2012-10-15 23:17:37 -07:00
Stephen Vanterpool
58f463d281
Merge branch 'release/2.0.7'
2012-10-15 23:15:00 -07:00
Stephen Vanterpool
601869e953
Bumped podspec to 2.0.7
2012-10-15 23:14:40 -07:00
Tony Arnold
d41d744ece
Test that the current thread saveWith method actually saves
2012-10-15 22:58:29 -07:00
Tony Arnold
870ca22340
saveWithBlock was not saving parent contexts
...
This makes the saveWithBlock method consistent with it's background
siblings.
2012-10-15 22:58:29 -07:00
Stephen Vanterpool
835b4675f6
Merge branch 'master' of github.com:magicalpanda/MagicalRecord
2012-10-15 20:34:58 -07:00
Stephen Vanterpool
b81e70d6b6
Rolled back a commit that broke things if cleanup was used. It created the action_queue in a dispatch_once block, and never recreated it after a cleanup
2012-10-15 20:34:54 -07:00
Stephen Vanterpool
a41ceeedb4
Cherry picking changes that make the context description more... descriptive
2012-10-15 20:22:38 -07:00
Stephen Vanterpool
272af9c4d9
Merge pull request #247 from JRG-Developer/Fixed_KVC_Relationship_Bug
...
Pull Request: Fixed KVC relationship mapping bug
2012-10-15 20:12:51 -07:00
Stephen Vanterpool
52139bd8ad
Fixing potential concurrency issue with creating the actionQueue
2012-10-10 11:51:58 -07:00
Stephen Vanterpool
343b027e25
Properly removing existing on-save notificaitons before replacing the default or root contexts
2012-10-09 13:55:02 -07:00
Stephen Vanterpool
31b2e540bd
Merge pull request #273 from ryanmaxwell/master
...
Update tag in podspec to 2.0.6
2012-10-08 09:55:11 -07:00
Ryan Maxwell
f2e2b7b272
Bump tag to 2.0.6
2012-10-07 15:34:47 +13:00
Stephen Vanterpool
2665ccd30a
Merge pull request #272 from ryanmaxwell/master
...
Require ARC in podspec
2012-10-06 18:48:44 -07:00
Ryan Maxwell
48cc383f0f
Require ARC in podspec (was compiling with retain/release in pod installations)
2012-10-07 14:28:26 +13:00
Stephen Vanterpool
72dc5a4179
Fixing rookie mistake :/
2012-10-02 17:35:53 -07:00
Stephen Vanterpool
a451eb4247
Bumping podspec with bugfix
2012-10-02 17:19:44 -07:00
Stephen Vanterpool
2660e73adf
Added new nestedContextSave method with completion handler
2012-10-02 17:18:33 -07:00
Stephen Vanterpool
4091c781c9
Bumping podspec to 2.0.4
2012-10-01 22:59:46 -07:00
