SampleLiao
diff --git a/Collapse file
‎JSONModel/JSONModel/JSONModel.m‎
Copy file name to clipboardExpand all lines: JSONModel/JSONModel/JSONModel.m
+2-2Lines changed: 2 additions & 2 deletions b/Collapse file
‎JSONModel/JSONModel/JSONModel.m‎
Copy file name to clipboardExpand all lines: JSONModel/JSONModel/JSONModel.m
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/Collapse file
‎JSONModelDemoTests/UnitTests/KeyMappingTests.m‎
Copy file name to clipboardExpand all lines: JSONModelDemoTests/UnitTests/KeyMappingTests.m
+21Lines changed: 21 additions & 0 deletions b/Collapse file
‎JSONModelDemoTests/UnitTests/KeyMappingTests.m‎
Copy file name to clipboardExpand all lines: JSONModelDemoTests/UnitTests/KeyMappingTests.m
+21Lines changed: 21 additions & 0 deletions
diff --git a/Collapse file
‎JSONModelDemo_iOS/MasterViewController.m‎
Copy file name to clipboardExpand all lines: JSONModelDemo_iOS/MasterViewController.m
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file
‎JSONModelDemo_iOS/MasterViewController.m‎
Copy file name to clipboardExpand all lines: JSONModelDemo_iOS/MasterViewController.m
+1-1Lines changed: 1 addition & 1 deletion
@@ -178,7 +178,7 @@ -(id)initWithDictionary:(NSDictionary*)dict error:(NSError**)err
             transformedName = keyMapper.modelToJSONKeyBlock(property.name);
 
             //chek if exists and if so, add to incoming keys
-            if ([dict valueForKeyPath:transformedName]) {
+            if (dict[transformedName]) {
                 [transformedIncomingKeys addObject: property.name];
             }
         }
@@ -214,7 +214,7 @@ -(id)initWithDictionary:(NSDictionary*)dict error:(NSError**)err
         //JMLog(@"keyPath: %@", jsonKeyPath);
 
         //general check for data type compliance
-        id jsonValue = [dict valueForKeyPath: jsonKeyPath];
+        id jsonValue = dict[jsonKeyPath];
 
         //check for Optional properties
         if (isNull(jsonValue)) {
 
@@ -32,6 +32,20 @@ +(JSONKeyMapper*)keyMapper
 
 @end
 
+#pragma mark - at-name property
+@interface AtNameModel : JSONModel
+@property (assign) int type;
+@end
+
+@implementation AtNameModel
++(JSONKeyMapper*)keyMapper
+{
+    return [[JSONKeyMapper alloc] initWithDictionary:@{
+                                                       @"@type": @"type"
+                                                       }];
+}
+@end
+
 #pragma mark - global key mapper test model
 @interface GlobalModel: JSONModel
 @property (strong, nonatomic) NSString* name;
@@ -185,4 +199,11 @@ -(void)testGlobalKeyMapperImportAndExport
     STAssertNil(global3, @"model supposed to be nil");
 }
 
+//https://github.com/icanzilb/JSONModel/issues/132
+-(void)testAtNameProperty
+{
+    AtNameModel* at = [[AtNameModel alloc] initWithString:@"{\"@type\":157}" error:nil];
+    STAssertNotNil(at, @"model instance is nil");
+}
+
 @end
@@ -138,7 +138,7 @@ -(void)viewDidAppear:(BOOL)animated
         NSLog(@"%@ attr: %@", name, propertyAttributes);
     }
     
-    /*
+    
     NSString* json = @"{}";
     TopModel* mm = [[TopModel alloc] initWithString:json error:nil];
     NSLog(@"TopModel: %@", mm);
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ -(void)viewDidAppear:(BOOL)animated`
`138`	`138`	`NSLog(@"%@ attr: %@", name, propertyAttributes);`
`139`	`139`	`}`
`140`	`140`
`141`		`- /*`
	`141`	`+`
`142`	`142`	`NSString* json = @"{}";`
`143`	`143`	`TopModel* mm = [[TopModel alloc] initWithString:json error:nil];`
`144`	`144`	`NSLog(@"TopModel: %@", mm);`