diff --git a/Classes/DogTest.m b/Classes/DogTest.m index 2248a20..5621598 100644 --- a/Classes/DogTest.m +++ b/Classes/DogTest.m @@ -17,8 +17,7 @@ @implementation DogTest -(void) setUp { [ActiveResource setSite:@"http://localhost:3000/"]; [ActiveResource setResponseType:JSONResponse]; -// [ActiveResource setProtocolExtension:@".json"]; -// [ActiveResource setParseDataMethod:@selector(fromJSONData:)]; + //[ActiveResource setResponseType:XmlResponse]; } -(void) testDogProperties { diff --git a/Classes/DogViewController.m b/Classes/DogViewController.m index ee35f26..967a094 100644 --- a/Classes/DogViewController.m +++ b/Classes/DogViewController.m @@ -27,10 +27,7 @@ - (IBAction) addDogButtonClicked:(id) sender { } - (void) loadDogs { - Dog *newDog = [[Dog alloc] init]; - newDog.name = @"hello"; - newDog.createdAt = [NSDate date]; - NSString *json = [newDog toJSONAs:@"Dog" excludingInArray:[NSArray array] withTranslations:[NSDictionary dictionary ]]; + // self.dogs = [Dog findAll]; [tableView reloadData]; diff --git a/Classes/ActiveResource+JSONSerializableSupport.h b/Classes/lib/ActiveResource+JSONSerializableSupport.h similarity index 100% rename from Classes/ActiveResource+JSONSerializableSupport.h rename to Classes/lib/ActiveResource+JSONSerializableSupport.h diff --git a/Classes/ActiveResource+JSONSerializableSupport.m b/Classes/lib/ActiveResource+JSONSerializableSupport.m similarity index 100% rename from Classes/ActiveResource+JSONSerializableSupport.m rename to Classes/lib/ActiveResource+JSONSerializableSupport.m diff --git a/Classes/JSONSerializable.h b/Classes/lib/JSONSerializable.h similarity index 100% rename from Classes/JSONSerializable.h rename to Classes/lib/JSONSerializable.h diff --git a/Classes/JSONSerializableSupport.h b/Classes/lib/JSONSerializableSupport.h similarity index 100% rename from Classes/JSONSerializableSupport.h rename to Classes/lib/JSONSerializableSupport.h diff --git a/Classes/NSDate+Serialize.h b/Classes/lib/NSDate+Serialize.h similarity index 100% rename from Classes/NSDate+Serialize.h rename to Classes/lib/NSDate+Serialize.h diff --git a/Classes/NSDate+Serialize.m b/Classes/lib/NSDate+Serialize.m similarity index 100% rename from Classes/NSDate+Serialize.m rename to Classes/lib/NSDate+Serialize.m diff --git a/Classes/NSDictionary+JSONSerializableSupport.h b/Classes/lib/NSDictionary+JSONSerializableSupport.h similarity index 100% rename from Classes/NSDictionary+JSONSerializableSupport.h rename to Classes/lib/NSDictionary+JSONSerializableSupport.h diff --git a/Classes/NSDictionary+JSONSerializableSupport.m b/Classes/lib/NSDictionary+JSONSerializableSupport.m similarity index 100% rename from Classes/NSDictionary+JSONSerializableSupport.m rename to Classes/lib/NSDictionary+JSONSerializableSupport.m diff --git a/Classes/NSDictionary+KeyTranslation.h b/Classes/lib/NSDictionary+KeyTranslation.h similarity index 100% rename from Classes/NSDictionary+KeyTranslation.h rename to Classes/lib/NSDictionary+KeyTranslation.h diff --git a/Classes/NSDictionary+KeyTranslation.m b/Classes/lib/NSDictionary+KeyTranslation.m similarity index 100% rename from Classes/NSDictionary+KeyTranslation.m rename to Classes/lib/NSDictionary+KeyTranslation.m diff --git a/Classes/NSMutableURLRequest+ResponseType.h b/Classes/lib/NSMutableURLRequest+ResponseType.h similarity index 100% rename from Classes/NSMutableURLRequest+ResponseType.h rename to Classes/lib/NSMutableURLRequest+ResponseType.h diff --git a/Classes/NSMutableURLRequest+ResponseType.m b/Classes/lib/NSMutableURLRequest+ResponseType.m similarity index 100% rename from Classes/NSMutableURLRequest+ResponseType.m rename to Classes/lib/NSMutableURLRequest+ResponseType.m diff --git a/Classes/NSObject+JSONSerializableSupport.h b/Classes/lib/NSObject+JSONSerializableSupport.h similarity index 100% rename from Classes/NSObject+JSONSerializableSupport.h rename to Classes/lib/NSObject+JSONSerializableSupport.h diff --git a/Classes/NSObject+JSONSerializableSupport.m b/Classes/lib/NSObject+JSONSerializableSupport.m similarity index 100% rename from Classes/NSObject+JSONSerializableSupport.m rename to Classes/lib/NSObject+JSONSerializableSupport.m diff --git a/Classes/NSObject+Serialize.h b/Classes/lib/NSObject+Serialize.h similarity index 100% rename from Classes/NSObject+Serialize.h rename to Classes/lib/NSObject+Serialize.h diff --git a/Classes/NSObject+Serialize.m b/Classes/lib/NSObject+Serialize.m similarity index 100% rename from Classes/NSObject+Serialize.m rename to Classes/lib/NSObject+Serialize.m diff --git a/Classes/NSString+Serialize.h b/Classes/lib/NSString+Serialize.h similarity index 100% rename from Classes/NSString+Serialize.h rename to Classes/lib/NSString+Serialize.h diff --git a/Classes/NSString+Serialize.m b/Classes/lib/NSString+Serialize.m similarity index 100% rename from Classes/NSString+Serialize.m rename to Classes/lib/NSString+Serialize.m diff --git a/Classes/Serialize.h b/Classes/lib/Serialize.h similarity index 100% rename from Classes/Serialize.h rename to Classes/lib/Serialize.h diff --git a/active_resource.xcodeproj/project.pbxproj b/active_resource.xcodeproj/project.pbxproj index 40c5202..ab69d26 100755 --- a/active_resource.xcodeproj/project.pbxproj +++ b/active_resource.xcodeproj/project.pbxproj @@ -107,8 +107,8 @@ 1D3623250D0F684500981E51 /* active_resourceAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = active_resourceAppDelegate.m; sourceTree = ""; }; 1D6058910D05DD3D006BFB54 /* active_resource.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = active_resource.app; sourceTree = BUILT_PRODUCTS_DIR; }; 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; - 232C77860F1E482F009B254D /* JSONSerializable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSONSerializable.h; sourceTree = ""; }; - 23493DF50F1E8D9C00E3AF41 /* JSONSerializableSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSONSerializableSupport.h; sourceTree = ""; }; + 232C77860F1E482F009B254D /* JSONSerializable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSONSerializable.h; path = lib/JSONSerializable.h; sourceTree = ""; }; + 23493DF50F1E8D9C00E3AF41 /* JSONSerializableSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSONSerializableSupport.h; path = lib/JSONSerializableSupport.h; sourceTree = ""; }; 2377C4F30F019E67006E155F /* NSHTTPURLResponse+Error.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSHTTPURLResponse+Error.h"; path = "lib/NSHTTPURLResponse+Error.h"; sourceTree = ""; }; 2377C4F40F019E67006E155F /* NSHTTPURLResponse+Error.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSHTTPURLResponse+Error.m"; path = "lib/NSHTTPURLResponse+Error.m"; sourceTree = ""; }; 23829E0A0EA393700070F0BF /* EditDogViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditDogViewController.h; sourceTree = ""; }; @@ -117,13 +117,13 @@ 23829EFF0EA39B3B0070F0BF /* ViewDogController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewDogController.h; sourceTree = ""; }; 23829F000EA39B3B0070F0BF /* ViewDogController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewDogController.m; sourceTree = ""; }; 23829F110EA39C430070F0BF /* ViewDogController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ViewDogController.xib; sourceTree = ""; }; - 239AC9D00F2574EA00F5B672 /* NSObject+Serialize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+Serialize.h"; sourceTree = ""; }; - 239AC9D10F2574EA00F5B672 /* NSObject+Serialize.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSObject+Serialize.m"; sourceTree = ""; }; - 239ACA130F25789700F5B672 /* NSDate+Serialize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDate+Serialize.h"; sourceTree = ""; }; - 239ACA140F25789700F5B672 /* NSDate+Serialize.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDate+Serialize.m"; sourceTree = ""; }; - 239ACA3C0F2579D000F5B672 /* NSString+Serialize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+Serialize.h"; sourceTree = ""; }; - 239ACA3D0F2579D000F5B672 /* NSString+Serialize.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+Serialize.m"; sourceTree = ""; }; - 239ACA400F257A2A00F5B672 /* Serialize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Serialize.h; sourceTree = ""; }; + 239AC9D00F2574EA00F5B672 /* NSObject+Serialize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSObject+Serialize.h"; path = "lib/NSObject+Serialize.h"; sourceTree = ""; }; + 239AC9D10F2574EA00F5B672 /* NSObject+Serialize.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSObject+Serialize.m"; path = "lib/NSObject+Serialize.m"; sourceTree = ""; }; + 239ACA130F25789700F5B672 /* NSDate+Serialize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSDate+Serialize.h"; path = "lib/NSDate+Serialize.h"; sourceTree = ""; }; + 239ACA140F25789700F5B672 /* NSDate+Serialize.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSDate+Serialize.m"; path = "lib/NSDate+Serialize.m"; sourceTree = ""; }; + 239ACA3C0F2579D000F5B672 /* NSString+Serialize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSString+Serialize.h"; path = "lib/NSString+Serialize.h"; sourceTree = ""; }; + 239ACA3D0F2579D000F5B672 /* NSString+Serialize.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSString+Serialize.m"; path = "lib/NSString+Serialize.m"; sourceTree = ""; }; + 239ACA400F257A2A00F5B672 /* Serialize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Serialize.h; path = lib/Serialize.h; sourceTree = ""; }; 239D4FE70EA6906100318802 /* GTMIPhoneUnitTestDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GTMIPhoneUnitTestDelegate.h; path = google_toolbar/UnitTesting/GTMIPhoneUnitTestDelegate.h; sourceTree = SOURCE_ROOT; }; 239D4FE80EA6906100318802 /* GTMIPhoneUnitTestDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GTMIPhoneUnitTestDelegate.m; path = google_toolbar/UnitTesting/GTMIPhoneUnitTestDelegate.m; sourceTree = SOURCE_ROOT; }; 239D4FE90EA6906100318802 /* GTMIPhoneUnitTestMain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GTMIPhoneUnitTestMain.m; path = google_toolbar/UnitTesting/GTMIPhoneUnitTestMain.m; sourceTree = SOURCE_ROOT; }; @@ -139,14 +139,14 @@ 239D75CC0EAF8D3700664953 /* ObjectiveResourceDateFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ObjectiveResourceDateFormatter.m; path = lib/ObjectiveResourceDateFormatter.m; sourceTree = ""; }; 23B4A6400F092B620021AB9D /* DogErrorTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DogErrorTest.h; sourceTree = ""; }; 23B4A6410F092B620021AB9D /* DogErrorTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DogErrorTest.m; sourceTree = ""; }; - 23C9227E0F24FED700EDE8AF /* ActiveResource+JSONSerializableSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ActiveResource+JSONSerializableSupport.h"; sourceTree = ""; }; - 23C9227F0F24FED700EDE8AF /* ActiveResource+JSONSerializableSupport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "ActiveResource+JSONSerializableSupport.m"; sourceTree = ""; }; - 23C922F10F25066900EDE8AF /* NSMutableURLRequest+ResponseType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMutableURLRequest+ResponseType.h"; sourceTree = ""; }; - 23C922F20F25066900EDE8AF /* NSMutableURLRequest+ResponseType.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMutableURLRequest+ResponseType.m"; sourceTree = ""; }; - 23E62A900F2011070083A66B /* NSDictionary+JSONSerializableSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDictionary+JSONSerializableSupport.h"; sourceTree = ""; }; - 23E62A910F2011070083A66B /* NSDictionary+JSONSerializableSupport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDictionary+JSONSerializableSupport.m"; sourceTree = ""; }; - 23E62A970F2013B90083A66B /* NSDictionary+KeyTranslation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDictionary+KeyTranslation.h"; sourceTree = ""; }; - 23E62A980F2013B90083A66B /* NSDictionary+KeyTranslation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDictionary+KeyTranslation.m"; sourceTree = ""; }; + 23C9227E0F24FED700EDE8AF /* ActiveResource+JSONSerializableSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "ActiveResource+JSONSerializableSupport.h"; path = "lib/ActiveResource+JSONSerializableSupport.h"; sourceTree = ""; }; + 23C9227F0F24FED700EDE8AF /* ActiveResource+JSONSerializableSupport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "ActiveResource+JSONSerializableSupport.m"; path = "lib/ActiveResource+JSONSerializableSupport.m"; sourceTree = ""; }; + 23C922F10F25066900EDE8AF /* NSMutableURLRequest+ResponseType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSMutableURLRequest+ResponseType.h"; path = "lib/NSMutableURLRequest+ResponseType.h"; sourceTree = ""; }; + 23C922F20F25066900EDE8AF /* NSMutableURLRequest+ResponseType.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSMutableURLRequest+ResponseType.m"; path = "lib/NSMutableURLRequest+ResponseType.m"; sourceTree = ""; }; + 23E62A900F2011070083A66B /* NSDictionary+JSONSerializableSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSDictionary+JSONSerializableSupport.h"; path = "lib/NSDictionary+JSONSerializableSupport.h"; sourceTree = ""; }; + 23E62A910F2011070083A66B /* NSDictionary+JSONSerializableSupport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSDictionary+JSONSerializableSupport.m"; path = "lib/NSDictionary+JSONSerializableSupport.m"; sourceTree = ""; }; + 23E62A970F2013B90083A66B /* NSDictionary+KeyTranslation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSDictionary+KeyTranslation.h"; path = "lib/NSDictionary+KeyTranslation.h"; sourceTree = ""; }; + 23E62A980F2013B90083A66B /* NSDictionary+KeyTranslation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSDictionary+KeyTranslation.m"; path = "lib/NSDictionary+KeyTranslation.m"; sourceTree = ""; }; 23F71FF90F13FDFC009C7C2E /* NSString+XMLSerializableSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSString+XMLSerializableSupport.h"; path = "lib/NSString+XMLSerializableSupport.h"; sourceTree = ""; }; 23F71FFA0F13FDFC009C7C2E /* NSString+XMLSerializableSupport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSString+XMLSerializableSupport.m"; path = "lib/NSString+XMLSerializableSupport.m"; sourceTree = ""; }; 28AD733E0D9D9553002E5188 /* MainWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainWindow.xib; sourceTree = ""; }; @@ -169,8 +169,8 @@ 3520BE750F1644EC00BEF309 /* SBJSON.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBJSON.h; sourceTree = ""; }; 3520BE760F1644EC00BEF309 /* SBJSON.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBJSON.m; sourceTree = ""; }; 3520BE770F1644EC00BEF309 /* JSONFramework.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSONFramework.h; sourceTree = ""; }; - 3520BE830F16482800BEF309 /* NSObject+JSONSerializableSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+JSONSerializableSupport.h"; sourceTree = ""; }; - 3520BE840F16482800BEF309 /* NSObject+JSONSerializableSupport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSObject+JSONSerializableSupport.m"; sourceTree = ""; }; + 3520BE830F16482800BEF309 /* NSObject+JSONSerializableSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSObject+JSONSerializableSupport.h"; path = "lib/NSObject+JSONSerializableSupport.h"; sourceTree = ""; }; + 3520BE840F16482800BEF309 /* NSObject+JSONSerializableSupport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSObject+JSONSerializableSupport.m"; path = "lib/NSObject+JSONSerializableSupport.m"; sourceTree = ""; }; 357A91930E9A55EF0025D9AF /* ActiveResource+Base.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "ActiveResource+Base.h"; path = "lib/ActiveResource+Base.h"; sourceTree = ""; }; 357A91940E9A55EF0025D9AF /* ActiveResource+Base.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "ActiveResource+Base.m"; path = "lib/ActiveResource+Base.m"; sourceTree = ""; }; 357A91950E9A55EF0025D9AF /* ActiveResource+XMLSerializableSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "ActiveResource+XMLSerializableSupport.h"; path = "lib/ActiveResource+XMLSerializableSupport.h"; sourceTree = ""; };