* handle PHP bug for empty objects

* jsonmodel#163
WFNeIn · Apr 18, 2014 · ec19f80 · ec19f80
1 parent 2673637
commit ec19f80
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 2 deletions.
diff --git a/JSONModel/JSONModelTransformations/JSONValueTransformer.m b/JSONModel/JSONModelTransformations/JSONValueTransformer.m
@@ -222,4 +222,18 @@ -(NSString*)__JSONObjectFromNSDate:(NSDate*)date
     return [dateFormatter stringFromDate:date];
 }
 
+#pragma mark - hidden transform for empty dictionaries
+//https://github.com/icanzilb/JSONModel/issues/163
+-(NSDictionary*)__NSDictionaryFromNSArray:(NSArray*)array
+{
+    if (array.count==0) return @{};
+    return (id)array;
+}
+
+-(NSMutableDictionary*)__NSMutableDictionaryFromNSArray:(NSArray*)array
+{
+    if (array.count==0) return [[self __NSDictionaryFromNSArray:array] mutableCopy];
+    return (id)array;
+}
+
 @end
diff --git a/JSONModelDemoTests/UnitTests/SpecialPropertiesTests.m b/JSONModelDemoTests/UnitTests/SpecialPropertiesTests.m
@@ -28,6 +28,15 @@ @interface RModel: JSONModel
 @implementation RModel
 @end
 
+#pragma mark - empty array/dictionary
+@interface DModel: JSONModel
+@property (strong, nonatomic) NSDictionary* dict;
+@property (strong, nonatomic) NSMutableDictionary* mdict;
+@end
+
+@implementation DModel
+@end
+
 #pragma mark - test suite
 
 @interface SpecialPropertiesTests : XCTestCase
@@ -64,5 +73,15 @@ - (void)testReadOnly
     XCTAssertNotNil(rm, @"model failed to crate");
 }
 
+//test auto-converting array to dict
+-(void)testEmtpyDictionary
+{
+    NSString* json = @"{\"dict\":[],\"mdict\":[]}";
+    DModel* dm = [[DModel alloc] initWithString:json error:nil];
+    XCTAssertNotNil(dm, @"model failed to crate");
+    XCTAssertTrue([dm.dict isKindOfClass:[NSDictionary class]], @"property did not convert to dictionary");
+    XCTAssertTrue([dm.mdict isKindOfClass:[NSMutableDictionary class]], @"property did not convert to mutable dictionary");
+}
+
 @end
 
diff --git a/JSONModelDemo_iOS/MBProgressHUD.m b/JSONModelDemo_iOS/MBProgressHUD.m
@@ -500,7 +500,7 @@ - (void)layoutSubviews {
 	totalSize.width = MAX(totalSize.width, indicatorF.size.width);
 	totalSize.height += indicatorF.size.height;
 
-	CGSize labelSize = [label.text sizeWithFont:label.font];
+	CGSize labelSize = [label.text sizeWithAttributes:@{NSFontAttributeName:label.font}];
 	labelSize.width = MIN(labelSize.width, maxWidth);
 	totalSize.width = MAX(totalSize.width, labelSize.width);
 	totalSize.height += labelSize.height;

diff --git a/JSONModelDemo_iOS/MasterViewController.m b/JSONModelDemo_iOS/MasterViewController.m
@@ -100,6 +100,7 @@ @interface TopModel : JSONModel
 @property (strong, nonatomic) JSONAnswer<Optional>* answer;
 @property (assign, nonatomic, readonly) int rId;
 @property (nonatomic, copy) void(^userLocationCompleted)();
+@property (strong, nonatomic) NSDictionary* dict;
 @end
 
 @implementation TopModel
@@ -113,7 +114,7 @@ @implementation MasterViewController
 
 -(void)viewDidAppear:(BOOL)animated
 {
-    NSString* json = @"{\"id\":1, \"answer\": {\"name1\":\"marin\"}}";
+    NSString* json = @"{\"id\":1, \"answer\": {\"name1\":\"marin\"}, \"dict\":[]}";
     TopModel* tm = [[TopModel alloc] initWithString:json error:nil];
     NSLog(@"tm: %@", tm);
 }