From 71f94bed5ad0482fb96401838c419a53169e676f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=E4=BA=86=E4=B8=AAJ?= <richermj123go@vip.qq.com>
Date: Fri, 22 Jul 2016 18:43:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BA=9B=E5=B0=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.某些属性的懒加载转为init初始化
2.过期方法处理
3.用更简单的方法过滤NSObject自动生成的属性
---
 MJExtension.podspec                |  2 +-
 MJExtension/MJProperty.m           | 15 ++++-----------
 MJExtension/NSObject+MJProperty.m  |  9 ++-------
 MJExtension/NSString+MJExtension.m |  4 +++-
 MJExtensionExample/main.m          |  2 +-
 5 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/MJExtension.podspec b/MJExtension.podspec
index d7b49627..de57767a 100644
--- a/MJExtension.podspec
+++ b/MJExtension.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MJExtension"
-  s.version      = "3.0.12"
+  s.version      = "3.0.13"
   s.ios.deployment_target = '6.0'
   s.osx.deployment_target = '10.8'
   s.summary      = "A fast and convenient conversion between JSON and model"
diff --git a/MJExtension/MJProperty.m b/MJExtension/MJProperty.m
index 2489d9a5..96710faf 100644
--- a/MJExtension/MJProperty.m
+++ b/MJExtension/MJProperty.m
@@ -18,21 +18,14 @@ @interface MJProperty()
 
 @implementation MJProperty
 
-#pragma mark - 懒加载
-- (NSMutableDictionary *)propertyKeysDict
+#pragma mark - 初始化
+- (instancetype)init
 {
-    if (!_propertyKeysDict) {
+    if (self = [super init]) {
         _propertyKeysDict = [NSMutableDictionary dictionary];
-    }
-    return _propertyKeysDict;
-}
-
-- (NSMutableDictionary *)objectClassInArrayDict
-{
-    if (!_objectClassInArrayDict) {
         _objectClassInArrayDict = [NSMutableDictionary dictionary];
     }
-    return _objectClassInArrayDict;
+    return self;
 }
 
 #pragma mark - 缓存
diff --git a/MJExtension/NSObject+MJProperty.m b/MJExtension/NSObject+MJProperty.m
index 2314c460..c9aff546 100644
--- a/MJExtension/NSObject+MJProperty.m
+++ b/MJExtension/NSObject+MJProperty.m
@@ -163,13 +163,8 @@ + (NSMutableArray *)properties
             // 2.遍历每一个成员变量
             for (unsigned int i = 0; i<outCount; i++) {
                 MJProperty *property = [MJProperty cachedPropertyWithProperty:properties[i]];
-                // 过滤掉系统自动添加的元素
-                if ([property.name isEqualToString:@"hash"]
-                    || [property.name isEqualToString:@"superclass"]
-                    || [property.name isEqualToString:@"description"]
-                    || [property.name isEqualToString:@"debugDescription"]) {
-                    continue;
-                }
+                // 过滤掉Foundation框架类里面的属性
+                if ([MJFoundation isClassFromFoundation:property.srcClass]) continue;
                 property.srcClass = c;
                 [property setOriginKey:[self propertyKey:property.name] forClass:self];
                 [property setObjectClassInArray:[self propertyObjectClassInArray:property.name] forClass:self];
diff --git a/MJExtension/NSString+MJExtension.m b/MJExtension/NSString+MJExtension.m
index 050a0611..569c3108 100644
--- a/MJExtension/NSString+MJExtension.m
+++ b/MJExtension/NSString+MJExtension.m
@@ -72,8 +72,10 @@ - (BOOL)mj_isPureInt
 - (NSURL *)mj_url
 {
 //    [self stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet characterSetWithCharactersInString:@"!$&'()*+,-./:;=?@_~%#[]"]];
-    
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored"-Wdeprecated-declarations"
     return [NSURL URLWithString:(NSString *)CFBridgingRelease(CFURLCreateStringByAddingPercentEscapes(kCFAllocatorDefault, (CFStringRef)self, (CFStringRef)@"!$&'()*+,-./:;=?@_~%#[]", NULL,kCFStringEncodingUTF8))];
+#pragma clang diagnostic pop
 }
 @end
 
diff --git a/MJExtensionExample/main.m b/MJExtensionExample/main.m
index 6bb4bea7..78852d72 100644
--- a/MJExtensionExample/main.m
+++ b/MJExtensionExample/main.m
@@ -352,7 +352,7 @@ void coreData()
     // 利用CoreData保存模型
     [context save:nil];
     
-    MJExtensionLog(@"name=%@, icon=%@, age=%zd, height=%f, money=%@, sex=%d, gay=%d", user.name, user.icon, user.age, user.height, user.money, user.sex, user.gay);
+    MJExtensionLog(@"name=%@, icon=%@, age=%zd, height=%@, money=%@, sex=%d, gay=%d", user.name, user.icon, user.age, user.height, user.money, user.sex, user.gay);
 }
 
 /**