将框架内部的一些对象方法改用类方法实现

CoderMJLee · CoderMJLee · commit fe717038db81 · 2015-01-28T11:36:04.000+08:00
diff --git a/MJExtensionExample/MJExtensionExample.xcodeproj/project.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstate b/MJExtensionExample/MJExtensionExample.xcodeproj/project.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/MJExtensionExample/MJExtensionExample/Classes/StatusResult.m b/MJExtensionExample/MJExtensionExample/Classes/StatusResult.m
@@ -13,7 +13,7 @@
 
 @implementation StatusResult
 // 实现这个方法的目的：告诉MJExtension框架statuses和ads数组里面装的是什么模型
-- (NSDictionary *)objectClassInArray
++ (NSDictionary *)objectClassInArray
 {
     return @{
          @"statuses" : [Status class],
diff --git a/MJExtensionExample/MJExtensionExample/Classes/Student.m b/MJExtensionExample/MJExtensionExample/Classes/Student.m
@@ -11,7 +11,7 @@
 
 @implementation Student
 // 实现这个方法的目的：告诉MJExtension框架模型中的属性名对应着字典的哪个key
-- (NSDictionary *)replacedKeyFromPropertyName
++ (NSDictionary *)replacedKeyFromPropertyName
 {
     return @{@"ID" : @"id",
              @"desc" : @"desciption",
diff --git a/MJExtensionExample/MJExtensionExample/MJExtension/MJIvar.m b/MJExtensionExample/MJExtensionExample/MJExtension/MJIvar.m
@@ -49,7 +49,7 @@ - (void)setIvar:(Ivar)ivar
     MJAssertParamNotNil(ivar);
     
     // 1.成员变量名
-    _name = [NSString stringWithUTF8String:ivar_getName(ivar)];
+    _name = @(ivar_getName(ivar));
     
     // 2.属性名
     if ([_name hasPrefix:@"_"]) {
@@ -59,7 +59,7 @@ - (void)setIvar:(Ivar)ivar
     }
     
     // 3.成员变量的类型符
-    NSString *code = [NSString stringWithUTF8String:ivar_getTypeEncoding(ivar)];
+    NSString *code = @(ivar_getTypeEncoding(ivar));
     _type = [MJType cachedTypeWithCode:code];
 }
 
diff --git a/MJExtensionExample/MJExtensionExample/MJExtension/NSObject+MJCoding.m b/MJExtensionExample/MJExtensionExample/MJExtension/NSObject+MJCoding.m
@@ -14,14 +14,14 @@ @implementation NSObject (MJCoding)
 
 - (void)encode:(NSCoder *)encoder
 {
-    [self enumerateIvarsWithBlock:^(MJIvar *ivar, BOOL *stop) {
+    [[self class] enumerateIvarsWithBlock:^(MJIvar *ivar, BOOL *stop) {
         [encoder encodeObject:[ivar valueFromObject:self] forKey:ivar.name];
     }];
 }
 
 - (void)decode:(NSCoder *)decoder
 {
-    [self enumerateIvarsWithBlock:^(MJIvar *ivar, BOOL *stop) {
+    [[self class] enumerateIvarsWithBlock:^(MJIvar *ivar, BOOL *stop) {
         id value = [decoder decodeObjectForKey:ivar.name];
         [ivar setValue:value forObject:self];
     }];
diff --git a/MJExtensionExample/MJExtensionExample/MJExtension/NSObject+MJIvar.h b/MJExtensionExample/MJExtensionExample/MJExtension/NSObject+MJIvar.h
@@ -27,12 +27,15 @@ typedef void (^MJIvarsBlock)(MJIvar *ivar, BOOL *stop);
 /**
  *  遍历所有的成员变量
  */
-- (void)enumerateIvarsWithBlock:(MJIvarsBlock)block;
 + (void)enumerateIvarsWithBlock:(MJIvarsBlock)block;
 
 /**
  *  遍历所有的类
  */
-- (void)enumerateClassesWithBlock:(MJClassesBlock)block;
 + (void)enumerateClassesWithBlock:(MJClassesBlock)block;
+
+/**
+ *  返回一个临时对象
+ */
++ (instancetype)tempObject;
 @end
diff --git a/MJExtensionExample/MJExtensionExample/MJExtension/NSObject+MJIvar.m b/MJExtensionExample/MJExtensionExample/MJExtension/NSObject+MJIvar.m
@@ -13,10 +13,64 @@
 
 @implementation NSObject (MJMember)
 
-static const char MJCachedIvarsKey;
-- (NSArray *)cachedIvars
+#pragma mark - --私有方法--
++ (NSString *)ivarKey:(NSString *)propertyName
 {
-    NSMutableArray *cachedIvars = objc_getAssociatedObject([self class], &MJCachedIvarsKey);
+    MJAssertParamNotNil2(propertyName, nil);
+    
+    NSString *key = nil;
+    // 1.查看有没有需要替换的key
+    if ([self respondsToSelector:@selector(replacedKeyFromPropertyName:)]) {
+        key = [self replacedKeyFromPropertyName:propertyName];
+    } else if ([self respondsToSelector:@selector(replacedKeyFromPropertyName)]) {
+        key = self.replacedKeyFromPropertyName[propertyName];
+    } else {
+        // 为了兼容以前的对象方法
+        id tempObject = self.tempObject;
+        if ([tempObject respondsToSelector:@selector(replacedKeyFromPropertyName)]) {
+            key = [tempObject replacedKeyFromPropertyName][propertyName];
+        }
+    }
+    
+    // 2.用属性名作为key
+    if (!key) key = propertyName;
+    
+    return key;
+}
+
++ (Class)ivarObjectClassInArray:(NSString *)propertyName
+{
+    if ([self respondsToSelector:@selector(objectClassInArray)]) {
+        return self.objectClassInArray[propertyName];
+    } else {
+        // 为了兼容以前的对象方法
+        id tempObject = self.tempObject;
+        if ([tempObject respondsToSelector:@selector(objectClassInArray)]) {
+            id dict = [tempObject objectClassInArray];
+            return dict[propertyName];
+        }
+        return nil;
+    }
+    return nil;
+}
+
+#pragma mark - --公共方法--
++ (instancetype)tempObject
+{
+    static const char MJTempObjectKey;
+    id tempObject = objc_getAssociatedObject(self, &MJTempObjectKey);
+    if (tempObject == nil) {
+        tempObject = [[self alloc] init];
+        objc_setAssociatedObject(self, &MJTempObjectKey, tempObject, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+    }
+    return tempObject;
+}
+
++ (void)enumerateIvarsWithBlock:(MJIvarsBlock)block
+{
+    static const char MJCachedIvarsKey;
+    // 获得成员变量
+    NSMutableArray *cachedIvars = objc_getAssociatedObject(self, &MJCachedIvarsKey);
     if (cachedIvars == nil) {
         cachedIvars = [NSMutableArray array];
         
@@ -28,45 +82,29 @@ - (NSArray *)cachedIvars
             // 2.遍历每一个成员变量
             for (unsigned int i = 0; i<outCount; i++) {
                 MJIvar *ivar = [MJIvar cachedIvarWithIvar:ivars[i]];
-                ivar.key = [self keyWithPropertyName:ivar.propertyName];
+                ivar.key = [self ivarKey:ivar.propertyName];
                 // 如果有多级映射
                 ivar.keys = [ivar.key componentsSeparatedByString:@"."];
                 // 数组中的模型类
-                if ([self respondsToSelector:@selector(objectClassInArray)]) {
-                    ivar.objectClassInArray = self.objectClassInArray[ivar.propertyName];
-                }
+                ivar.objectClassInArray = [self ivarObjectClassInArray:ivar.propertyName];
                 ivar.srcClass = c;
                 [cachedIvars addObject:ivar];
             }
             
             // 3.释放内存
             free(ivars);
         }];
-        objc_setAssociatedObject([self class], &MJCachedIvarsKey, cachedIvars, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+        objc_setAssociatedObject(self, &MJCachedIvarsKey, cachedIvars, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
     }
-    return cachedIvars;
-}
-
-- (void)enumerateIvarsWithBlock:(MJIvarsBlock)block
-{
-    NSArray *ivars = [self cachedIvars];
+    
+    // 遍历成员变量
     BOOL stop = NO;
-    for (MJIvar *ivar in ivars) {
+    for (MJIvar *ivar in cachedIvars) {
         block(ivar, &stop);
         if (stop) break;
     }
 }
 
-+ (void)enumerateIvarsWithBlock:(MJIvarsBlock)block
-{
-    
-}
-
-- (void)enumerateClassesWithBlock:(MJClassesBlock)block
-{
-    [[self class] enumerateClassesWithBlock:block];
-}
-
 + (void)enumerateClassesWithBlock:(MJClassesBlock)block
 {
     // 1.没有block就直接返回
diff --git a/MJExtensionExample/MJExtensionExample/MJExtension/NSObject+MJKeyValue.h b/MJExtensionExample/MJExtensionExample/MJExtension/NSObject+MJKeyValue.h
@@ -19,14 +19,25 @@
  *
  *  @return 字典中的key是属性名，value是从字典中取值用的key
  */
-- (NSDictionary *)replacedKeyFromPropertyName;
++ (NSDictionary *)replacedKeyFromPropertyName;
+- (NSDictionary *)replacedKeyFromPropertyName MJDeprecated("请使用+ (NSDictionary *)replacedKeyFromPropertyName方法");
+
+/**
+ *  将属性名换为其他key去字典中取值
+ *  @param propertyName 属性名
+ *
+ *  @return 字典中的key
+ */
++ (NSString *)replacedKeyFromPropertyName:(NSString *)propertyName;
+// 方法优先级：replacedKeyFromPropertyName: > replacedKeyFromPropertyName
 
 /**
  *  数组中需要转换的模型类
  *
  *  @return 字典中的key是数组属性名，value是数组中存放模型的Class
  */
-- (NSDictionary *)objectClassInArray;
++ (NSDictionary *)objectClassInArray;
+- (NSDictionary *)objectClassInArray MJDeprecated("请使用+ (NSDictionary *)objectClassInArray方法");
 
 /**
  *  当字典转模型完毕时调用
@@ -116,14 +127,4 @@
  *  @return 模型数组
  */
 + (NSArray *)objectArrayWithFile:(NSString *)file;
-
-#pragma mark - 其他方法
-/**
- *  根据属性名获得对应的key
- *
- *  @param propertyName 属性名
- *
- *  @return 字典的key
- */
-- (NSString *)keyWithPropertyName:(NSString *)propertyName;
 @end
diff --git a/MJExtensionExample/MJExtensionExample/MJExtension/NSObject+MJKeyValue.m b/MJExtensionExample/MJExtensionExample/MJExtension/NSObject+MJKeyValue.m
@@ -23,7 +23,6 @@ + (void)load
 }
 
 #pragma mark - --公共方法--
-#pragma mark - 字典转模型
 + (instancetype)objectWithJSONData:(NSData *)data
 {
     MJAssertParamNotNil2(data, nil);
@@ -57,7 +56,7 @@ - (instancetype)setKeyValues:(NSDictionary *)keyValues
 {
     MJAssert2([keyValues isKindOfClass:[NSDictionary class]], self);
     
-    [self enumerateIvarsWithBlock:^(MJIvar *ivar, BOOL *stop) {
+    [[self class] enumerateIvarsWithBlock:^(MJIvar *ivar, BOOL *stop) {
         // 1.取出属性值
         id value = keyValues ;
         for (NSString *key in ivar.keys) {
@@ -103,14 +102,52 @@ - (instancetype)setKeyValues:(NSDictionary *)keyValues
     return self;
 }
 
++ (NSArray *)objectArrayWithJSONData:(NSData *)data
+{
+    MJAssertParamNotNil2(data, nil);
+    
+    return [self objectArrayWithKeyValuesArray:[NSJSONSerialization JSONObjectWithData:data options:kNilOptions error:nil]];
+}
+
++ (NSArray *)objectArrayWithKeyValuesArray:(NSArray *)keyValuesArray
+{
+    // 1.判断真实性
+    MJAssert2([keyValuesArray isKindOfClass:[NSArray class]], nil);
+    
+    // 2.创建数组
+    NSMutableArray *modelArray = [NSMutableArray array];
+    
+    // 3.遍历
+    for (NSDictionary *keyValues in keyValuesArray) {
+        id model = [self objectWithKeyValues:keyValues];
+        if (model) [modelArray addObject:model];
+    }
+    
+    return modelArray;
+}
+
++ (NSArray *)objectArrayWithFilename:(NSString *)filename
+{
+    MJAssertParamNotNil2(filename, nil);
+    
+    return [self objectArrayWithFile:[[NSBundle mainBundle] pathForResource:filename ofType:nil]];
+}
+
++ (NSArray *)objectArrayWithFile:(NSString *)file
+{
+    MJAssertParamNotNil2(file, nil);
+    
+    return [self objectArrayWithKeyValuesArray:[NSArray arrayWithContentsOfFile:file]];
+}
+
 - (NSDictionary *)keyValues
 {
     // 如果自己不是模型类
     if ([MJFoundation isClassFromFoundation:[self class]]) return (NSDictionary *)self;
     
-   __block NSMutableDictionary *keyValues = [NSMutableDictionary dictionary];
+    __block NSMutableDictionary *keyValues = [NSMutableDictionary dictionary];
     
-    [self enumerateIvarsWithBlock:^(MJIvar *ivar, BOOL *stop) {
+    [[self class] enumerateIvarsWithBlock:^(MJIvar *ivar, BOOL *stop) {
         // 1.取出属性值
         id value = [ivar valueFromObject:self];
         if (!value) return;
@@ -142,7 +179,7 @@ - (NSDictionary *)keyValues
                 }
                 innerDict = tempDict;
             }
-         }];
+        }];
     }];
     
     // 转换完毕
@@ -153,13 +190,6 @@ - (NSDictionary *)keyValues
     return keyValues;
 }
 
-+ (NSArray *)objectArrayWithJSONData:(NSData *)data
-{
-    MJAssertParamNotNil2(data, nil);
-    
-    return [self objectArrayWithKeyValuesArray:[NSJSONSerialization JSONObjectWithData:data options:kNilOptions error:nil]];
-}
-
 + (NSArray *)keyValuesArrayWithObjectArray:(NSArray *)objectArray
 {
     // 0.判断真实性
@@ -172,53 +202,4 @@ + (NSArray *)keyValuesArrayWithObjectArray:(NSArray *)objectArray
     }
     return keyValuesArray;
 }
-
-#pragma mark - 字典数组转模型数组
-+ (NSArray *)objectArrayWithKeyValuesArray:(NSArray *)keyValuesArray
-{
-    // 1.判断真实性
-    MJAssert2([keyValuesArray isKindOfClass:[NSArray class]], nil);
-    
-    // 2.创建数组
-    NSMutableArray *modelArray = [NSMutableArray array];
-    
-    // 3.遍历
-    for (NSDictionary *keyValues in keyValuesArray) {
-        id model = [self objectWithKeyValues:keyValues];
-        if (model) [modelArray addObject:model];
-    }
-    
-    return modelArray;
-}
-
-+ (NSArray *)objectArrayWithFilename:(NSString *)filename
-{
-    MJAssertParamNotNil2(filename, nil);
-    
-    return [self objectArrayWithFile:[[NSBundle mainBundle] pathForResource:filename ofType:nil]];
-}
-
-+ (NSArray *)objectArrayWithFile:(NSString *)file
-{
-    MJAssertParamNotNil2(file, nil);
-    
-    return [self objectArrayWithKeyValuesArray:[NSArray arrayWithContentsOfFile:file]];
-}
-
-#pragma mark - --私有方法--
-- (NSString *)keyWithPropertyName:(NSString *)propertyName
-{
-    MJAssertParamNotNil2(propertyName, nil);
-    
-    NSString *key = nil;
-    // 1.查看有没有需要替换的key
-    if ([self respondsToSelector:@selector(replacedKeyFromPropertyName)]) {
-        key = self.replacedKeyFromPropertyName[propertyName];
-    }
-    
-    // 2.用属性名作为key
-    if (!key) key = propertyName;
-    
-    return key;
-}
 @end

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`@implementation StatusResult`
`15`	`15`	`// 实现这个方法的目的：告诉MJExtension框架statuses和ads数组里面装的是什么模型`
`16`		`-- (NSDictionary *)objectClassInArray`
	`16`	`++ (NSDictionary *)objectClassInArray`
`17`	`17`	`{`
`18`	`18`	`return @{`
`19`	`19`	`@"statuses" : [Status class],`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`@implementation Student`
`13`	`13`	`// 实现这个方法的目的：告诉MJExtension框架模型中的属性名对应着字典的哪个key`
`14`		`-- (NSDictionary *)replacedKeyFromPropertyName`
	`14`	`++ (NSDictionary *)replacedKeyFromPropertyName`
`15`	`15`	`{`
`16`	`16`	`return @{@"ID" : @"id",`
`17`	`17`	`@"desc" : @"desciption",`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ - (void)setIvar:(Ivar)ivar`
`49`	`49`	`MJAssertParamNotNil(ivar);`
`50`	`50`
`51`	`51`	`// 1.成员变量名`
`52`		`- _name = [NSString stringWithUTF8String:ivar_getName(ivar)];`
	`52`	`+ _name = @(ivar_getName(ivar));`
`53`	`53`
`54`	`54`	`// 2.属性名`
`55`	`55`	`if ([_name hasPrefix:@"_"]) {`
`@@ -59,7 +59,7 @@ - (void)setIvar:(Ivar)ivar`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`// 3.成员变量的类型符`
`62`		`- NSString *code = [NSString stringWithUTF8String:ivar_getTypeEncoding(ivar)];`
	`62`	`+ NSString *code = @(ivar_getTypeEncoding(ivar));`
`63`	`63`	`_type = [MJType cachedTypeWithCode:code];`
`64`	`64`	`}`
`65`	`65`
Original file line number	Diff line number	Diff line change
`@@ -14,14 +14,14 @@ @implementation NSObject (MJCoding)`
`14`	`14`
`15`	`15`	`- (void)encode:(NSCoder *)encoder`
`16`	`16`	`{`
`17`		`- [self enumerateIvarsWithBlock:^(MJIvar ivar, BOOL stop) {`
	`17`	`+ [[self class] enumerateIvarsWithBlock:^(MJIvar ivar, BOOL stop) {`
`18`	`18`	`[encoder encodeObject:[ivar valueFromObject:self] forKey:ivar.name];`
`19`	`19`	`}];`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`- (void)decode:(NSCoder *)decoder`
`23`	`23`	`{`
`24`		`- [self enumerateIvarsWithBlock:^(MJIvar ivar, BOOL stop) {`
	`24`	`+ [[self class] enumerateIvarsWithBlock:^(MJIvar ivar, BOOL stop) {`
`25`	`25`	`id value = [decoder decodeObjectForKey:ivar.name];`
`26`	`26`	`[ivar setValue:value forObject:self];`
`27`	`27`	`}];`