kylefang/RestKit
1
0
Fork 0
mirror of https://github.com/zhigang1992/RestKit.git synced 2026-04-23 12:27:52 +08:00
Code Issues Packages Projects Releases Wiki Activity
458 Commits 4 Branches 17 Tags
88a1b013fcd914e54ad86283f7f40e1cdb7bba38
Commit Graph

458 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blake Watters
88a1b013fc Merge remote branch 'origin/0.9' into core-data-cleanup 
Conflicts:
	Code/CoreData/CoreData.h
	Code/CoreData/RKManagedObjectStore.h
	Code/CoreData/RKManagedObjectStore.m
	Code/CoreData/RKObjectSeeder.h
	Code/CoreData/RKObjectSeeder.m
	Code/ObjectMapping/RKObjectLoader.m
	Code/ObjectMapping/RKObjectManager.m
	Code/ObjectMapping/RKObjectMapper.m
	RestKit.xcodeproj/project.pbxproj
 2011-03-19 21:26:13 -04:00
Blake Watters
a94456a01e Committing changes to sync against 0.9 2011-03-19 20:59:54 -04:00
Blake Watters
87830e8150 Restore cross project reference to UISpec 2011-03-18 07:54:57 -04:00
Blake Watters
cb0f30c470 Updates to simplify integration with Derived Data 
Conflicts:

	RestKit.xcodeproj/project.pbxproj
 2011-03-18 07:52:47 -04:00
Blake Watters
d6f0a1f3cc Merge branch '0.9' of github.com:twotoasters/RestKit into 0.9 2011-03-17 08:00:58 -04:00
Blake Watters
fea3eed7af Checking in the first draft of the advanced tutorial. 2011-03-17 08:00:27 -04:00
Jeff Arena
7896232cc2 completed rollback of changes to default refresh rate code by setting the default loaded time for an app to the first-run date of the app 2011-03-12 09:40:35 -08:00
Blake Watters
a056aff2b8 dont check the online state when creating an object loader in the TTModel, prevents load issues at app launch 2011-03-11 12:58:40 -05:00
Blake Watters
698599b1ab Checking in first cut at RKCache design for discussion on list 2011-03-11 07:58:35 -05:00
Blake Watters
52ca8588cf Use removeObjectForKey on deletePersistantStore. 2011-03-09 22:03:18 -05:00
Blake Watters
b81b20281d Rearranged specs in project. Running specs inside Xcode now runs to completion. Experiencing some breakage related to Core Data from the CLI. 2011-03-09 21:57:29 -05:00
Blake Watters
7d3356c3e4 Cleaned up warnings on the UISpec target 2011-03-09 21:18:22 -05:00
Blake Watters
af387fe4e0 Reorganized the Specs subdirectories to mirror the layout of Code/. Added new rake task for running the test server. Introduced dependence on Shotgun and Thin for the Spec server. Infrastructure is all in place, now to get the tests themselves healthy. 2011-03-09 20:05:22 -05:00
Blake Watters
8138e96df6 Added Sinatra to the Gemfile 2011-03-09 17:43:25 -05:00
Blake Watters
7ff0ff1339 Ditches the Rails spec server app. Working on cleaning up unit testing situation. Still a couple of broken tests. 2011-03-09 17:39:32 -05:00
Blake Watters
8ed711a92a Added protocol definitions for unit and integration specs. Added documentation for the spec environment 2011-03-09 16:05:28 -05:00
Blake Watters
779f3befb7 Merge Kevin Lord's patch for ignoring request body on a GET request 2011-03-09 15:34:01 -05:00
Blake Watters
d359f0403a Updating gitignore workspaces 2011-03-09 15:14:48 -05:00
Blake Watters
0a93b377d6 Upgraded to UISpecRunner 0.4.0. Added Rakefile for running all the specs. 2011-03-09 15:07:20 -05:00
Blake Watters
0d9da22844 Updated UISpec to latest bits and retooled integration. Preparing for UISpecRunner updates. 2011-03-09 11:00:17 -05:00
Blake Watters
feb2861113 Removed a bunch of old dangling references to OCMock projects we aren't referencing any more. Hopefully fixing issue with xcodebuild reported on the list 2011-03-08 12:34:03 -05:00
Blake Watters
cbc4c7169c Remove unnecessary retain from object loader initialization 2011-03-08 12:00:36 -05:00
Blake Watters
5b1c5dae7e Inform the delegate on synchronous requests 2011-03-08 11:36:31 -05:00
Blake Watters
83f77e60ae Fixed bug with warnings 2011-03-06 14:16:40 -05:00
Blake Watters
7dd3b62d34 Updated credits with everyone's Github nicknames 2011-03-06 14:08:02 -05:00
Blake Watters
d46b1f06e7 Merge branch 'issue-warning-for-rel-notfound' of https://github.com/seletz/RestKit into 0.9 2011-03-06 13:59:34 -05:00
Blake Watters
f1fa33a45d Remive duplicate definition of updateModel:fromElements: 2011-03-06 13:56:14 -05:00
Blake Watters
6cf32971d0 Added Adam Hinz to the credits 2011-03-06 13:45:00 -05:00
Blake Watters
3cf66e5385 More improvements to the managed object store and seeding API's 2011-03-05 17:05:31 -05:00
Blake Watters
e07d87939f Removed killed method 2011-03-05 16:14:02 -05:00
Blake Watters
1405c0b404 Overhauled the object seeder API. It's much cleaner. Added example code to the RKTwitterCoreDataExample 2011-03-05 16:11:00 -05:00
Blake Watters
6c351c1ef9 Merge branch 'updates' of https://github.com/ahinz/RestKit into seeding 
Conflicts:
	Code/CoreData/RKManagedObjectStore.h
	Code/CoreData/RKManagedObjectStore.m
 2011-03-05 13:06:21 -05:00
Blake Watters
c6546feb70 Added new initializer for starting from a seed database. Need to finish cleaning up API and add example app. 2011-03-04 07:16:52 -05:00
Stefan Eletzhofer
1754a610c0 Revert "Fix CF http 303 error." 
This reverts commit dff95edcfd.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch issue-warning-for-rel-notfound
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   Code/ObjectMapping/RKDynamicRouter.m
#
 2011-03-03 12:16:55 +01:00
Blake Watters
6ad118b822 Silenced a couple of Xcode 4 warning. Don't send a serialization with a GET request by default 0.9.0 2011-03-02 17:23:16 -05:00
Stefan Eletzhofer
9184b2b0f2 Add a nice warning if we don't find a model class for a relationship in RKObjectMapper setRelationshipOfModel:forElements 2011-03-02 12:57:46 +01:00
Stefan Eletzhofer
dff95edcfd Fix CF http 303 error. 2011-03-02 11:11:14 +01:00
Stefan Eletzhofer
a02e13f8d1 fix duplicate definition of updateModel:fromElements: 2011-03-02 11:04:20 +01:00
Blake Watters
e03c6d3d10 Fixed crash during dealloc of RKClient due to initialization of baseURL observer using a blank host. Updated the object mapper to support class/keypath when loading a single object. Some updates to the UISpec harness to get things working again. 2011-02-25 14:42:50 -05:00
Blake Watters
c495073497 Merge branch 'master' of github.com:twotoasters/RestKit into core-data-cleanup 
Conflicts:
	.gitignore
 2011-02-21 20:25:01 -05:00
Blake Watters
976942d054 Updates to quick start section 2011-02-16 11:11:20 -05:00
Blake Watters
7496355b06 Trying to get formatting right for Github flavored markdown 2011-02-16 11:06:01 -05:00
Blake Watters
fdd499eaf9 Merge branch 'master' of github.com:twotoasters/RestKit 
Conflicts:
	RestKit.xcodeproj/project.pbxproj
 2011-02-16 11:04:32 -05:00
Blake Watters
8bc4444400 Xcode 4 specific install instructions 2011-02-16 11:03:08 -05:00
Blake Watters
5df85d0cb7 Fix for whitespace. Really annoyed at Xcode 4 2011-02-15 22:22:59 -05:00
Blake Watters
81b4e00d3d trying to get the project to work with various Xcode output path settings 2011-02-15 21:20:29 -05:00
Blake Watters
bf48cf6559 More Xcode 4 crap 2011-02-15 20:25:22 -05:00
Blake Watters
2aec89b14c More cleanups. Have a bug in the refactored object loader 2011-02-13 03:33:37 -05:00
Blake Watters
0ea0a9b6d9 Cleaning up some TODO's and such 2011-02-13 02:59:37 -05:00
Blake Watters
3467ac5d49 DiscussionBoard and RKTwitter now build properly. May fold the code back out of RKManagedObjectLoader tomorrow. 2011-02-13 02:19:53 -05:00