Showing
3 changed files
with
24 additions
and
24 deletions
@@ -21,7 +21,7 @@ | @@ -21,7 +21,7 @@ | ||
21 | #import "ASIInputStream.h" | 21 | #import "ASIInputStream.h" |
22 | 22 | ||
23 | // Automatically set on build | 23 | // Automatically set on build |
24 | -NSString *ASIHTTPRequestVersion = @"v1.5-17 2010-01-14"; | 24 | +NSString *ASIHTTPRequestVersion = @"v1.5-18 2010-01-14"; |
25 | 25 | ||
26 | NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain"; | 26 | NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain"; |
27 | 27 |
@@ -49,7 +49,7 @@ static NSString *rackspaceCloudAuthURL = @"https://auth.api.rackspacecloud.com/v | @@ -49,7 +49,7 @@ static NSString *rackspaceCloudAuthURL = @"https://auth.api.rackspacecloud.com/v | ||
49 | 49 | ||
50 | + (void)authenticate { | 50 | + (void)authenticate { |
51 | ASIHTTPRequest *request = [ASICloudFilesRequest authenticationRequest]; | 51 | ASIHTTPRequest *request = [ASICloudFilesRequest authenticationRequest]; |
52 | - [request start]; | 52 | + [request startSynchronous]; |
53 | 53 | ||
54 | if (![request error]) { | 54 | if (![request error]) { |
55 | NSDictionary *responseHeaders = [request responseHeaders]; | 55 | NSDictionary *responseHeaders = [request responseHeaders]; |
@@ -55,7 +55,7 @@ static NSString *apiKey = @""; | @@ -55,7 +55,7 @@ static NSString *apiKey = @""; | ||
55 | [self authenticate]; | 55 | [self authenticate]; |
56 | 56 | ||
57 | ASICloudFilesContainerRequest *request = [ASICloudFilesContainerRequest accountInfoRequest]; | 57 | ASICloudFilesContainerRequest *request = [ASICloudFilesContainerRequest accountInfoRequest]; |
58 | - [request start]; | 58 | + [request startSynchronous]; |
59 | 59 | ||
60 | GHAssertTrue([request containerCount] > 0, @"Failed to retrieve account info"); | 60 | GHAssertTrue([request containerCount] > 0, @"Failed to retrieve account info"); |
61 | GHAssertTrue([request bytesUsed] > 0, @"Failed to retrieve account info"); | 61 | GHAssertTrue([request bytesUsed] > 0, @"Failed to retrieve account info"); |
@@ -67,7 +67,7 @@ static NSString *apiKey = @""; | @@ -67,7 +67,7 @@ static NSString *apiKey = @""; | ||
67 | NSArray *containers = nil; | 67 | NSArray *containers = nil; |
68 | 68 | ||
69 | ASICloudFilesContainerRequest *containerListRequest = [ASICloudFilesContainerRequest listRequest]; | 69 | ASICloudFilesContainerRequest *containerListRequest = [ASICloudFilesContainerRequest listRequest]; |
70 | - [containerListRequest start]; | 70 | + [containerListRequest startSynchronous]; |
71 | 71 | ||
72 | containers = [containerListRequest containers]; | 72 | containers = [containerListRequest containers]; |
73 | GHAssertTrue([containers count] > 0, @"Failed to list containers"); | 73 | GHAssertTrue([containers count] > 0, @"Failed to list containers"); |
@@ -78,7 +78,7 @@ static NSString *apiKey = @""; | @@ -78,7 +78,7 @@ static NSString *apiKey = @""; | ||
78 | } | 78 | } |
79 | 79 | ||
80 | ASICloudFilesContainerRequest *limitContainerListRequest = [ASICloudFilesContainerRequest listRequestWithLimit:2 marker:nil]; | 80 | ASICloudFilesContainerRequest *limitContainerListRequest = [ASICloudFilesContainerRequest listRequestWithLimit:2 marker:nil]; |
81 | - [limitContainerListRequest start]; | 81 | + [limitContainerListRequest startSynchronous]; |
82 | containers = [limitContainerListRequest containers]; | 82 | containers = [limitContainerListRequest containers]; |
83 | GHAssertTrue([containers count] == 2, @"Failed to limit container list"); | 83 | GHAssertTrue([containers count] == 2, @"Failed to limit container list"); |
84 | } | 84 | } |
@@ -87,7 +87,7 @@ static NSString *apiKey = @""; | @@ -87,7 +87,7 @@ static NSString *apiKey = @""; | ||
87 | [self authenticate]; | 87 | [self authenticate]; |
88 | 88 | ||
89 | ASICloudFilesContainerRequest *createContainerRequest = [ASICloudFilesContainerRequest createContainerRequest:@"ASICloudFilesContainerTest"]; | 89 | ASICloudFilesContainerRequest *createContainerRequest = [ASICloudFilesContainerRequest createContainerRequest:@"ASICloudFilesContainerTest"]; |
90 | - [createContainerRequest start]; | 90 | + [createContainerRequest startSynchronous]; |
91 | GHAssertTrue([createContainerRequest error] == nil, @"Failed to create container"); | 91 | GHAssertTrue([createContainerRequest error] == nil, @"Failed to create container"); |
92 | } | 92 | } |
93 | 93 | ||
@@ -95,7 +95,7 @@ static NSString *apiKey = @""; | @@ -95,7 +95,7 @@ static NSString *apiKey = @""; | ||
95 | [self authenticate]; | 95 | [self authenticate]; |
96 | 96 | ||
97 | ASICloudFilesContainerRequest *deleteContainerRequest = [ASICloudFilesContainerRequest deleteContainerRequest:@"ASICloudFilesContainerTest"]; | 97 | ASICloudFilesContainerRequest *deleteContainerRequest = [ASICloudFilesContainerRequest deleteContainerRequest:@"ASICloudFilesContainerTest"]; |
98 | - [deleteContainerRequest start]; | 98 | + [deleteContainerRequest startSynchronous]; |
99 | GHAssertTrue([deleteContainerRequest error] == nil, @"Failed to delete container"); | 99 | GHAssertTrue([deleteContainerRequest error] == nil, @"Failed to delete container"); |
100 | } | 100 | } |
101 | 101 | ||
@@ -105,17 +105,17 @@ static NSString *apiKey = @""; | @@ -105,17 +105,17 @@ static NSString *apiKey = @""; | ||
105 | 105 | ||
106 | // create a file first | 106 | // create a file first |
107 | ASICloudFilesContainerRequest *createContainerRequest = [ASICloudFilesContainerRequest createContainerRequest:@"ASICloudFilesTest"]; | 107 | ASICloudFilesContainerRequest *createContainerRequest = [ASICloudFilesContainerRequest createContainerRequest:@"ASICloudFilesTest"]; |
108 | - [createContainerRequest start]; | 108 | + [createContainerRequest startSynchronous]; |
109 | NSData *data = [@"this is a test" dataUsingEncoding:NSUTF8StringEncoding]; | 109 | NSData *data = [@"this is a test" dataUsingEncoding:NSUTF8StringEncoding]; |
110 | ASICloudFilesObjectRequest *putRequest | 110 | ASICloudFilesObjectRequest *putRequest |
111 | = [ASICloudFilesObjectRequest putObjectRequestWithContainer:@"ASICloudFilesTest" | 111 | = [ASICloudFilesObjectRequest putObjectRequestWithContainer:@"ASICloudFilesTest" |
112 | objectPath:@"infotestfile.txt" contentType:@"text/plain" | 112 | objectPath:@"infotestfile.txt" contentType:@"text/plain" |
113 | objectData:data metadata:nil etag:nil]; | 113 | objectData:data metadata:nil etag:nil]; |
114 | 114 | ||
115 | - [putRequest start]; | 115 | + [putRequest startSynchronous]; |
116 | 116 | ||
117 | ASICloudFilesObjectRequest *request = [ASICloudFilesObjectRequest containerInfoRequest:@"ASICloudFilesTest"]; | 117 | ASICloudFilesObjectRequest *request = [ASICloudFilesObjectRequest containerInfoRequest:@"ASICloudFilesTest"]; |
118 | - [request start]; | 118 | + [request startSynchronous]; |
119 | GHAssertTrue([request containerObjectCount] > 0, @"Failed to retrieve container info"); | 119 | GHAssertTrue([request containerObjectCount] > 0, @"Failed to retrieve container info"); |
120 | GHAssertTrue([request containerBytesUsed] > 0, @"Failed to retrieve container info"); | 120 | GHAssertTrue([request containerBytesUsed] > 0, @"Failed to retrieve container info"); |
121 | } | 121 | } |
@@ -124,7 +124,7 @@ static NSString *apiKey = @""; | @@ -124,7 +124,7 @@ static NSString *apiKey = @""; | ||
124 | [self authenticate]; | 124 | [self authenticate]; |
125 | 125 | ||
126 | ASICloudFilesObjectRequest *request = [ASICloudFilesObjectRequest objectInfoRequest:@"ASICloudFilesTest" objectPath:@"infotestfile.txt"]; | 126 | ASICloudFilesObjectRequest *request = [ASICloudFilesObjectRequest objectInfoRequest:@"ASICloudFilesTest" objectPath:@"infotestfile.txt"]; |
127 | - [request start]; | 127 | + [request startSynchronous]; |
128 | 128 | ||
129 | ASICloudFilesObject *object = [request object]; | 129 | ASICloudFilesObject *object = [request object]; |
130 | GHAssertNotNil(object, @"Failed to retrieve object"); | 130 | GHAssertNotNil(object, @"Failed to retrieve object"); |
@@ -138,7 +138,7 @@ static NSString *apiKey = @""; | @@ -138,7 +138,7 @@ static NSString *apiKey = @""; | ||
138 | [self authenticate]; | 138 | [self authenticate]; |
139 | 139 | ||
140 | ASICloudFilesObjectRequest *objectListRequest = [ASICloudFilesObjectRequest listRequestWithContainer:@"ASICloudFilesTest"]; | 140 | ASICloudFilesObjectRequest *objectListRequest = [ASICloudFilesObjectRequest listRequestWithContainer:@"ASICloudFilesTest"]; |
141 | - [objectListRequest start]; | 141 | + [objectListRequest startSynchronous]; |
142 | 142 | ||
143 | NSArray *containers = [objectListRequest objects]; | 143 | NSArray *containers = [objectListRequest objects]; |
144 | GHAssertTrue([containers count] > 0, @"Failed to list objects"); | 144 | GHAssertTrue([containers count] > 0, @"Failed to list objects"); |
@@ -154,7 +154,7 @@ static NSString *apiKey = @""; | @@ -154,7 +154,7 @@ static NSString *apiKey = @""; | ||
154 | [self authenticate]; | 154 | [self authenticate]; |
155 | 155 | ||
156 | ASICloudFilesObjectRequest *request = [ASICloudFilesObjectRequest getObjectRequestWithContainer:@"ASICloudFilesTest" objectPath:@"infotestfile.txt"]; | 156 | ASICloudFilesObjectRequest *request = [ASICloudFilesObjectRequest getObjectRequestWithContainer:@"ASICloudFilesTest" objectPath:@"infotestfile.txt"]; |
157 | - [request start]; | 157 | + [request startSynchronous]; |
158 | 158 | ||
159 | ASICloudFilesObject *object = [request object]; | 159 | ASICloudFilesObject *object = [request object]; |
160 | GHAssertNotNil(object, @"Failed to retrieve object"); | 160 | GHAssertNotNil(object, @"Failed to retrieve object"); |
@@ -171,7 +171,7 @@ static NSString *apiKey = @""; | @@ -171,7 +171,7 @@ static NSString *apiKey = @""; | ||
171 | 171 | ||
172 | ASICloudFilesContainerRequest *createContainerRequest | 172 | ASICloudFilesContainerRequest *createContainerRequest |
173 | = [ASICloudFilesContainerRequest createContainerRequest:@"ASICloudFilesTest"]; | 173 | = [ASICloudFilesContainerRequest createContainerRequest:@"ASICloudFilesTest"]; |
174 | - [createContainerRequest start]; | 174 | + [createContainerRequest startSynchronous]; |
175 | 175 | ||
176 | NSData *data = [@"this is a test" dataUsingEncoding:NSUTF8StringEncoding]; | 176 | NSData *data = [@"this is a test" dataUsingEncoding:NSUTF8StringEncoding]; |
177 | 177 | ||
@@ -180,12 +180,12 @@ static NSString *apiKey = @""; | @@ -180,12 +180,12 @@ static NSString *apiKey = @""; | ||
180 | objectPath:@"puttestfile.txt" contentType:@"text/plain" | 180 | objectPath:@"puttestfile.txt" contentType:@"text/plain" |
181 | objectData:data metadata:nil etag:nil]; | 181 | objectData:data metadata:nil etag:nil]; |
182 | 182 | ||
183 | - [putRequest start]; | 183 | + [putRequest startSynchronous]; |
184 | 184 | ||
185 | GHAssertNil([putRequest error], @"Failed to PUT object"); | 185 | GHAssertNil([putRequest error], @"Failed to PUT object"); |
186 | 186 | ||
187 | ASICloudFilesObjectRequest *getRequest = [ASICloudFilesObjectRequest getObjectRequestWithContainer:@"ASICloudFilesTest" objectPath:@"puttestfile.txt"]; | 187 | ASICloudFilesObjectRequest *getRequest = [ASICloudFilesObjectRequest getObjectRequestWithContainer:@"ASICloudFilesTest" objectPath:@"puttestfile.txt"]; |
188 | - [getRequest start]; | 188 | + [getRequest startSynchronous]; |
189 | 189 | ||
190 | ASICloudFilesObject *object = [getRequest object]; | 190 | ASICloudFilesObject *object = [getRequest object]; |
191 | NSString *string = [[NSString alloc] initWithData:object.data encoding:NSASCIIStringEncoding]; | 191 | NSString *string = [[NSString alloc] initWithData:object.data encoding:NSASCIIStringEncoding]; |
@@ -199,7 +199,7 @@ static NSString *apiKey = @""; | @@ -199,7 +199,7 @@ static NSString *apiKey = @""; | ||
199 | [string release]; | 199 | [string release]; |
200 | 200 | ||
201 | ASICloudFilesContainerRequest *deleteContainerRequest = [ASICloudFilesContainerRequest deleteContainerRequest:@"ASICloudFilesTest"]; | 201 | ASICloudFilesContainerRequest *deleteContainerRequest = [ASICloudFilesContainerRequest deleteContainerRequest:@"ASICloudFilesTest"]; |
202 | - [deleteContainerRequest start]; | 202 | + [deleteContainerRequest startSynchronous]; |
203 | 203 | ||
204 | } | 204 | } |
205 | 205 | ||
@@ -215,7 +215,7 @@ static NSString *apiKey = @""; | @@ -215,7 +215,7 @@ static NSString *apiKey = @""; | ||
215 | object.metadata = metadata; | 215 | object.metadata = metadata; |
216 | 216 | ||
217 | ASICloudFilesObjectRequest *request = [ASICloudFilesObjectRequest postObjectRequestWithContainer:@"ASICloudFilesTest" object:object]; | 217 | ASICloudFilesObjectRequest *request = [ASICloudFilesObjectRequest postObjectRequestWithContainer:@"ASICloudFilesTest" object:object]; |
218 | - [request start]; | 218 | + [request startSynchronous]; |
219 | 219 | ||
220 | GHAssertTrue([request responseStatusCode] == 202, @"Failed to post object metadata"); | 220 | GHAssertTrue([request responseStatusCode] == 202, @"Failed to post object metadata"); |
221 | 221 | ||
@@ -227,7 +227,7 @@ static NSString *apiKey = @""; | @@ -227,7 +227,7 @@ static NSString *apiKey = @""; | ||
227 | [self authenticate]; | 227 | [self authenticate]; |
228 | 228 | ||
229 | ASICloudFilesObjectRequest *deleteRequest = [ASICloudFilesObjectRequest deleteObjectRequestWithContainer:@"ASICloudFilesTest" objectPath:@"puttestfile.txt"]; | 229 | ASICloudFilesObjectRequest *deleteRequest = [ASICloudFilesObjectRequest deleteObjectRequestWithContainer:@"ASICloudFilesTest" objectPath:@"puttestfile.txt"]; |
230 | - [deleteRequest start]; | 230 | + [deleteRequest startSynchronous]; |
231 | GHAssertTrue([deleteRequest responseStatusCode] == 204, @"Failed to delete object"); | 231 | GHAssertTrue([deleteRequest responseStatusCode] == 204, @"Failed to delete object"); |
232 | } | 232 | } |
233 | 233 | ||
@@ -238,7 +238,7 @@ static NSString *apiKey = @""; | @@ -238,7 +238,7 @@ static NSString *apiKey = @""; | ||
238 | [self authenticate]; | 238 | [self authenticate]; |
239 | 239 | ||
240 | ASICloudFilesCDNRequest *request = [ASICloudFilesCDNRequest containerInfoRequest:@"ASICloudFilesTest"]; | 240 | ASICloudFilesCDNRequest *request = [ASICloudFilesCDNRequest containerInfoRequest:@"ASICloudFilesTest"]; |
241 | - [request start]; | 241 | + [request startSynchronous]; |
242 | 242 | ||
243 | GHAssertTrue([request responseStatusCode] == 204, @"Failed to retrieve CDN container info"); | 243 | GHAssertTrue([request responseStatusCode] == 204, @"Failed to retrieve CDN container info"); |
244 | GHAssertTrue([request cdnEnabled], @"Failed to retrieve CDN container info"); | 244 | GHAssertTrue([request cdnEnabled], @"Failed to retrieve CDN container info"); |
@@ -250,7 +250,7 @@ static NSString *apiKey = @""; | @@ -250,7 +250,7 @@ static NSString *apiKey = @""; | ||
250 | [self authenticate]; | 250 | [self authenticate]; |
251 | 251 | ||
252 | ASICloudFilesCDNRequest *request = [ASICloudFilesCDNRequest listRequest]; | 252 | ASICloudFilesCDNRequest *request = [ASICloudFilesCDNRequest listRequest]; |
253 | - [request start]; | 253 | + [request startSynchronous]; |
254 | 254 | ||
255 | GHAssertNotNil([request containers], @"Failed to retrieve CDN container list"); | 255 | GHAssertNotNil([request containers], @"Failed to retrieve CDN container list"); |
256 | } | 256 | } |
@@ -259,7 +259,7 @@ static NSString *apiKey = @""; | @@ -259,7 +259,7 @@ static NSString *apiKey = @""; | ||
259 | [self authenticate]; | 259 | [self authenticate]; |
260 | 260 | ||
261 | ASICloudFilesCDNRequest *request = [ASICloudFilesCDNRequest listRequestWithLimit:2 marker:nil enabledOnly:YES]; | 261 | ASICloudFilesCDNRequest *request = [ASICloudFilesCDNRequest listRequestWithLimit:2 marker:nil enabledOnly:YES]; |
262 | - [request start]; | 262 | + [request startSynchronous]; |
263 | 263 | ||
264 | GHAssertNotNil([request containers], @"Failed to retrieve CDN container list"); | 264 | GHAssertNotNil([request containers], @"Failed to retrieve CDN container list"); |
265 | GHAssertTrue([[request containers] count] == 2, @"Failed to retrieve limited CDN container list"); | 265 | GHAssertTrue([[request containers] count] == 2, @"Failed to retrieve limited CDN container list"); |
@@ -269,7 +269,7 @@ static NSString *apiKey = @""; | @@ -269,7 +269,7 @@ static NSString *apiKey = @""; | ||
269 | [self authenticate]; | 269 | [self authenticate]; |
270 | 270 | ||
271 | ASICloudFilesCDNRequest *request = [ASICloudFilesCDNRequest putRequestWithContainer:@"ASICloudFilesTest"]; | 271 | ASICloudFilesCDNRequest *request = [ASICloudFilesCDNRequest putRequestWithContainer:@"ASICloudFilesTest"]; |
272 | - [request start]; | 272 | + [request startSynchronous]; |
273 | 273 | ||
274 | GHAssertNotNil([request cdnURI], @"Failed to PUT to CDN container"); | 274 | GHAssertNotNil([request cdnURI], @"Failed to PUT to CDN container"); |
275 | } | 275 | } |
@@ -278,7 +278,7 @@ static NSString *apiKey = @""; | @@ -278,7 +278,7 @@ static NSString *apiKey = @""; | ||
278 | [self authenticate]; | 278 | [self authenticate]; |
279 | 279 | ||
280 | ASICloudFilesCDNRequest *request = [ASICloudFilesCDNRequest postRequestWithContainer:@"ASICloudFilesTest" cdnEnabled:YES ttl:86600]; | 280 | ASICloudFilesCDNRequest *request = [ASICloudFilesCDNRequest postRequestWithContainer:@"ASICloudFilesTest" cdnEnabled:YES ttl:86600]; |
281 | - [request start]; | 281 | + [request startSynchronous]; |
282 | 282 | ||
283 | GHAssertNotNil([request cdnURI], @"Failed to POST to CDN container"); | 283 | GHAssertNotNil([request cdnURI], @"Failed to POST to CDN container"); |
284 | } | 284 | } |
-
Please register or login to post a comment