resolves jsonmodel#95

billinghamj · billinghamj · commit 62eb602de0c5 · 2013-09-26T11:43:19.000-07:00
diff --git a/JSONModel/JSONModelNetworking/JSONHTTPClient.h b/JSONModel/JSONModelNetworking/JSONHTTPClient.h
@@ -39,7 +39,7 @@ extern NSString* const kContentTypeWWWEncoded;
  * @param json object derived from a JSON string
  * @param err JSONModelError or nil
  */
-typedef void (^JSONObjectBlock)(NSDictionary* json, JSONModelError* err);
+typedef void (^JSONObjectBlock)(id json, JSONModelError* err);
 
 /////////////////////////////////////////////////////////////////////////////////////////////
 #pragma mark - configuration methods
diff --git a/JSONModel/JSONModelNetworking/JSONHTTPClient.m b/JSONModel/JSONModelNetworking/JSONHTTPClient.m
@@ -266,7 +266,7 @@ +(void)JSONFromURLWithString:(NSString*)urlString method:(NSString*)method param
 
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         
-        NSDictionary* jsonObject = nil;
+        id jsonObject = nil;
         JSONModelError* error = nil;
         NSData* responseData = nil;
         NSString* etag = nil;
@@ -324,7 +324,7 @@ +(void)getJSONFromURLWithString:(NSString*)urlString completion:(JSONObjectBlock
 {
     [self JSONFromURLWithString:urlString method:kHTTPMethodGET
                          params:nil
-                   orBodyString:nil completion:^(NSDictionary *json, JSONModelError* e) {
+                   orBodyString:nil completion:^(id json, JSONModelError* e) {
                        if (completeBlock) completeBlock(json, e);
                    }];
 }
@@ -333,7 +333,7 @@ +(void)getJSONFromURLWithString:(NSString*)urlString params:(NSDictionary*)param
 {
     [self JSONFromURLWithString:urlString method:kHTTPMethodGET
                          params:params
-                   orBodyString:nil completion:^(NSDictionary *json, JSONModelError* e) {
+                   orBodyString:nil completion:^(id json, JSONModelError* e) {
                        if (completeBlock) completeBlock(json, e);
                    }];
 }
@@ -342,7 +342,7 @@ +(void)postJSONFromURLWithString:(NSString*)urlString params:(NSDictionary*)para
 {
     [self JSONFromURLWithString:urlString method:kHTTPMethodPOST
                          params:params
-                   orBodyString:nil completion:^(NSDictionary *json, JSONModelError* e) {
+                   orBodyString:nil completion:^(id json, JSONModelError* e) {
                        if (completeBlock) completeBlock(json, e);
                    }];
 
@@ -352,7 +352,7 @@ +(void)postJSONFromURLWithString:(NSString*)urlString bodyString:(NSString*)body
 {
     [self JSONFromURLWithString:urlString method:kHTTPMethodPOST
                          params:nil
-                   orBodyString:bodyString completion:^(NSDictionary *json, JSONModelError* e) {
+                   orBodyString:bodyString completion:^(id json, JSONModelError* e) {
                        if (completeBlock) completeBlock(json, e);
                    }];
 }
@@ -362,7 +362,7 @@ +(void)postJSONFromURLWithString:(NSString*)urlString bodyData:(NSData*)bodyData
     [self JSONFromURLWithString:urlString method:kHTTPMethodPOST
                          params:nil
                    orBodyString:[[NSString alloc] initWithData:bodyData encoding:defaultTextEncoding]
-                                 completion:^(NSDictionary *json, JSONModelError* e) {
+                                 completion:^(id json, JSONModelError* e) {
                        if (completeBlock) completeBlock(json, e);
                    }];
 }
