* cleaned up JSONModelArray code

icanzilb · icanzilb · commit c4ffee63b64a · 2014-03-04T09:36:53.000+01:00
* optimized it for mutable and non-mutable arrays
* fixed issues with the core data demo
diff --git a/JSONModel/JSONModel/JSONModel+CoreData.m b/JSONModel/JSONModel/JSONModel+CoreData.m
@@ -92,7 +92,7 @@ -(BOOL)updateWithDictionary:(NSDictionary*)dictionary error:(NSError**)error
     //copy values over
     for (NSString* key in [moProperties allKeys]) {
         id value = dictionary[key];
-        NSLog(@"class: %@", moProperties[key]);
+
         //exception classes - for core data should be NSDate by default
         if ([[moProperties[key]class] isEqual:[NSDate class]]) {
             SEL NSDateFromNSStringSelector = sel_registerName("NSDateFromNSString:");
diff --git a/JSONModel/JSONModel/JSONModelArray.h b/JSONModel/JSONModel/JSONModelArray.h
@@ -27,7 +27,7 @@
  * of each of the objects stored in the array, it'll be converted to the target model class.
  * Thus saving time upon the very first model creation.
  */
-@interface JSONModelArray : NSMutableArray
+@interface JSONModelArray : NSObject
 
 /**
  * Don't make instances of JSONModelArray yourself, except you know what you are doing.
diff --git a/JSONModel/JSONModel/JSONModelArray.m b/JSONModel/JSONModel/JSONModelArray.m
@@ -34,6 +34,16 @@ - (id)initWithArray:(NSArray *)array modelClass:(Class)cls
     return self;
 }
 
+-(id)firstObject
+{
+    return [self objectAtIndex:0];
+}
+
+-(id)lastObject
+{
+    return [self objectAtIndex: _storage.count-1];
+}
+
 -(id)objectAtIndex:(NSUInteger)index
 {
     id obj = _storage[index];
@@ -52,6 +62,16 @@ - (void)forwardInvocation:(NSInvocation *)anInvocation
     [anInvocation invokeWithTarget:_storage];
 }
 
+-(id)forwardingTargetForSelector:(SEL)selector
+{
+    static NSArray* overridenMethods = nil;
+    if (!overridenMethods) overridenMethods = @[@"initWithArray:modelClass:",@"objectAtIndex:",@"count",@"modelWithIndexValue:",@"description",@"mutableCopy",@"firstObject",@"lastObject"];
+    if ([overridenMethods containsObject:NSStringFromSelector(selector)]) {
+        return self;
+    }
+    return _storage;
+}
+
 - (NSUInteger)count
 {
     return _storage.count;
@@ -60,9 +80,9 @@ - (NSUInteger)count
 -(id)modelWithIndexValue:(id)indexValue
 {
     if (self.count==0) return nil;
-    if (![self[0] indexPropertyName]) return nil;
+    if (![_storage[0] indexPropertyName]) return nil;
     
-    for (JSONModel* model in self) {
+    for (JSONModel* model in _storage) {
         if ([[model valueForKey:model.indexPropertyName] isEqual:indexValue]) {
             return model;
         }
@@ -81,7 +101,7 @@ -(id)mutableCopy
 -(NSString*)description
 {
     NSMutableString* res = [NSMutableString stringWithFormat:@"<JSONModelArray[%@]>\n", [_targetClass description]];
-    for (id m in self) {
+    for (id m in _storage) {
         [res appendString: [m description]];
         [res appendString: @",\n"];
     }
diff --git a/JSONModel/JSONModelTransformations/JSONValueTransformer.h b/JSONModel/JSONModelTransformations/JSONValueTransformer.h
@@ -15,6 +15,7 @@
 // The MIT License in plain English: http://www.touch-code-magazine.com/JSONModel/MITLicense
 
 #import <Foundation/Foundation.h>
+#import "JSONModelArray.h"
 
 /////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -72,6 +73,15 @@ extern BOOL isNull(id value);
  */
 -(NSMutableArray*)NSMutableArrayFromNSArray:(NSArray*)array;
 
+#pragma mark - NS(Mutable)Array <- JSONModelArray
+/**
+ * Trasnforms an array to a JSONModelArray
+ * @param array incoming array
+ * @return JSONModelArray
+ */
+-(NSArray*)NSArrayFromJSONModelArray:(JSONModelArray*)array;
+-(NSMutableArray*)NSMutableArrayFromJSONModelArray:(JSONModelArray*)array;
+
 #pragma mark - NSMutableDictionary <-> NSDictionary
 /**
  * Trasnforms a dictionary to a mutable dictionary
diff --git a/JSONModel/JSONModelTransformations/JSONValueTransformer.m b/JSONModel/JSONModelTransformations/JSONValueTransformer.m
@@ -88,6 +88,18 @@ -(NSMutableArray*)NSMutableArrayFromNSArray:(NSArray*)array
     return [NSMutableArray arrayWithArray:array];
 }
 
+#pragma mark - NS(Mutable)Array <- JSONModelArray
+-(NSArray*)NSArrayFromJSONModelArray:(JSONModelArray*)array
+{
+    return (NSMutableArray*)array;
+}
+
+-(NSMutableArray*)NSMutableArrayFromJSONModelArray:(JSONModelArray*)array
+{
+    return (NSMutableArray*)array;
+}
+
+
 #pragma mark - NSMutableDictionary <-> NSDictionary
 -(NSMutableDictionary*)NSMutableDictionaryFromNSDictionary:(NSDictionary*)dict
 {
