Skip to content

Commit

Permalink
Moving on NSIncrementalStore
Browse files Browse the repository at this point in the history
+ OR_NO_CACHE_STORE implementation made with NSAtomicStore hack is now
OR_NO_CACHE_LEGACY_STORE
+ OR_NO_CACHE_STORE new implementation is made with NSIncrementalStore
+ ORNoCacheIncrementalStore support predicate passthrough (in the
NSPredicate HTTP header of a get request)

// Some basic tests have been made with the iPlayer sample code.
// Everything seems to work fine. More deep test are needed

* Some cleanup of old code is necessary after a git tag
* We need to implement the predicate handling on the server side

Merge branch 'master' of github.com:ygini/ObjectiveREST

Conflicts:
	Examples/iPlayer Server/English.lproj/MainMenu.xib
  • Loading branch information
ygini committed Nov 7, 2012
2 parents f0b3b94 + 55437ee commit d09424b
Show file tree
Hide file tree
Showing 7 changed files with 215 additions and 35 deletions.
12 changes: 6 additions & 6 deletions Core/Common/ORServerConnection.m
Expand Up @@ -114,18 +114,18 @@ - (id)initWithAsyncSocket:(GCDAsyncSocket *)newSocket configuration:(HTTPConfig
} else {

if ([method isEqualToString:@"GET"]) {
returnHTTPResponse = [self methodGETWithPath:path andPathCompontents:pathComponents];
returnHTTPResponse = [[self methodGETWithPath:path andPathCompontents:pathComponents] retain];
} else if ([method isEqualToString:@"POST"]) {
ORrunOnMainQueueWithoutDeadlocking(^{
returnHTTPResponse = [self methodPOSTWithPath:path andPathCompontents:pathComponents];
returnHTTPResponse = [[self methodPOSTWithPath:path andPathCompontents:pathComponents] retain];
});
} else if ([method isEqualToString:@"PUT"]) {
ORrunOnMainQueueWithoutDeadlocking(^{
returnHTTPResponse = [self methodPUTWithPath:path andPathCompontents:pathComponents];
returnHTTPResponse = [[self methodPUTWithPath:path andPathCompontents:pathComponents] retain];
});
} else if ([method isEqualToString:@"DELETE"]) {
ORrunOnMainQueueWithoutDeadlocking(^{
returnHTTPResponse = [self methodDELETEWithPath:path andPathCompontents:pathComponents];
returnHTTPResponse = [[self methodDELETEWithPath:path andPathCompontents:pathComponents] retain];
});
} else {
// Unknow method
Expand All @@ -138,12 +138,12 @@ - (id)initWithAsyncSocket:(GCDAsyncSocket *)newSocket configuration:(HTTPConfig
}

} else if ([_httpServer.externalAPIDelegate respondsToSelector:@selector(httpResponseForMethod:URI:andHTTPRequest:)]) {
returnHTTPResponse = [_httpServer.externalAPIDelegate httpResponseForMethod:method URI:path andHTTPRequest:request];
returnHTTPResponse = [[_httpServer.externalAPIDelegate httpResponseForMethod:method URI:path andHTTPRequest:request] retain];
}


if (returnHTTPResponse) {
return returnHTTPResponse;
return [returnHTTPResponse autorelease];
}

return [super httpResponseForMethod:method URI:path];
Expand Down

0 comments on commit d09424b

Please sign in to comment.