@@ -30,7 +30,7 @@ newDog.name = textField.text; // explicitly create a new dog on the server - [newDog createORS]; + [newDog createRemote]; [self.navigationController popViewControllerAnimated:YES]; return YES; } Classes/AddDogViewController.m @@ -31,7 +31,7 @@ [textField resignFirstResponder]; person.name = textField.text; // If the model is new then create will be called otherwise the model will be updated - [person saveORS]; + [person saveRemote]; [delegate.tableView reloadData]; [self.navigationController popViewControllerAnimated:YES]; return YES; Classes/AddPersonViewController.m @@ -33,20 +33,20 @@ #pragma mark ObjectiveResource overrides to handle nestd resources -+ (NSString *)getORSCollectionName { ++ (NSString *)getRemoteCollectionName { return @"people"; } -- (BOOL)createORSWithResponse:(NSError **)aError { - return [self createORSAtPath:[[self class] getORSElementPath:[self nestedPath]] withResponse:aError]; +- (BOOL)createRemoteWithResponse:(NSError **)aError { + return [self createRemoteAtPath:[[self class] getRemoteElementPath:[self nestedPath]] withResponse:aError]; } -- (BOOL)updateORSWithResponse:(NSError **)aError { - return [self updateORSAtPath:[[self class] getORSElementPath:[self nestedPath]] withResponse:aError]; +- (BOOL)updateRemoteWithResponse:(NSError **)aError { + return [self updateRemoteAtPath:[[self class] getRemoteElementPath:[self nestedPath]] withResponse:aError]; } -- (BOOL)destroyORSWithResponse:(NSError **)aError { - return [self destroyORSAtPath:[[self class] getORSElementPath:[self nestedPath]] withResponse:aError]; +- (BOOL)destroyRemoteWithResponse:(NSError **)aError { + return [self destroyRemoteAtPath:[[self class] getRemoteElementPath:[self nestedPath]] withResponse:aError]; } Classes/Dog.m @@ -4,13 +4,13 @@ // // Created by James Burka on 12/29/08. // Copyright 2008 Burkaprojects. All rights reserved. -// +//Remote #import "DogErrorTest.h" @implementation DogError -+ (NSString *)getORSSite { ++ (NSString *)getRemoteSite { return @"http://localhost:36313/"; } @@ -18,7 +18,7 @@ @implementation DogDoesNotExist -+ (NSString *)getORSSite { ++ (NSString *)getRemoteSite { return @"http://badhost.localhost:9999/"; } @@ -29,7 +29,7 @@ - (void) test404Error { NSError *aError; - [DogError findAllORSWithResponse:&aError]; + [DogError findAllRemoteWithResponse:&aError]; STAssertEquals([aError code], 404, @"Should have returned 404 error instead got %d " , [aError code]); @@ -37,7 +37,7 @@ - (void) testCantFindServer { NSError *aError; - [DogDoesNotExist findAllORSWithResponse:&aError]; + [DogDoesNotExist findAllRemoteWithResponse:&aError]; STAssertTrue([[aError domain] isEqualToString:NSURLErrorDomain], @"Should have returned NSURLErrorDomain error instead got %@ " , [aError domain]); Classes/DogErrorTest.m @@ -21,7 +21,7 @@ static Person *owner; [ObjectiveResourceConfig setResponseType:JSONResponse]; //[ObjectiveResource setResponseType:XmlResponse]; - owner = [Person findORS:[NSString stringWithFormat:@"%i",DOG_OWNER]]; + owner = [Person findRemote:[NSString stringWithFormat:@"%i",DOG_OWNER]]; } -(void) testDogProperties { @@ -47,7 +47,7 @@ static Person *owner; Dog* aDog = [[Dog alloc] init]; aDog.personId = owner.personId; aDog.name = @"Helio's Coffee & Chairs"; - [aDog saveORS]; + [aDog saveRemote]; NSArray * dogs = [owner findAllDogs]; @@ -66,7 +66,7 @@ static Person *owner; aDog.personId = owner.personId; aDog.name = @"Judge"; - [aDog saveORS]; + [aDog saveRemote]; NSArray * dogs = [owner findAllDogs]; STAssertTrue(shouldBe == [dogs count], @"Should have %i dogs , %d found" , shouldBe ,[dogs count]); @@ -79,7 +79,7 @@ static Person *owner; BOOL found = NO; Dog *aDog = [dogs objectAtIndex:0]; aDog.name = @"Judge"; - [aDog updateORS]; + [aDog updateRemote]; aDog = [dogs objectAtIndex:0]; @@ -101,7 +101,7 @@ static Person *owner; int shouldBe = [dogs count] - 1; Dog *toDelete = (Dog *)[dogs objectAtIndex:0]; - [toDelete destroyORS]; + [toDelete destroyRemote]; dogs = [owner findAllDogs]; STAssertTrue(shouldBe == [dogs count], @"Should have %i dogs , %d found" , Classes/DogTest.m @@ -85,7 +85,7 @@ [tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:YES]; // Deletes the object on the resource , if the deletion is successfull YES is returned - [(Dog *)[dogs objectAtIndex:indexPath.row] destroyORS]; + [(Dog *)[dogs objectAtIndex:indexPath.row] destroyRemote]; [dogs removeObjectAtIndex:indexPath.row]; } [tableView endUpdates]; Classes/DogViewController.m @@ -43,7 +43,7 @@ dog.name = textField.text; // explicitly update a dog on the server - [dog updateORS]; + [dog updateRemote]; aViewController.dog = dog; [self.navigationController popViewControllerAnimated:YES]; aViewController.title = dog.name; Classes/EditDogViewController.m @@ -26,7 +26,7 @@ } - (void) loadPeople { - self.people = [Person findAllORS]; + self.people = [Person findAllRemote]; [tableView reloadData]; } @@ -76,7 +76,7 @@ forRowAtIndexPath:(NSIndexPath *)indexPath { [aTableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:YES]; // Deletes the object on the resource - [(Person *)[people objectAtIndex:indexPath.row] destroyORS]; + [(Person *)[people objectAtIndex:indexPath.row] destroyRemote]; [people removeObjectAtIndex:indexPath.row]; } [aTableView endUpdates]; Classes/PeopleViewController.m @@ -15,7 +15,7 @@ // handle pluralization -+ (NSString *)getORSCollectionName { ++ (NSString *)getRemoteCollectionName { return @"people"; } @@ -23,7 +23,7 @@ // this will go to the url http://localhost:3000/people/<id>/dogs // and return the array of dogs -(NSArray *) findAllDogs { - return [Dog findORS:[NSString stringWithFormat:@"%@/%@",personId,@"dogs",nil]]; + return [Dog findRemote:[NSString stringWithFormat:@"%@/%@",personId,@"dogs",nil]]; } @end Classes/Person.m @@ -20,10 +20,10 @@ } -(void) testPersonDelete { - int count = [[Person findAllORS]count]; - Person *person = [Person findORS:[NSString stringWithFormat:@"%i",PERSON_DESTROY]]; - STAssertTrue([person destroyORS], @"Should have been true"); - NSArray *people = [Person findAllORS]; + int count = [[Person findAllRemote]count]; + Person *person = [Person findRemote:[NSString stringWithFormat:@"%i",PERSON_DESTROY]]; + STAssertTrue([person destroyRemote], @"Should have been true"); + NSArray *people = [Person findAllRemote]; STAssertTrue((count-1) == [people count], @"Should have %i people , %d found" ,count ,[people count]); } @@ -32,8 +32,8 @@ BOOL found = NO; Person *toCreate = [[Person alloc] init]; toCreate.name = @"Daniel Waterhouse"; - STAssertTrue( [toCreate createORS], @"Should have been true"); - NSArray *people = [Person findAllORS]; + STAssertTrue( [toCreate createRemote], @"Should have been true"); + NSArray *people = [Person findAllRemote]; for(Person *person in people) { if([toCreate isEqual:person]) { @@ -45,10 +45,10 @@ -(void) testPersonUpdate { BOOL found = NO; - Person *toUpdate = [Person findORS:[NSString stringWithFormat:@"%i",PERSON]]; + Person *toUpdate = [Person findRemote:[NSString stringWithFormat:@"%i",PERSON]]; toUpdate.name = @"America Shaftoe"; - STAssertTrue( [toUpdate saveORS], @"Should have been true"); - NSArray *people = [Person findAllORS]; + STAssertTrue( [toUpdate saveRemote], @"Should have been true"); + NSArray *people = [Person findAllRemote]; for(Person *person in people) { if([toUpdate isEqual:person] && [toUpdate.name isEqualToString:person.name]) { found = YES; @@ -58,9 +58,9 @@ } -(void) testFindPerson { - NSArray * people = [Person findAllORS]; + NSArray * people = [Person findAllRemote]; Person *toFind = (Person *)[people objectAtIndex:0]; - STAssertTrue([toFind isEqual:[Person findORS:toFind.personId]], @"Should of returned %@",toFind.name); + STAssertTrue([toFind isEqual:[Person findRemote:toFind.personId]], @"Should of returned %@",toFind.name); } Classes/PersonTest.m @@ -18,58 +18,58 @@ typedef enum { } ORSResponseFormat; // Resource configuration -+ (NSString *)getORSSite; -+ (void)setORSSite:(NSString*)siteURL; -+ (NSString *)getORSUser; -+ (void)setORSUser:(NSString *)user; -+ (NSString *)getORSPassword; -+ (void)setORSPassword:(NSString *)password; -+ (SEL)getORSParseDataMethod; -+ (void)setORSParseDataMethod:(SEL)parseMethod; -+ (SEL) getORSSerializeMethod; -+ (void) setORSSerializeMethod:(SEL)serializeMethod; -+ (NSString *)getORSProtocolExtension; -+ (void)setORSProtocolExtension:(NSString *)protocolExtension; -+ (void)setORSResponseType:(ORSResponseFormat) format; -+ (ORSResponseFormat)getORSResponseType; ++ (NSString *)getRemoteSite; ++ (void)setRemoteSite:(NSString*)siteURL; ++ (NSString *)getRemoteUser; ++ (void)setRemoteUser:(NSString *)user; ++ (NSString *)getRemotePassword; ++ (void)setRemotePassword:(NSString *)password; ++ (SEL)getRemoteParseDataMethod; ++ (void)setRemoteParseDataMethod:(SEL)parseMethod; ++ (SEL) getRemoteSerializeMethod; ++ (void) setRemoteSerializeMethod:(SEL)serializeMethod; ++ (NSString *)getRemoteProtocolExtension; ++ (void)setRemoteProtocolExtension:(NSString *)protocolExtension; ++ (void)setRemoteResponseType:(ORSResponseFormat) format; ++ (ORSResponseFormat)getRemoteResponseType; // Finders -+ (NSArray *)findAllORS; -+ (NSArray *)findAllORSWithResponse:(NSError **)aError; -+ (id)findORS:(NSString *)elementId; -+ (id)findORS:(NSString *)elementId withResponse:(NSError **)aError; ++ (NSArray *)findAllRemote; ++ (NSArray *)findAllRemoteWithResponse:(NSError **)aError; ++ (id)findRemote:(NSString *)elementId; ++ (id)findRemote:(NSString *)elementId withResponse:(NSError **)aError; // URL construction accessors -+ (NSString *)getORSElementName; -+ (NSString *)getORSCollectionName; -+ (NSString *)getORSElementPath:(NSString *)elementId; -+ (NSString *)getORSCollectionPath; -+ (NSString *)getORSCollectionPathWithParameters:(NSDictionary *)parameters; -+ (NSString *)populateORSPath:(NSString *)path withParameters:(NSDictionary *)parameters; ++ (NSString *)getRemoteElementName; ++ (NSString *)getRemoteCollectionName; ++ (NSString *)getRemoteElementPath:(NSString *)elementId; ++ (NSString *)getRemoteCollectionPath; ++ (NSString *)getRemoteCollectionPathWithParameters:(NSDictionary *)parameters; ++ (NSString *)populateRemotePath:(NSString *)path withParameters:(NSDictionary *)parameters; // Instance-specific methods -- (id)getORSId; -- (void)setORSId:(id)orsId; -- (NSString *)getORSClassIdName; -- (BOOL)createORS; -- (BOOL)createORSWithResponse:(NSError **)aError; -- (BOOL)createORSWithParameters:(NSDictionary *)parameters; -- (BOOL)createORSWithParameters:(NSDictionary *)parameters andResponse:(NSError **)aError; -- (BOOL)destroyORS; -- (BOOL)destroyORSWithResponse:(NSError **)aError; -- (BOOL)updateORS; -- (BOOL)updateORSWithResponse:(NSError **)aError; -- (BOOL)saveORS; -- (BOOL)saveORSWithResponse:(NSError **)aError; +- (id)getRemoteId; +- (void)setRemoteId:(id)orsId; +- (NSString *)getRemoteClassIdName; +- (BOOL)createRemote; +- (BOOL)createRemoteWithResponse:(NSError **)aError; +- (BOOL)createRemoteWithParameters:(NSDictionary *)parameters; +- (BOOL)createRemoteWithParameters:(NSDictionary *)parameters andResponse:(NSError **)aError; +- (BOOL)destroyRemote; +- (BOOL)destroyRemoteWithResponse:(NSError **)aError; +- (BOOL)updateRemote; +- (BOOL)updateRemoteWithResponse:(NSError **)aError; +- (BOOL)saveRemote; +- (BOOL)saveRemoteWithResponse:(NSError **)aError; -- (BOOL)createORSAtPath:(NSString *)path withResponse:(NSError **)aError; -- (BOOL)updateORSAtPath:(NSString *)path withResponse:(NSError **)aError; -- (BOOL)destroyORSAtPath:(NSString *)path withResponse:(NSError **)aError; +- (BOOL)createRemoteAtPath:(NSString *)path withResponse:(NSError **)aError; +- (BOOL)updateRemoteAtPath:(NSString *)path withResponse:(NSError **)aError; +- (BOOL)destroyRemoteAtPath:(NSString *)path withResponse:(NSError **)aError; // Instance helpers for getting at commonly used class-level values -- (NSString *)getORSCollectionPath; -- (NSString *)convertToORSExpectedType; +- (NSString *)getRemoteCollectionPath; +- (NSString *)convertToRemoteExpectedType; @end Classes/lib/NSObject+ObjectiveResource.h @@ -24,124 +24,124 @@ static ORSResponseFormat _format; @implementation NSObject (ObjectiveResource) #pragma mark configuration methods -+ (NSString *)getORSSite { ++ (NSString *)getRemoteSite { return _activeResourceSite; } -+ (void)setORSSite:(NSString *)siteURL { ++ (void)setRemoteSite:(NSString *)siteURL { _activeResourceSite = siteURL; } -+ (NSString *)getORSUser { ++ (NSString *)getRemoteUser { return _activeResourceUser; } -+ (void)setORSUser:(NSString *)user { ++ (void)setRemoteUser:(NSString *)user { _activeResourceUser = user; } -+ (NSString *)getORSPassword { ++ (NSString *)getRemotePassword { return _activeResourcePassword; } -+ (void)setORSPassword:(NSString *)password { ++ (void)setRemotePassword:(NSString *)password { _activeResourcePassword = password; } -+ (void)setORSResponseType:(ORSResponseFormat) format { ++ (void)setRemoteResponseType:(ORSResponseFormat) format { _format = format; switch (format) { case JSONResponse: - [[self class] setORSProtocolExtension:@".json"]; - [[self class] setORSParseDataMethod:@selector(fromJSONData:)]; - [[self class] setORSSerializeMethod:@selector(toJSONExcluding:)]; + [[self class] setRemoteProtocolExtension:@".json"]; + [[self class] setRemoteParseDataMethod:@selector(fromJSONData:)]; + [[self class] setRemoteSerializeMethod:@selector(toJSONExcluding:)]; break; default: - [[self class] setORSProtocolExtension:@".xml"]; - [[self class] setORSParseDataMethod:@selector(fromXMLData:)]; - [[self class] setORSSerializeMethod:@selector(toXMLElementExcluding:)]; + [[self class] setRemoteProtocolExtension:@".xml"]; + [[self class] setRemoteParseDataMethod:@selector(fromXMLData:)]; + [[self class] setRemoteSerializeMethod:@selector(toXMLElementExcluding:)]; break; } } -+ (ORSResponseFormat)getORSResponseType { ++ (ORSResponseFormat)getRemoteResponseType { return _format; } -+ (SEL)getORSParseDataMethod { ++ (SEL)getRemoteParseDataMethod { return (nil == _activeResourceParseDataMethod) ? @selector(fromXMLData:) : _activeResourceParseDataMethod; } -+ (void)setORSParseDataMethod:(SEL)parseMethod { ++ (void)setRemoteParseDataMethod:(SEL)parseMethod { _activeResourceParseDataMethod = parseMethod; } -+ (SEL) getORSSerializeMethod { ++ (SEL) getRemoteSerializeMethod { return (nil == _activeResourceSerializeMethod) ? @selector(toXMLElementExcluding:) : _activeResourceSerializeMethod; } -+ (void) setORSSerializeMethod:(SEL)serializeMethod { ++ (void) setRemoteSerializeMethod:(SEL)serializeMethod { _activeResourceSerializeMethod = serializeMethod; } -+ (NSString *)getORSProtocolExtension { ++ (NSString *)getRemoteProtocolExtension { return _activeResourceProtocolExtension; } -+ (void)setORSProtocolExtension:(NSString *)protocolExtension { ++ (void)setRemoteProtocolExtension:(NSString *)protocolExtension { _activeResourceProtocolExtension = protocolExtension; } // Find all items -+ (NSArray *)findAllORSWithResponse:(NSError **)aError { - Response *res = [Connection get:[self getORSCollectionPath] withUser:[[self class] getORSUser] andPassword:[[self class] getORSPassword]]; ++ (NSArray *)findAllRemoteWithResponse:(NSError **)aError { + Response *res = [Connection get:[self getRemoteCollectionPath] withUser:[[self class] getRemoteUser] andPassword:[[self class] getRemotePassword]]; if([res isError] && aError) { *aError = res.error; } - return [self performSelector:[self getORSParseDataMethod] withObject:res.body]; + return [self performSelector:[self getRemoteParseDataMethod] withObject:res.body]; } -+ (NSArray *)findAllORS { ++ (NSArray *)findAllRemote { NSError *aError; - return [self findAllORSWithResponse:&aError]; + return [self findAllRemoteWithResponse:&aError]; } -+ (id)findORS:(NSString *)elementId withResponse:(NSError **)aError { - Response *res = [Connection get:[self getORSElementPath:elementId] withUser:[[self class] getORSUser] andPassword:[[self class] getORSPassword]]; ++ (id)findRemote:(NSString *)elementId withResponse:(NSError **)aError { + Response *res = [Connection get:[self getRemoteElementPath:elementId] withUser:[[self class] getRemoteUser] andPassword:[[self class] getRemotePassword]]; if([res isError] && aError) { *aError = res.error; } - return [self performSelector:[self getORSParseDataMethod] withObject:res.body]; + return [self performSelector:[self getRemoteParseDataMethod] withObject:res.body]; } -+ (id)findORS:(NSString *)elementId { ++ (id)findRemote:(NSString *)elementId { NSError *aError; - return [self findORS:elementId withResponse:&aError]; + return [self findRemote:elementId withResponse:&aError]; } -+ (NSString *)getORSElementName { ++ (NSString *)getRemoteElementName { return [[NSStringFromClass([self class]) stringByReplacingCharactersInRange:NSMakeRange(0, 1) withString:[[NSStringFromClass([self class]) substringWithRange:NSMakeRange(0,1)] lowercaseString]] underscore]; } -+ (NSString *)getORSCollectionName { - return [[self getORSElementName] stringByAppendingString:@"s"]; ++ (NSString *)getRemoteCollectionName { + return [[self getRemoteElementName] stringByAppendingString:@"s"]; } -+ (NSString *)getORSElementPath:(NSString *)elementId { - return [NSString stringWithFormat:@"%@%@/%@%@", [self getORSSite], [self getORSCollectionName], elementId, [self getORSProtocolExtension]]; ++ (NSString *)getRemoteElementPath:(NSString *)elementId { + return [NSString stringWithFormat:@"%@%@/%@%@", [self getRemoteSite], [self getRemoteCollectionName], elementId, [self getRemoteProtocolExtension]]; } -+ (NSString *)getORSCollectionPath { - return [[[self getORSSite] stringByAppendingString:[self getORSCollectionName]] stringByAppendingString:[self getORSProtocolExtension]]; ++ (NSString *)getRemoteCollectionPath { + return [[[self getRemoteSite] stringByAppendingString:[self getRemoteCollectionName]] stringByAppendingString:[self getRemoteProtocolExtension]]; } -+ (NSString *)getORSCollectionPathWithParameters:(NSDictionary *)parameters { - return [self populateORSPath:[self getORSCollectionPath] withParameters:parameters]; ++ (NSString *)getRemoteCollectionPathWithParameters:(NSDictionary *)parameters { + return [self populateRemotePath:[self getRemoteCollectionPath] withParameters:parameters]; } -+ (NSString *)populateORSPath:(NSString *)path withParameters:(NSDictionary *)parameters { ++ (NSString *)populateRemotePath:(NSString *)path withParameters:(NSDictionary *)parameters { // Translate each key to have a preceeding ":" for proper URL param notiation NSMutableDictionary *parameterized = [NSMutableDictionary dictionaryWithCapacity:[parameters count]]; @@ -151,36 +151,36 @@ static ORSResponseFormat _format; return [path gsub:parameterized]; } -- (NSString *)getORSCollectionPath { - return [[self class] getORSCollectionPath]; +- (NSString *)getRemoteCollectionPath { + return [[self class] getRemoteCollectionPath]; } // Converts the object to the data format expected by the server -- (NSString *)convertToORSExpectedType { +- (NSString *)convertToRemoteExpectedType { // exclude id , created_at , updated_at - NSArray *defaultExclusions = [NSArray arrayWithObjects:[self getORSClassIdName],@"createdAt",@"updatedAt",nil]; - return [self performSelector:[[self class] getORSSerializeMethod] withObject:defaultExclusions]; + NSArray *defaultExclusions = [NSArray arrayWithObjects:[self getRemoteClassIdName],@"createdAt",@"updatedAt",nil]; + return [self performSelector:[[self class] getRemoteSerializeMethod] withObject:defaultExclusions]; } #pragma mark default equals methods for id and class based equality - (BOOL)isEqual:(id)anObject { return [NSStringFromClass([self class]) isEqualToString:NSStringFromClass([anObject class])] && - [anObject respondsToSelector:@selector(getORSId)] && [[anObject getORSId] isEqualToString:[self getORSId]]; + [anObject respondsToSelector:@selector(getRemoteId)] && [[anObject getRemoteId] isEqualToString:[self getRemoteId]]; } - (NSUInteger)hash { - return [[self getORSId] intValue] + [NSStringFromClass([self class]) hash]; + return [[self getRemoteId] intValue] + [NSStringFromClass([self class]) hash]; } #pragma mark Instance-specific methods -- (id)getORSId { +- (id)getRemoteId { id result = nil; - SEL idMethodSelector = NSSelectorFromString([self getORSClassIdName]); + SEL idMethodSelector = NSSelectorFromString([self getRemoteClassIdName]); if ([self respondsToSelector:idMethodSelector]) { result = [self performSelector:idMethodSelector]; } return result; } -- (void)setORSId:(id)orsId { +- (void)setRemoteId:(id)orsId { SEL setter = NSSelectorFromString([NSString stringWithFormat:@"set%@Id:",[self className]]); if ([self respondsToSelector:setter]) { [self performSelector:setter withObject:orsId]; @@ -188,7 +188,7 @@ static ORSResponseFormat _format; } -- (NSString *)getORSClassIdName { +- (NSString *)getRemoteClassIdName { return [NSString stringWithFormat:@"%@Id", [NSStringFromClass([self class]) stringByReplacingCharactersInRange:NSMakeRange(0, 1) @@ -196,13 +196,13 @@ static ORSResponseFormat _format; } -- (BOOL)createORSAtPath:(NSString *)path withResponse:(NSError **)aError { - Response *res = [Connection post:[self convertToORSExpectedType] to:path withUser:[[self class] getORSUser] andPassword:[[self class] getORSPassword]]; +- (BOOL)createRemoteAtPath:(NSString *)path withResponse:(NSError **)aError { + Response *res = [Connection post:[self convertToRemoteExpectedType] to:path withUser:[[self class] getRemoteUser] andPassword:[[self class] getRemotePassword]]; if([res isError] && aError) { *aError = res.error; } if ([res isSuccess]) { - NSDictionary *newProperties = [[[self class] performSelector:[[self class] getORSParseDataMethod] withObject:res.body] properties]; + NSDictionary *newProperties = [[[self class] performSelector:[[self class] getRemoteParseDataMethod] withObject:res.body] properties]; [self setProperties:newProperties]; return YES; } @@ -211,15 +211,15 @@ static ORSResponseFormat _format; } } --(BOOL)updateORSAtPath:(NSString *)path withResponse:(NSError **)aError { - Response *res = [Connection put:[self convertToORSExpectedType] to:path - withUser:[[self class] getORSUser] andPassword:[[self class] getORSPassword]]; +-(BOOL)updateRemoteAtPath:(NSString *)path withResponse:(NSError **)aError { + Response *res = [Connection put:[self convertToRemoteExpectedType] to:path + withUser:[[self class] getRemoteUser] andPassword:[[self class] getRemotePassword]]; if([res isError] && aError) { *aError = res.error; } if ([res isSuccess]) { if([(NSString *)[res.headers objectForKey:@"Content-Length"] intValue] > 1) { - NSDictionary *newProperties = [[[self class] performSelector:[[self class] getORSParseDataMethod] withObject:res.body] properties]; + NSDictionary *newProperties = [[[self class] performSelector:[[self class] getRemoteParseDataMethod] withObject:res.body] properties]; [self setProperties:newProperties]; } return YES; @@ -230,37 +230,37 @@ static ORSResponseFormat _format; } -- (BOOL)destroyORSAtPath:(NSString *)path withResponse:(NSError **)aError { - Response *res = [Connection delete:path withUser:[[self class] getORSUser] andPassword:[[self class] getORSPassword]]; +- (BOOL)destroyRemoteAtPath:(NSString *)path withResponse:(NSError **)aError { + Response *res = [Connection delete:path withUser:[[self class] getRemoteUser] andPassword:[[self class] getRemotePassword]]; if([res isError] && aError) { *aError = res.error; } return [res isSuccess]; } -- (BOOL)createORSWithResponse:(NSError **)aError { - return [self createORSAtPath:[self getORSCollectionPath] withResponse:aError]; +- (BOOL)createRemoteWithResponse:(NSError **)aError { + return [self createRemoteAtPath:[self getRemoteCollectionPath] withResponse:aError]; } -- (BOOL)createORS { +- (BOOL)createRemote { NSError *error; - return [self createORSWithResponse:&error]; + return [self createRemoteWithResponse:&error]; } -- (BOOL)createORSWithParameters:(NSDictionary *)parameters andResponse:(NSError **)aError { - return [self createORSAtPath:[[self class] getORSCollectionPathWithParameters:parameters] withResponse:aError]; +- (BOOL)createRemoteWithParameters:(NSDictionary *)parameters andResponse:(NSError **)aError { + return [self createRemoteAtPath:[[self class] getRemoteCollectionPathWithParameters:parameters] withResponse:aError]; } -- (BOOL)createORSWithParameters:(NSDictionary *)parameters { +- (BOOL)createRemoteWithParameters:(NSDictionary *)parameters { NSError *error; - return [self createORSWithParameters:parameters andResponse:&error]; + return [self createRemoteWithParameters:parameters andResponse:&error]; } -- (BOOL)destroyORSWithResponse:(NSError **)aError { - id myId = [self getORSId]; +- (BOOL)destroyRemoteWithResponse:(NSError **)aError { + id myId = [self getRemoteId]; if (nil != myId) { - return [self destroyORSAtPath:[[self class] getORSElementPath:myId] withResponse:aError]; + return [self destroyRemoteAtPath:[[self class] getRemoteElementPath:myId] withResponse:aError]; } else { // this should return a error @@ -268,15 +268,15 @@ static ORSResponseFormat _format; } } -- (BOOL)destroyORS { +- (BOOL)destroyRemote { NSError *error; - return [self destroyORSWithResponse:&error]; + return [self destroyRemoteWithResponse:&error]; } -- (BOOL)updateORSWithResponse:(NSError **)aError { - id myId = [self getORSId]; +- (BOOL)updateRemoteWithResponse:(NSError **)aError { + id myId = [self getRemoteId]; if (nil != myId) { - return [self updateORSAtPath:[[self class] getORSElementPath:myId] withResponse:aError]; + return [self updateRemoteAtPath:[[self class] getRemoteElementPath:myId] withResponse:aError]; } else { // this should return an error @@ -284,24 +284,24 @@ static ORSResponseFormat _format; } } -- (BOOL)updateORS { +- (BOOL)updateRemote { NSError *error; - return [self updateORSWithResponse:&error]; + return [self updateRemoteWithResponse:&error]; } -- (BOOL)saveORSWithResponse:(NSError **)aError { - id myId = [self getORSId]; +- (BOOL)saveRemoteWithResponse:(NSError **)aError { + id myId = [self getRemoteId]; if (nil == myId) { - return [self createORSWithResponse:aError]; + return [self createRemoteWithResponse:aError]; } else { - return [self updateORSWithResponse:aError]; + return [self updateRemoteWithResponse:aError]; } } -- (BOOL)saveORS { +- (BOOL)saveRemote { NSError *error; - return [self saveORSWithResponse:&error]; + return [self saveRemoteWithResponse:&error]; } @end Classes/lib/NSObject+ObjectiveResource.m @@ -11,46 +11,46 @@ @implementation ObjectiveResourceConfig + (NSString *)getSite { - return [self getORSSite]; + return [self getRemoteSite]; } + (void)setSite:(NSString*)siteURL { - [self setORSSite:siteURL]; + [self setRemoteSite:siteURL]; } + (NSString *)getUser { - return [self getORSUser]; + return [self getRemoteUser]; } + (void)setUser:(NSString *)user { - [self setORSUser:user]; + [self setRemoteUser:user]; } + (NSString *)getPassword { - return [self getORSPassword]; + return [self getRemotePassword]; } + (void)setPassword:(NSString *)password { - [self setORSPassword:password]; + [self setRemotePassword:password]; } + (SEL)getParseDataMethod { - return [self getORSParseDataMethod]; + return [self getRemoteParseDataMethod]; } + (void)setParseDataMethod:(SEL)parseMethod { - [self setORSParseDataMethod:parseMethod]; + [self setRemoteParseDataMethod:parseMethod]; } + (SEL) getSerializeMethod { - return [self getORSSerializeMethod]; + return [self getRemoteSerializeMethod]; } + (void) setSerializeMethod:(SEL)serializeMethod { - [self setORSSerializeMethod:serializeMethod]; + [self setRemoteSerializeMethod:serializeMethod]; } + (NSString *)protocolExtension { - return [self getORSProtocolExtension]; + return [self getRemoteProtocolExtension]; } + (void)setProtocolExtension:(NSString *)protocolExtension { - [self setORSProtocolExtension:protocolExtension]; + [self setRemoteProtocolExtension:protocolExtension]; } + (void)setResponseType:(ORSResponseFormat) format { - [self setORSResponseType:format]; + [self setRemoteResponseType:format]; } + (ORSResponseFormat)getResponseType { - return [self getORSResponseType]; + return [self getRemoteResponseType]; } @end Classes/lib/ObjectiveResourceConfig.m 4e85c9e01c153b7e09b9b5aa07fb4dfc79debf8c vickeryj vickeryj@j-macbook.local http://github.com/Glennumz/objectiveresource/commit/e16e1fc1d4a296f6eee71793d8d2b1de930427ed e16e1fc1d4a296f6eee71793d8d2b1de930427ed 2009-02-03T14:50:56-08:00 2009-02-03T14:50:56-08:00 [#25] rename methods to Remote from ORS aa2118d62dde63d1151e78865dbb46e9c4cac2ec vickeryj vickeryj@j-macbook.local