* handle "description" property

* unit test
WFNeIn · Apr 18, 2014 · 2cdc5e4 · 2cdc5e4
1 parent ec19f80
commit 2cdc5e4
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 5 deletions.
diff --git a/JSONModel/JSONModel/JSONModel.m b/JSONModel/JSONModel/JSONModel.m
@@ -44,6 +44,9 @@
 
 #pragma mark - JSONModel implementation
 @implementation JSONModel
+{
+    NSString* _description;
+}
 
 #pragma mark - initialization methods
 
@@ -1193,7 +1196,8 @@ -(NSString*)description
     NSMutableString* text = [NSMutableString stringWithFormat:@"<%@> \n", [self class]];
 
     for (JSONModelClassProperty *p in [self __properties__]) {
-        id value = [self valueForKey:p.name];
+
+        id value = ([p.name isEqualToString:@"description"])?self->_description:[self valueForKey:p.name];
         NSString* valueDescription = (value)?[value description]:@"<nil>";
 
         if (p.isStandardJSONType && ![value respondsToSelector:@selector(count)] && [valueDescription length]>60 && !p.convertsOnDemand) {

diff --git a/JSONModel/JSONModel/JSONModelClassProperty.m b/JSONModel/JSONModel/JSONModelClassProperty.m
@@ -21,7 +21,7 @@ @implementation JSONModelClassProperty
 -(NSString*)description
 {
     //build the properties string for the current class property
-    NSMutableArray* properties = [NSMutableArray arrayWithCapacity:4];
+    NSMutableArray* properties = [NSMutableArray arrayWithCapacity:8];
 
     if (self.isIndex) [properties addObject:@"Index"];
     if (self.isOptional) [properties addObject:@"Optional"];

diff --git a/JSONModelDemoTests/UnitTests/SpecialPropertyNameTests.m b/JSONModelDemoTests/UnitTests/SpecialPropertyNameTests.m
@@ -9,6 +9,14 @@
 #import "SpecialPropertyNameTests.h"
 #import "SpecialPropertyModel.h"
 
+@interface DescModel : JSONModel
+@property (assign, nonatomic) int id;
+@property (strong, nonatomic) NSString* description;
+@end
+
+@implementation DescModel
+@end
+
 @implementation SpecialPropertyNameTests
 
 - (void)testSpecialPropertyName
@@ -20,8 +28,20 @@ - (void)testSpecialPropertyName
 
     NSError* err;
     SpecialPropertyModel *p = [[SpecialPropertyModel alloc] initWithString: jsonContents error:&err];
-    JMLog(@"%@", p);
+
     XCTAssertNotNil(p, @"Could not initialize model.");
     XCTAssertNil(err, "%@", [err localizedDescription]);
 }
+
+-(void)testDescriptionProperty
+{
+    NSString* json = @"{\"id\":10, \"description\":\"Marin\"}";
+    DescModel* dm = [[DescModel alloc] initWithString:json error:nil];
+
+    XCTAssertNotNil(dm, @"Could not initialize model.");
+    XCTAssertEqualObjects(dm.description, @"Marin", @"could not initialize description proeprty");
+    NSDictionary* dict = dm.toDictionary;
+    XCTAssertEqualObjects(dict[@"description"], @"Marin", @"could not export description proeprty");
+}
+
 @end
diff --git a/JSONModelDemo_iOS/MasterViewController.m b/JSONModelDemo_iOS/MasterViewController.m
@@ -101,22 +101,28 @@ @interface TopModel : JSONModel
 @property (assign, nonatomic, readonly) int rId;
 @property (nonatomic, copy) void(^userLocationCompleted)();
 @property (strong, nonatomic) NSDictionary* dict;
+@property (strong, nonatomic) NSString* description;
 @end
 
 @implementation TopModel
 +(BOOL)propertyIsIgnored:(NSString *)propertyName
 {
     return NO;
 }
+-(NSString*)getText
+{
+    return @"1123";
+}
 @end
 
 @implementation MasterViewController
 
 -(void)viewDidAppear:(BOOL)animated
 {
-    NSString* json = @"{\"id\":1, \"answer\": {\"name1\":\"marin\"}, \"dict\":[]}";
+    NSString* json = @"{\"id\":1, \"answer\": {\"name1\":\"marin\"}, \"dict\":[], \"description\":\"Marin\"}";
     TopModel* tm = [[TopModel alloc] initWithString:json error:nil];
-    NSLog(@"tm: %@", tm);
+    NSLog(@"tm: %@", tm.toDictionary);
+    NSLog(@"to string: %@", tm.toJSONString);
 }
 
 -(IBAction)actionLoadCall:(id)sender