From 4889ff9b5f455e6ee46738a62c823a929da98a54 Mon Sep 17 00:00:00 2001
From: Blake Watters <blakewatters@gmail.com>
Date: Wed, 4 May 2011 09:59:47 -0400
Subject: [PATCH] Removed use of Objective-C block in new serialization code
 from Andras

---
 Code/ObjectMapping/RKDynamicRouter.m | 37 +++++++++++++---------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/Code/ObjectMapping/RKDynamicRouter.m b/Code/ObjectMapping/RKDynamicRouter.m
index 0e1fb1a3..c6db2ac0 100644
--- a/Code/ObjectMapping/RKDynamicRouter.m
+++ b/Code/ObjectMapping/RKDynamicRouter.m
@@ -92,6 +92,20 @@
 	return nil;
 }
 
+- (void)handlePrimaryKeyWithClass:(Class)objectClass andAttributes:(NSMutableDictionary*)attributes forObject:(id)object {
+    if ([objectClass respondsToSelector:@selector(primaryKeyProperty)]) { 
+        NSString *primaryKey = [objectClass performSelector:@selector(primaryKeyProperty)]; 
+        id primaryKeyValue = [object valueForKey:primaryKey]; 
+        NSString* primaryKeyValueString = [NSString stringWithFormat:@"%@", primaryKeyValue];
+        
+        // Primary key value isn't defined
+        if (primaryKeyValue == nil || [primaryKeyValueString isEqualToString:@"0"]) { 
+            // Exclude id
+            [attributes removeObjectForKey:@"id"];
+        }
+    }
+}
+
 - (NSObject<RKRequestSerializable>*)serializationForObject:(NSObject<RKObjectMappable>*)object method:(RKRequestMethod)method {
     // Don't return a serialization for a GET request
     // There is an extensive discussion about this on the ASIHTTPRequest list
@@ -118,20 +132,6 @@
 		}
 	}
     
-    void (^handlePrimaryKey)(Class, NSMutableDictionary *, id) = ^(Class blockClass, NSMutableDictionary *attributes, id object) {
-        if ([blockClass respondsToSelector:@selector(primaryKeyProperty)]) { 
-            NSString *primaryKey = [blockClass performSelector:@selector(primaryKeyProperty)]; 
-            id primaryKeyValue = [object valueForKey:primaryKey]; 
-            NSString* primaryKeyValueString = [NSString stringWithFormat:@"%@", primaryKeyValue];
-            
-            // Primary key value isn't defined
-            if (primaryKeyValue == nil || [primaryKeyValueString isEqualToString:@"0"]) { 
-                // Exclude id
-                [attributes removeObjectForKey:@"id"];
-            }
-        }
-    };
-    
     // add nested relationships
     for (NSString* elementName in [relationships allKeys]) {
         NSObject *relationship = [relationships objectForKey:elementName];
@@ -142,9 +142,8 @@
             NSMutableArray *children = [NSMutableArray array]; 
             for (id child in (NSEnumerator *)relationship) { 
                 Class class = [child class];
-                NSMutableDictionary* childAttributes = [RKObjectMappableGetPropertiesByElement(child) mutableCopy];
-                
-                handlePrimaryKey(class, childAttributes, child);
+                NSMutableDictionary* childAttributes = [RKObjectMappableGetPropertiesByElement(child) mutableCopy];                
+                [self handlePrimaryKeyWithClass:class andAttributes:childAttributes forObject:child];
                 
                 [children addObject:[NSDictionary dictionaryWithDictionary:childAttributes]];
             } 
@@ -155,9 +154,7 @@
         } else {
             Class class = [relationship class];
             NSMutableDictionary* childAttributes = [RKObjectMappableGetPropertiesByElement(relationship) mutableCopy];
-            
-            handlePrimaryKey(class, childAttributes, relationship);
-            
+            [self handlePrimaryKeyWithClass:class andAttributes:childAttributes forObject:relationship];
             [resourceParams setValue:childAttributes 
                               forKey:relationshipPath]; 
         }