Classes/lib/ObjectiveResourceConfig.h Classes/lib/ObjectiveResourceConfig.m @@ -30,7 +30,7 @@ newDog.name = textField.text; // explicitly create a new dog on the server - [newDog create]; + [newDog createORS]; [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 save]; + [person saveORS]; [delegate.tableView reloadData]; [self.navigationController popViewControllerAnimated:YES]; return YES; Classes/AddPersonViewController.m @@ -8,7 +8,7 @@ #import "ObjectiveResource.h" -@interface Dog : ObjectiveResource { +@interface Dog : NSObject { NSString *name; NSString *dogId; Classes/Dog.h @@ -38,15 +38,15 @@ } - (BOOL)createORSWithResponse:(NSError **)aError { - return [self createAtPath:[[self class] elementPath:[self nestedPath]] withResponse:aError]; + return [self createORSAtPath:[[self class] getORSElementPath:[self nestedPath]] withResponse:aError]; } - (BOOL)updateORSWithResponse:(NSError **)aError { - return [self updateAtPath:[[self class] elementPath:[self nestedPath]] withResponse:aError]; + return [self updateORSAtPath:[[self class] getORSElementPath:[self nestedPath]] withResponse:aError]; } - (BOOL)destroyORSWithResponse:(NSError **)aError { - return [self destroyAtPath:[[self class] elementPath:[self nestedPath]] withResponse:aError]; + return [self destroyORSAtPath:[[self class] getORSElementPath:[self nestedPath]] withResponse:aError]; } Classes/Dog.m @@ -16,14 +16,14 @@ @end -@interface DogError : ObjectiveResource { +@interface DogError : NSObject { } @end -@interface DogDoesNotExist : ObjectiveResource +@interface DogDoesNotExist : NSObject @end Classes/DogErrorTest.h @@ -29,7 +29,7 @@ - (void) test404Error { NSError *aError; - [DogError findAllWithResponse:&aError]; + [DogError findAllORSWithResponse:&aError]; STAssertEquals([aError code], 404, @"Should have returned 404 error instead got %d " , [aError code]); @@ -37,7 +37,7 @@ - (void) testCantFindServer { NSError *aError; - [DogDoesNotExist findAllWithResponse:&aError]; + [DogDoesNotExist findAllORSWithResponse:&aError]; STAssertTrue([[aError domain] isEqualToString:NSURLErrorDomain], @"Should have returned NSURLErrorDomain error instead got %@ " , [aError domain]); Classes/DogErrorTest.m @@ -17,11 +17,11 @@ static Person *owner; -(void) setUp { - [ObjectiveResource setSite:@"http://localhost:36313/"]; - [ObjectiveResource setResponseType:JSONResponse]; + [ObjectiveResourceConfig setSite:@"http://localhost:36313/"]; + [ObjectiveResourceConfig setResponseType:JSONResponse]; //[ObjectiveResource setResponseType:XmlResponse]; - owner = [Person find:[NSString stringWithFormat:@"%i",DOG_OWNER]]; + owner = [Person findORS:[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 save]; + [aDog saveORS]; NSArray * dogs = [owner findAllDogs]; @@ -66,7 +66,7 @@ static Person *owner; aDog.personId = owner.personId; aDog.name = @"Judge"; - [aDog save]; + [aDog saveORS]; 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 update]; + [aDog updateORS]; aDog = [dogs objectAtIndex:0]; @@ -101,7 +101,7 @@ static Person *owner; int shouldBe = [dogs count] - 1; Dog *toDelete = (Dog *)[dogs objectAtIndex:0]; - [toDelete destroy]; + [toDelete destroyORS]; 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] destroy]; + [(Dog *)[dogs objectAtIndex:indexPath.row] destroyORS]; [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 update]; + [dog updateORS]; aViewController.dog = dog; [self.navigationController popViewControllerAnimated:YES]; aViewController.title = dog.name; Classes/EditDogViewController.m @@ -26,7 +26,7 @@ } - (void) loadPeople { - self.people = [Person findAll]; + self.people = [Person findAllORS]; [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] destroy]; + [(Person *)[people objectAtIndex:indexPath.row] destroyORS]; [people removeObjectAtIndex:indexPath.row]; } [aTableView endUpdates]; Classes/PeopleViewController.m @@ -8,7 +8,7 @@ #import "ObjectiveResource.h" -@interface Person : ObjectiveResource { +@interface Person : NSObject { NSString *name; NSString *personId; Classes/Person.h @@ -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 find:[NSString stringWithFormat:@"%@/%@",personId,@"dogs",nil]]; + return [Dog findORS:[NSString stringWithFormat:@"%@/%@",personId,@"dogs",nil]]; } @end Classes/Person.m @@ -14,16 +14,16 @@ @implementation PersonTest -(void) setUp { - [ObjectiveResource setSite:@"http://localhost:36313/"]; - [ObjectiveResource setResponseType:JSONResponse]; - //[ObjectiveResource setResponseType:XmlResponse]; + [ObjectiveResourceConfig setSite:@"http://localhost:36313/"]; + [ObjectiveResourceConfig setResponseType:JSONResponse]; + //[ObjectiveResourceConfig setResponseType:XmlResponse]; } -(void) testPersonDelete { - int count = [[Person findAll]count]; - Person *person = [Person find:[NSString stringWithFormat:@"%i",PERSON_DESTROY]]; - STAssertTrue([person destroy], @"Should have been true"); - NSArray *people = [Person findAll]; + 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]; 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 create], @"Should have been true"); - NSArray *people = [Person findAll]; + STAssertTrue( [toCreate createORS], @"Should have been true"); + NSArray *people = [Person findAllORS]; for(Person *person in people) { if([toCreate isEqual:person]) { @@ -45,10 +45,10 @@ -(void) testPersonUpdate { BOOL found = NO; - Person *toUpdate = [Person find:[NSString stringWithFormat:@"%i",PERSON]]; + Person *toUpdate = [Person findORS:[NSString stringWithFormat:@"%i",PERSON]]; toUpdate.name = @"America Shaftoe"; - STAssertTrue( [toUpdate save], @"Should have been true"); - NSArray *people = [Person findAll]; + STAssertTrue( [toUpdate saveORS], @"Should have been true"); + NSArray *people = [Person findAllORS]; 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 findAll]; + NSArray * people = [Person findAllORS]; Person *toFind = (Person *)[people objectAtIndex:0]; - STAssertTrue([toFind isEqual:[Person find:toFind.personId]], @"Should of returned %@",toFind.name); + STAssertTrue([toFind isEqual:[Person findORS:toFind.personId]], @"Should of returned %@",toFind.name); } Classes/PersonTest.m @@ -16,7 +16,7 @@ NSMutableURLRequest * request = [NSMutableURLRequest requestWithURL:url cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:[Connection timeout]]; [request setHTTPMethod:method]; - switch ([ObjectiveResource getResponseType]) { + switch ([ObjectiveResourceConfig getResponseType]) { case JSONResponse: [request setValue:@"application/json" forHTTPHeaderField:@"Content-Type"]; [request addValue:@"application/json" forHTTPHeaderField:@"Accept"]; Classes/lib/NSMutableURLRequest+ResponseType.m @@ -165,7 +165,7 @@ static ORSResponseFormat _format; #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(getId)] && [[anObject getORSId] isEqualToString:[self getORSId]]; + [anObject respondsToSelector:@selector(getORSId)] && [[anObject getORSId] isEqualToString:[self getORSId]]; } - (NSUInteger)hash { return [[self getORSId] intValue] + [NSStringFromClass([self class]) hash]; Classes/lib/NSObject+ObjectiveResource.m @@ -7,57 +7,4 @@ // #import "NSObject+ObjectiveResource.h" - - -@interface ObjectiveResource : NSObject -// Resource configuration -+ (NSString *)getSite; -+ (void)setSite:(NSString*)siteURL; -+ (NSString *)getUser; -+ (void)setUser:(NSString *)user; -+ (NSString *)getPassword; -+ (void)setPassword:(NSString *)password; -+ (SEL)getParseDataMethod; -+ (void)setParseDataMethod:(SEL)parseMethod; -+ (SEL) getSerializeMethod; -+ (void) setSerializeMethod:(SEL)serializeMethod; -+ (NSString *)protocolExtension; -+ (void)setProtocolExtension:(NSString *)protocolExtension; -+ (void)setResponseType:(ORSResponseFormat) format; -+ (ORSResponseFormat)getResponseType; - - -// Finders -+ (NSArray *)findAll; -+ (NSArray *)findAllWithResponse:(NSError **)aError; -+ (id)find:(NSString *)elementId; -+ (id)find:(NSString *)elementId withResponse:(NSError **)aError; - -// URL construction accessors -+ (NSString *)elementName; -+ (NSString *)collectionName; -+ (NSString *)elementPath:(NSString *)elementId; -+ (NSString *)collectionPath; -+ (NSString *)collectionPathWithParameters:(NSDictionary *)parameters; -+ (NSString *)populatePath:(NSString *)path withParameters:(NSDictionary *)parameters; - -// Instance-specific methods -- (id)getId; -- (NSString *)classIdName; -- (BOOL)create; -- (BOOL)createWithResponse:(NSError **)aError; -- (BOOL)createWithParameters:(NSDictionary *)parameters; -- (BOOL)createWithParameters:(NSDictionary *)parameters andResponse:(NSError **)aError; -- (BOOL)destroy; -- (BOOL)destroyWithResponse:(NSError **)aError; -- (BOOL)update; -- (BOOL)updateWithResponse:(NSError **)aError; -- (BOOL)save; -- (BOOL)saveWithResponse:(NSError **)aError; - - -- (BOOL)createAtPath:(NSString *)path withResponse:(NSError **)aError; -- (BOOL)updateAtPath:(NSString *)path withResponse:(NSError **)aError; -- (BOOL)destroyAtPath:(NSString *)path withResponse:(NSError **)aError; - -@end \ No newline at end of file +#import "ObjectiveResourceConfig.h" \ No newline at end of file Classes/lib/ObjectiveResource.h @@ -16,13 +16,13 @@ - (void)applicationDidFinishLaunching:(UIApplication *)application { //Configure ObjectiveResource - [ObjectiveResource setSite:@"http://localhost:3000/"]; + [ObjectiveResourceConfig setSite:@"http://localhost:3000/"]; // use json //[ObjectiveResource setResponseType:JSONResponse]; // use xml - [ObjectiveResource setResponseType:XmlResponse]; + [ObjectiveResourceConfig setResponseType:XmlResponse]; [window addSubview:navigationController.view]; // Override point for customization after app launch Classes/objective_resourceAppDelegate.m @@ -40,7 +40,6 @@ 239D501A0EA691AC00318802 /* DogViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 350420F30E5E15AA00493366 /* DogViewController.m */; }; 239D501B0EA691AC00318802 /* Dog.m in Sources */ = {isa = PBXBuildFile; fileRef = 350421280E5E1A0F00493366 /* Dog.m */; }; 239D501C0EA691AC00318802 /* AddDogViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 350421CE0E5E1EC500493366 /* AddDogViewController.m */; }; - 239D501F0EA691AC00318802 /* ObjectiveResource.m in Sources */ = {isa = PBXBuildFile; fileRef = 357A91980E9A55EF0025D9AF /* ObjectiveResource.m */; }; 239D50200EA691AC00318802 /* Connection.m in Sources */ = {isa = PBXBuildFile; fileRef = 357A919B0E9A55EF0025D9AF /* Connection.m */; }; 239D502A0EA691AC00318802 /* Response.m in Sources */ = {isa = PBXBuildFile; fileRef = 357A91B00E9A55EF0025D9AF /* Response.m */; }; 239D502B0EA691AC00318802 /* EditDogViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 23829E0B0EA393700070F0BF /* EditDogViewController.m */; }; @@ -58,11 +57,12 @@ 350421870E5E1BF200493366 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 350421860E5E1BF200493366 /* CoreGraphics.framework */; }; 350421CB0E5E1E0900493366 /* AddDogView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 350421CA0E5E1E0900493366 /* AddDogView.xib */; }; 350421CF0E5E1EC500493366 /* AddDogViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 350421CE0E5E1EC500493366 /* AddDogViewController.m */; }; - 357A91B50E9A55EF0025D9AF /* ObjectiveResource.m in Sources */ = {isa = PBXBuildFile; fileRef = 357A91980E9A55EF0025D9AF /* ObjectiveResource.m */; }; 357A91B60E9A55EF0025D9AF /* Connection.m in Sources */ = {isa = PBXBuildFile; fileRef = 357A919B0E9A55EF0025D9AF /* Connection.m */; }; 357A91C00E9A55EF0025D9AF /* Response.m in Sources */ = {isa = PBXBuildFile; fileRef = 357A91B00E9A55EF0025D9AF /* Response.m */; }; 3584DFD60F31F684008E596B /* NSObject+ObjectiveResource.m in Sources */ = {isa = PBXBuildFile; fileRef = 3584DFD50F31F684008E596B /* NSObject+ObjectiveResource.m */; }; 3584E0A40F32334D008E596B /* NSObject+ObjectiveResource.m in Sources */ = {isa = PBXBuildFile; fileRef = 3584DFD50F31F684008E596B /* NSObject+ObjectiveResource.m */; }; + 3584E0F00F324581008E596B /* ObjectiveResourceConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 3584E0EF0F324581008E596B /* ObjectiveResourceConfig.m */; }; + 3584E0F10F324581008E596B /* ObjectiveResourceConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 3584E0EF0F324581008E596B /* ObjectiveResourceConfig.m */; }; 35C679300F2E70C2005FF6CE /* NSString+InflectionSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = 35C678FC0F2E70C2005FF6CE /* NSString+InflectionSupport.m */; }; 35C679310F2E70C2005FF6CE /* NSData+Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = 35C678FE0F2E70C2005FF6CE /* NSData+Additions.m */; }; 35C679320F2E70C2005FF6CE /* NSObject+PropertySupport.m in Sources */ = {isa = PBXBuildFile; fileRef = 35C679000F2E70C2005FF6CE /* NSObject+PropertySupport.m */; }; @@ -165,13 +165,14 @@ 350421CD0E5E1EC500493366 /* AddDogViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddDogViewController.h; sourceTree = "<group>"; }; 350421CE0E5E1EC500493366 /* AddDogViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AddDogViewController.m; sourceTree = "<group>"; }; 357A91970E9A55EF0025D9AF /* ObjectiveResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ObjectiveResource.h; path = lib/ObjectiveResource.h; sourceTree = "<group>"; }; - 357A91980E9A55EF0025D9AF /* ObjectiveResource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ObjectiveResource.m; path = lib/ObjectiveResource.m; sourceTree = "<group>"; }; 357A919A0E9A55EF0025D9AF /* Connection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Connection.h; path = lib/Connection.h; sourceTree = "<group>"; }; 357A919B0E9A55EF0025D9AF /* Connection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Connection.m; path = lib/Connection.m; sourceTree = "<group>"; }; 357A91AF0E9A55EF0025D9AF /* Response.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Response.h; path = lib/Response.h; sourceTree = "<group>"; }; 357A91B00E9A55EF0025D9AF /* Response.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Response.m; path = lib/Response.m; sourceTree = "<group>"; }; 3584DFD40F31F684008E596B /* NSObject+ObjectiveResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSObject+ObjectiveResource.h"; path = "lib/NSObject+ObjectiveResource.h"; sourceTree = "<group>"; }; 3584DFD50F31F684008E596B /* NSObject+ObjectiveResource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSObject+ObjectiveResource.m"; path = "lib/NSObject+ObjectiveResource.m"; sourceTree = "<group>"; }; + 3584E0EE0F324581008E596B /* ObjectiveResourceConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ObjectiveResourceConfig.h; path = lib/ObjectiveResourceConfig.h; sourceTree = "<group>"; }; + 3584E0EF0F324581008E596B /* ObjectiveResourceConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ObjectiveResourceConfig.m; path = lib/ObjectiveResourceConfig.m; sourceTree = "<group>"; }; 35C678F90F2E70C2005FF6CE /* CoreSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoreSupport.h; sourceTree = "<group>"; }; 35C678FB0F2E70C2005FF6CE /* NSString+InflectionSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+InflectionSupport.h"; sourceTree = "<group>"; }; 35C678FC0F2E70C2005FF6CE /* NSString+InflectionSupport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+InflectionSupport.m"; sourceTree = "<group>"; }; @@ -382,7 +383,8 @@ 3584DFD50F31F684008E596B /* NSObject+ObjectiveResource.m */, 357A91630E9A436E0025D9AF /* Connection */, 357A91970E9A55EF0025D9AF /* ObjectiveResource.h */, - 357A91980E9A55EF0025D9AF /* ObjectiveResource.m */, + 3584E0EE0F324581008E596B /* ObjectiveResourceConfig.h */, + 3584E0EF0F324581008E596B /* ObjectiveResourceConfig.m */, ); name = ObjectiveResource; sourceTree = "<group>"; @@ -619,7 +621,6 @@ 350420F40E5E15AA00493366 /* DogViewController.m in Sources */, 350421290E5E1A0F00493366 /* Dog.m in Sources */, 350421CF0E5E1EC500493366 /* AddDogViewController.m in Sources */, - 357A91B50E9A55EF0025D9AF /* ObjectiveResource.m in Sources */, 357A91B60E9A55EF0025D9AF /* Connection.m in Sources */, 357A91C00E9A55EF0025D9AF /* Response.m in Sources */, 23829E0C0EA393700070F0BF /* EditDogViewController.m in Sources */, @@ -654,6 +655,7 @@ 2314FF700F2F8089003B13AB /* PeopleViewController.m in Sources */, 2314FF710F2F8089003B13AB /* Person.m in Sources */, 2314FF760F2F8094003B13AB /* ViewPersonController.m in Sources */, + 3584E0F10F324581008E596B /* ObjectiveResourceConfig.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -664,7 +666,6 @@ 239D501A0EA691AC00318802 /* DogViewController.m in Sources */, 239D501B0EA691AC00318802 /* Dog.m in Sources */, 239D501C0EA691AC00318802 /* AddDogViewController.m in Sources */, - 239D501F0EA691AC00318802 /* ObjectiveResource.m in Sources */, 239D50200EA691AC00318802 /* Connection.m in Sources */, 239D502A0EA691AC00318802 /* Response.m in Sources */, 239D502B0EA691AC00318802 /* EditDogViewController.m in Sources */, @@ -705,6 +706,7 @@ 2314FF770F2F8094003B13AB /* ViewPersonController.m in Sources */, 2322CD650F2F968000EDF562 /* PersonTest.m in Sources */, 3584DFD60F31F684008E596B /* NSObject+ObjectiveResource.m in Sources */, + 3584E0F00F324581008E596B /* ObjectiveResourceConfig.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; objective_resource.xcodeproj/project.pbxproj sample_rails_app/db/development.sqlite3 sample_rails_app/db/test.sqlite3 Classes/lib/ObjectiveResource.m 42ae4f8129444c56f761fb5f3931324341de9c5b vickeryj vickeryj@j-macbook.westell.com http://github.com/Glennumz/objectiveresource/commit/9e7da18dae34e10e004117f692adf0f046e25383 9e7da18dae34e10e004117f692adf0f046e25383 2009-01-29T12:46:44-08:00 2009-01-29T12:46:44-08:00 [#9] remove ObjectiveResource superclass 94afa206aec8fb6bdf92f9cc85ad75a66d67432c vickeryj vickeryj@j-macbook.westell.com