refactoring 2

DXDAL/Code/Classes/DXDALDataProviderMultipartForm.m

@@ -9,7 +9,6 @@
 #import "DXDALDataProviderMultipartForm.h"
 
 #import "DXDALRequestMultipartForm.h"
-#import "DXDALResponseParserJSON.h"   
 #import "AFNetworking.h"
 #import "JSONKit.h"
 

DXDAL/Code/Classes/DXDALRequest.h

@@ -34,7 +34,8 @@ typedef void (^DXDALRequestErrorHandler)(NSError *error);
 
 - (void)resume;
 
-- (void)addParam:(NSString *)param withName:(NSString *)key;
+- (void)addParamString:(NSString *)param withName:(NSString *)key;
+- (void)addParamNumber:(NSNumber*)param withName:(NSString *)key;
 
 - (void)didFinishWithResponse:(id)response;
 - (void)didFailWithResponse:(id)response;

DXDAL/Code/Classes/DXDALRequest.m

@@ -37,13 +37,22 @@ - (id)initWithDataProvider:(id<DXDALDataProvider>)dataProvider {
     return self;
 }
 
-- (void)addParam:(NSString *)param withName:(NSString *)key {
+- (void)addParamString:(NSString *)param withName:(NSString *)key {
     assert(key != nil);
     assert(param != nil);
 
     [_params setObject:param forKey:key];
 }
 
+- (void)addParamNumber:(NSNumber*)param withName:(NSString *)key
+{
+    assert(key != nil);
+    assert(param != nil);
+
+    [_params setObject:param forKey:key];    
+}
+
+
 - (void)addSuccessHandler:(DXDALRequestSuccesHandler)handler {
     assert(handler != nil);
     [_successHandlers addObject:[handler copy]];

DXDAL/Code/Classes/HTTP/DXDALDataProviderHTTP.m

@@ -6,10 +6,11 @@
 
 
 #import "DXDALDataProviderHTTP.h"
-#import "DXDALRequestHTTP.h"
 #import "AFNetworking.h"
-#import "DXDALResponseParserJSON.h"   
 #import "JSONKit.h"
+#import "DXDALRequestHTTP.h"
+#import "DXDALParser.h"
+#import "DXDALMapper.h"
 
 
 @implementation DXDALDataProviderHTTP
@@ -49,10 +50,12 @@ - (AFHTTPRequestOperation*) operationFromRequest:(DXDALRequestHTTP*) httpRequest
     NSURLRequest *urlRequest = [self urlRequestFromRequest:httpRequest];
     NSLog(@"start request: %@", [urlRequest URL]);
 
-	AFHTTPRequestOperation *operation = [_httpClient HTTPRequestOperationWithRequest:urlRequest success:^(AFHTTPRequestOperation *operation, id responseObject) {
-        id result = [httpRequest.parser parseJSON:operation.responseString withEntityClass:httpRequest.entityClass];
-
+	AFHTTPRequestOperation *operation = [_httpClient HTTPRequestOperationWithRequest:urlRequest success:^(AFHTTPRequestOperation *operation, id responseObject)
+    {
+        id parsedObject = [httpRequest.parser parseString:operation.responseString];
+        id result = [httpRequest.mapper mapFromInputData:parsedObject withClass:httpRequest.entityClass];
         [httpRequest didFinishWithResponse:result];
+
     } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
 
         NSMutableDictionary *userInfo = [[error userInfo] mutableCopy];

DXDAL/Code/Classes/HTTP/DXDALMapperStandart.h

@@ -0,0 +1,15 @@
+//
+//  DXDALMapperStandart.h
+//  DXDAL
+//
+//  Created by Malaar on 25.03.12.
+//  Copyright (c) 2012 111Minutes. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "DXDALMapper.h"
+
+
+@interface DXDALMapperStandart : NSObject <DXDALMapper>
+
+@end

DXDAL/Code/Classes/HTTP/DXDALMapperStandart.m

@@ -0,0 +1,32 @@
+
+//
+//  DXDALMapperStandart.m
+//  DXDAL
+//
+//  Created by Malaar on 25.03.12.
+//  Copyright (c) 2012 111Minutes. All rights reserved.
+//
+
+#import "DXDALMapperStandart.h"
+#import "NSObject+JTObjectMapping.h"
+
+
+@implementation DXDALMapperStandart
+
+- (id) mapFromInputData:(id)inputData withClass:(Class)mappingClass
+{
+    id result = nil;
+    if ([inputData isKindOfClass:[NSArray class]]) {
+        result = [NSMutableArray new];
+        for (NSDictionary *dict in inputData) {
+            NSObject *obj = [mappingClass objectFromJSONObject:dict mapping:[mappingClass mapping]];
+            [result addObject:obj];
+        }
+    } else {
+        result = [mappingClass objectFromJSONObject:inputData mapping:[mappingClass mapping]];
+    }
+
+    return result;
+}
+
+@end

DXDAL/Code/Classes/HTTP/DXDALResponseParserJSON.h → DXDAL/Code/Classes/HTTP/DXDALParserJSON.h

@@ -7,11 +7,11 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "DXDALResponseParser.h"
+#import "DXDALParser.h"
 
 @class DXDALRequestHTTP;
 
-@interface DXDALResponseParserJSON : NSObject <DXDALResponseParser>
+@interface DXDALParserJSON : NSObject <DXDALParser>
 
 
 @end

DXDAL/Code/Classes/HTTP/DXDALParserJSON.m

@@ -0,0 +1,21 @@
+//
+//  DXDALResponseParserJSON.m
+//  DXDAL
+//
+//  Created by Sergey Zenchenko on 3/9/12.
+//  Copyright (c) 2012 111Minutes. All rights reserved.
+//
+
+#import "DXDALParserJSON.h"
+#import "JSONKit.h"
+//#import "DXDALRequestHTTP.h"
+
+@implementation DXDALParserJSON
+
+- (id) parseString:(NSString *)aString
+{
+    return [aString objectFromJSONString];
+}
+
+
+@end

DXDAL/Code/Classes/HTTP/DXDALRequestHTTP.h

@@ -8,7 +8,8 @@
 #import <Foundation/Foundation.h>
 #import "DXDALRequest.h"
 
-@protocol DXDALResponseParser;
+@protocol DXDALParser;
+@protocol DXDALMapper;
 
 
 @interface DXDALRequestHTTP : DXDALRequest
@@ -19,7 +20,7 @@
 @property(nonatomic, readwrite, strong) NSDictionary *defaultHTTPHeaders;
 
 @property (nonatomic, assign) Class entityClass;
-@property (nonatomic, strong) NSDictionary *mapping;
-@property (nonatomic, strong) id<DXDALResponseParser> parser;
+@property (nonatomic, strong) id<DXDALParser> parser;
+@property (nonatomic, strong) id<DXDALMapper> mapper;
 
 @end

DXDAL/Code/Classes/HTTP/DXDALRequestHTTP.m

@@ -5,15 +5,16 @@
 //
 
 #import "DXDALRequestHTTP.h"
-#import "DXDALResponseParser.h"
+
 
 @implementation DXDALRequestHTTP
 
 @synthesize httpMethod = _httpMethod;
 @synthesize httpPath = _httpPath;
 @synthesize defaultHTTPHeaders = _defaultHTTPHeaders;
-@synthesize entityClass, mapping;
+@synthesize entityClass;
 @synthesize parser;
+@synthesize mapper;
 
 - (NSString*)httpMethod {
     return [_httpMethod uppercaseString];