kylefang/RestKit
1
0
Fork 0
mirror of https://github.com/zhigang1992/RestKit.git synced 2026-04-23 04:20:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,085 Commits 4 Branches 17 Tags
035e7732b87e04ebf28e342a21c222afd08cbb0f
Commit Graph

1085 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Morton
035e7732b8 Add RKRequestConnectionTimeoutError to throw when our connection timeout has been exceeded. 2012-01-20 09:20:09 -05:00
Brian Morton
90716335f5 Add support for timing out an RKRequest via a timeoutTimer and a timeout property. 
* Add timeoutInterval property on RKRequest with a default value of 120.0
* Add timeout method that is called by the timer when the timeout interval has been exceeded to cancel the request and return an error via didFailLoadWithError:
* Add invalidateTimeoutTimer method that is called by RKResponse when the NSURLConnection begins receiving data.
* Add call to invalidateTimeoutTimer in RKRequest cancelAndInformDelegate: so we don't have a dangling timer.
* Add timer creation to sendAsynchronously and sendSynchronously
 2012-01-20 09:19:45 -05:00
Brian Morton
8051fbd9ab Invalidate the RKRequest timer in RKResponse when the NSURLConnection begins receiving data. 2012-01-20 09:17:26 -05:00
Brian Morton
8946f4d702 Add timeoutInterval property to RKClient so that it can be passed on to RKRequest. 2012-01-20 09:17:16 -05:00
Brian Morton
dab403a9c1 Responsibly invalidate the timeoutTimer when the RKRequest is deallocated. Move location of timer creation for asynchronous request. 2012-01-20 09:17:00 -05:00
Brian Morton
15d05f1493 Move the invalidateTimeoutTimer call in RKResponse from didReceiveData to didReceiveResponse and didFailWithError so we are sure its always called and as early as possible. 2012-01-20 09:15:35 -05:00
Brian Morton
23858146fc Add /timeout route to fake a long response for testing RKRequest's timeout interval. We need to leave this around 4 seconds so we don't hold up the ruby process too long and cause the tests launched after to fail. 2012-01-20 09:15:20 -05:00
Brian Morton
b88bba9853 Add test for confirming that an RKClient object can pass through a timeoutInterval to a request. 2012-01-20 09:10:59 -05:00
Brian Morton
f9dd0e9999 Add cast to int to failureError.code so this test works on both the iOS and Mac OS X frameworks. 2012-01-20 09:10:35 -05:00
Blake Watters
e3264a7bfb Merge pull request #504 from bmorton/ordered-set 
Integrate support for NSOrderedSet
 2012-01-14 08:24:14 -08:00
Brian Morton
3f0844f0d3 Add test to make sure an NSOrderedSet can be mapped to an NSArray. 2012-01-14 01:38:23 -08:00
Brian Morton
0f3f3d5702 Add support for mapping an array to an NSOrderedSet. 2012-01-13 00:04:40 -08:00
Brian Morton
3cf2ea5824 Add test for an array being mapped to an NSOrderedSet. 2012-01-13 00:04:16 -08:00
Blake Watters
d5da3ae42e Updated visual install guide images to reflect build process changes 2012-01-11 22:27:21 -05:00
Blake Watters
8363d35e30 Remove 'file' from Specs/Uploads group. This is a test asset that should not be part of the project. 2012-01-09 21:33:13 -05:00
Ray Fix
7be7da61cb Fix for ocassional crashes using http basic auth 2012-01-09 20:10:39 -05:00
David Young-Chan Kay
6a18ebd91b RKRequest: Added null check for HTTP Basic username and password. Closes #493. 2012-01-09 20:08:26 -05:00
Blake Watters
89a4e579fd Revert "Merge branch 'nolanw-request-delegate-gets-failed-auth-challenge'" 
This reverts commit d6510d963f, reversing
changes made to a1e2061106.
 2012-01-09 19:53:23 -05:00
Blake Watters
722d08095b Remove UISpecRunner gem 2012-01-04 08:49:48 -05:00
Blake Watters
4d99d28a4d Merge pull request #477 from rayfix/fix-log-root-key-path 
Fixed logging of root key path on object mapping. Remove TODO comment.
 2011-12-16 21:23:21 -08:00
chethan
ea0cbed8dc Fixed logging of root key path on object mapping. Remove TODO comment that is done. 2011-12-16 18:20:24 -08:00
Blake Watters
091b49a553 Bump version number 2011-12-15 19:32:13 -05:00
Blake Watters
af7a7d22b6 Lowered logging level for body from Info to Debug 2011-12-15 13:41:00 -05:00
Blake Watters
d6510d963f Merge branch 'nolanw-request-delegate-gets-failed-auth-challenge' 2011-12-13 21:17:44 -05:00
Blake Watters
e5e05a0563 Added delegate callback when authentication challenge fails. closes #462 2011-12-13 21:16:30 -05:00
Julien Grimault
a1e2061106 Modified asserts in RKObjectLoader processMappingResult to allow synchronous requests. 2011-12-13 20:58:15 -05:00
Blake Watters
d488452bcd Fix issues with string ordering on OS X vs. iOS in unit tests 2011-12-13 20:57:26 -05:00
Blake Watters
4f24470d13 Merge pull request #465 from rayfix/url-encoding-fix 
Encoded params from RKURLs getting extra 25's.
 2011-12-13 15:02:37 -08:00
Matthias Bartelmeß
e123eaa5fb Updated RKResponse to respect the encoding returned in the Content-Type header (charset=XXX). Exposed 
encoding information as methods on RKResponse
 2011-12-13 17:03:31 -05:00
Blake Watters
dd80df135d Merge pull request #467 from rayfix/test-fix-2 
Fix test: date conversion failure
 2011-12-13 13:09:02 -08:00
Blake Watters
ef8bba11d6 Upgrade to LibComponentLogging Core 1.1.6 and NSLog 1.0.4 to pick up fixes for ARC builds. closes #426 2011-12-13 15:56:18 -05:00
Blake Watters
5d8e62e6a5 Merge pull request #468 from rayfix/should-delete-orphans-451 
Add Delegate for shouldDeleteOrphanedObject:
 2011-12-13 12:42:06 -08:00
Blake Watters
8a4c96d96f Merge branch 'rayfix-test-fix-1' 2011-12-13 15:38:07 -05:00
Ray Fix
1af71ff385 Fix static analayzer warning for uninitialized variable 2011-12-13 15:37:07 -05:00
Blake Watters
aa7e76f924 Updated TESTING.md documentation to remove references to UISpecRunner 2011-12-13 15:36:41 -05:00
Blake Watters
9a37c1bd66 Moved OS X headers to Public/ and updated README.md 2011-12-13 15:36:40 -05:00
Ray Fix
21c3b6af39 Fix static analayzer warning for uninitialized variable 2011-12-13 15:33:14 -05:00
Blake Watters
4c8a7f1103 Merge pull request #470 from inquinity/master 
Fixed: RKResponse parsedBody will fail when encountering a parsing error if it was called with a nil NSError pointer
 2011-12-13 12:12:11 -08:00
Robert Altman
2969e6b9f3 Added missing non-null test for NSError pointer 2011-12-12 17:06:17 -06:00
Ray Fix
d739e78f22 Add another test for orphaned object deletion. 
Use a real object, rather than a OCMock to prove that the right
thing happens with @optional selector is not implemented.
 2011-12-11 09:13:35 -08:00
Ray Fix
d95338bf45 fix test error humanMapping.primaryKeyAttribute set incorrectly 2011-12-11 09:13:35 -08:00
Ray Fix
f23b242e87 First cut at issue 451, shouldDeleteOrphanedObject. 
The test is currently failing and the 6 results are
returned instead of keeping alive only the original
4 result objects.  Requires further investigation.
 2011-12-11 09:13:35 -08:00
Ray Fix
7eaa0bccfe Fix test failure. Encoded URLs getting extra 25's. 2011-12-09 18:18:08 -08:00
Ray Fix
c59eb01ca2 Fix test: date conversion failure 
Default date formatters need to be reset.
 2011-12-09 18:15:51 -08:00
Ray Fix
361b656064 Corrects failure in testShouldConsiderADictionaryContainingOnlyNullValuesForKeysMappable 
I am not certain what the expected behavior is.  Perhaps it actually is
supposed to be returning [NSNull null].

2011-12-09 14:51:05.657 otest[64680:3b03] W restkit.object_mapping:RKObjectMappingOperation.m:230 Coercing NSNull value to nil in shouldSetValue:atKeyPath: -- should be fixed.
 2011-12-09 17:54:08 -08:00
Blake Watters
b670bc7769 Updated TESTING.md documentation to remove references to UISpecRunner 2011-12-09 12:39:35 -05:00
Blake Watters
15d291bc52 Moved OS X headers to Public/ and updated README.md 2011-12-09 09:50:46 -05:00
Blake Watters
4a45a15da1 Fixed nearly all broken tests for OS X target 2011-12-09 00:30:34 -05:00
Blake Watters
479864902b Fixed all build warnings on OS X Framework target 2011-12-08 23:23:20 -05:00
Nolan Waite
9cc6de8dc4 Request delegate can learn of authentication failures 2011-12-08 13:17:52 -07:00