Classes/lib/ObjectiveResource+JSONSerializableSupport.h Classes/lib/ObjectiveResource+JSONSerializableSupport.m Classes/lib/ObjectiveResource+XMLSerializableSupport.h Classes/lib/ObjectiveResource+XMLSerializableSupport.m Classes/lib/ObjectiveResource.h Classes/lib/ObjectiveResource.m Classes/lib/ObjectiveSupport.h Classes/lib/json-framework/JSONFramework.h Classes/lib/json-framework/NSObject+SBJSON.h Classes/lib/json-framework/NSObject+SBJSON.m Classes/lib/json-framework/NSString+SBJSON.h Classes/lib/json-framework/NSString+SBJSON.m Classes/lib/json-framework/SBJSON.h Classes/lib/json-framework/SBJSON.m Classes/objective_resourceAppDelegate.h Classes/objective_resourceAppDelegate.m objective_resource.xcodeproj/project.pbxproj objective_resource_Prefix.pch @@ -6,9 +6,9 @@ // Copyright 2008 Joshua Vickery. All rights reserved. // -#import "ActiveResourceSupport.h" +#import "ObjectiveResource.h" -@interface Dog : ActiveResource { +@interface Dog : ObjectiveResource { NSString *name; NSString *dogId; Classes/Dog.h @@ -7,7 +7,7 @@ // #import "GTMSenTestCase.h" -#import "ActiveResourceSupport.h" +#import "ObjectiveResource.h" @interface DogErrorTest : SenTestCase { @@ -16,14 +16,14 @@ @end -@interface DogError : ActiveResource { +@interface DogError : ObjectiveResource { } @end -@interface DogDoesNotExist : ActiveResource +@interface DogDoesNotExist : ObjectiveResource @end Classes/DogErrorTest.h @@ -15,9 +15,9 @@ NSUInteger shouldBe = 0; -(void) setUp { - [ActiveResource setSite:@"http://localhost:3000/"]; - [ActiveResource setResponseType:JSONResponse]; - //[ActiveResource setResponseType:XmlResponse]; + [ObjectiveResource setSite:@"http://localhost:3000/"]; + [ObjectiveResource setResponseType:JSONResponse]; + //[ObjectiveResource setResponseType:XmlResponse]; } -(void) testDogProperties { Classes/DogTest.m @@ -94,7 +94,7 @@ } } -//Basic type conversion based on the ActiveResource "type" attribute +//Basic type conversion based on the ObjectiveResource "type" attribute - (id) convertProperty:(NSString *)propertyValue toType:(NSString *)type { if ([type isEqualToString:@"datetime" ]) { return [NSDate fromXMLDateTimeString:propertyValue]; Classes/lib/FromXMLElementDelegate.m @@ -9,7 +9,7 @@ #import "JSONFramework.h" #import "NSDictionary+KeyTranslation.h" #import "NSDictionary+JSONSerializableSupport.h" -#import "ActiveResourceSupport.h" +#import "ObjectiveSupport.h" #import "Serialize.h" @implementation NSDictionary(JSONSerializableSupport) Classes/lib/NSDictionary+JSONSerializableSupport.m @@ -7,7 +7,7 @@ // #import "NSMutableURLRequest+ResponseType.h" -#import "ActiveResource+Base.h" +#import "ObjectiveResource.h" #import "Connection.h" @implementation NSMutableURLRequest(ResponseType) @@ -16,7 +16,7 @@ NSMutableURLRequest * request = [NSMutableURLRequest requestWithURL:url cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:[Connection timeout]]; [request setHTTPMethod:method]; - switch ([ActiveResource getResponseType]) { + switch ([ObjectiveResource getResponseType]) { case JSONResponse: [request setValue:@"application/json" forHTTPHeaderField:@"Content-Type"]; [request addValue:@"application/json" forHTTPHeaderField:@"Accept"]; Classes/lib/NSMutableURLRequest+ResponseType.m @@ -10,7 +10,7 @@ #import "NSDictionary+JSONSerializableSupport.h" #import "Serialize.h" #import "JSONFramework.h" -#import "ActiveResourceSupport.h" +#import "ObjectiveSupport.h" @interface NSObject (JSONSerializableSupport_Private) + (id) deserializeJSON:(id)jsonObject; Classes/lib/NSObject+JSONSerializableSupport.m @@ -1,19 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> -<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.02"> +<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.03"> <data> <int key="IBDocument.SystemTarget">512</int> - <string key="IBDocument.SystemVersion">9E17</string> - <string key="IBDocument.InterfaceBuilderVersion">672</string> - <string key="IBDocument.AppKitVersion">949.33</string> - <string key="IBDocument.HIToolboxVersion">352.00</string> + <string key="IBDocument.SystemVersion">9G55</string> + <string key="IBDocument.InterfaceBuilderVersion">677</string> + <string key="IBDocument.AppKitVersion">949.43</string> + <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="14"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> </object> + <object class="NSMutableDictionary" key="IBDocument.Metadata"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + </object> <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBProxyObject" id="841351856"> @@ -50,10 +58,9 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBUIViewController" id="116467219"> <object class="IBUITableView" key="IBUIView" id="583803146"> - <reference key="NSNextResponder"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">274</int> <string key="NSFrame">{{0, -2}, {320, 419}}</string> - <reference key="NSSuperview"/> <object class="NSColor" key="IBUIBackgroundColor"> <int key="NSColorSpace">3</int> <bytes key="NSWhite">MQA</bytes> @@ -69,7 +76,6 @@ <float key="IBUISectionFooterHeight">2.700000e+01</float> </object> <object class="IBUINavigationItem" key="IBUINavigationItem" id="904380780"> - <reference key="IBUINavigationBar"/> <string key="IBUITitle">List of Dogs</string> <object class="IBUIBarButtonItem" key="IBUIRightBarButtonItem" id="154151195"> <int key="IBUIStyle">1</int> @@ -273,7 +279,7 @@ </object> <string>{{310, 320}, {320, 480}}</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string>active_resourceAppDelegate</string> + <string>objective_resourceAppDelegate</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> </object> </object> @@ -342,34 +348,24 @@ </object> </object> <object class="IBPartialClassDescription"> - <string key="className">active_resourceAppDelegate</string> + <string key="className">objective_resourceAppDelegate</string> <string key="superclassName">NSObject</string> <object class="NSMutableDictionary" key="outlets"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>navigationController</string> + <string>viewController</string> <string>window</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>UINavigationController</string> + <string>id</string> <string>UIWindow</string> </object> </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">Classes/active_resourceAppDelegate.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">active_resourceAppDelegate</string> - <string key="superclassName">NSObject</string> - <object class="NSMutableDictionary" key="outlets"> - <string key="NS.key.0">viewController</string> - <string key="NS.object.0">id</string> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBUserSource</string> <string key="minorKey"/> </object> MainWindow.xib sample_rails_app/db/test.sqlite3 Classes/active_resourceAppDelegate.h Classes/active_resourceAppDelegate.m Classes/lib/ActiveResource+Base.h Classes/lib/ActiveResource+Base.m Classes/lib/ActiveResource+JSONSerializableSupport.h Classes/lib/ActiveResource+JSONSerializableSupport.m Classes/lib/ActiveResource+XMLSerializableSupport.h Classes/lib/ActiveResource+XMLSerializableSupport.m Classes/lib/ActiveResource.h Classes/lib/ActiveResource.m Classes/lib/ActiveResourceSupport.h active_resource.xcodeproj/project.pbxproj active_resource_Prefix.pch json-framework/JSONFramework.h json-framework/NSObject+SBJSON.h json-framework/NSObject+SBJSON.m json-framework/NSString+SBJSON.h json-framework/NSString+SBJSON.m json-framework/SBJSON.h json-framework/SBJSON.m ec7f95f752920a05af5a134c437779dc6cbc1dc7 vickeryj vickeryj@j-macbook.local http://github.com/yfactorial/objectiveresource/commit/ad0eda682d7eae0ff985932e9ae90e0240abcf57 ad0eda682d7eae0ff985932e9ae90e0240abcf57 2009-01-26T06:45:49-08:00 2009-01-26T06:25:40-08:00 [#12] BIG CHANGE Rename ActiveResource and ActiveSupport to ObjectiveResource and ObjectiveSupport to fit the name of the project. ActiveResourceSupport.h is now ObjectiveSupport.h ActiveResource+Base is gone, replaced by ObjectiveResource While this is a big change, it should hopefully be easy to update existing code to deal with it. 782ef951eebb09e8ec240ea5c5ed56513963afc3 vickeryj vickeryj@j-macbook.local