A bit of code modernization

Author: rsieiro

RSOAuthEngine/RSOAuthEngine.m

@@ -115,18 +115,18 @@ - (id)initWithHostName:(NSString *)hostName
         _callbackURL = callbackURL;
         _signatureMethod = signatureMethod;
 
-        _oAuthValues = [NSMutableDictionary dictionaryWithObjectsAndKeys:
-                        oauthVersion, @"oauth_version",
-                        oauthSignatureMethodName[_signatureMethod], @"oauth_signature_method",
-                        consumerKey, @"oauth_consumer_key",
-                        @"", @"oauth_token",
-                        @"", @"oauth_verifier",
-                        @"", @"oauth_callback",
-                        @"", @"oauth_signature",
-                        @"", @"oauth_timestamp",
-                        @"", @"oauth_nonce",
-                        @"", @"realm",
-                        nil];
+        _oAuthValues = [@{
+            @"oauth_version": oauthVersion,
+            @"oauth_signature_method": oauthSignatureMethodName[_signatureMethod],
+            @"oauth_consumer_key": consumerKey,
+            @"oauth_token": @"",
+            @"oauth_verifier": @"",
+            @"oauth_callback": @"",
+            @"oauth_signature": @"",
+            @"oauth_timestamp": @"",
+            @"oauth_nonce": @"",
+            @"realm": @""
+        } mutableCopy];
 
         [self resetOAuthToken];
 
@@ -161,9 +161,12 @@ - (NSString *)signatureBaseStringForURL:(NSString *)url method:(NSString *)metho
     }
 
     // Add parameters from the OAuth header
-    [_oAuthValues enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
+    [_oAuthValues enumerateKeysAndObjectsUsingBlock:^(id key, NSString *obj, BOOL *stop) {
         if ([key hasPrefix:@"oauth_"]  && ![key isEqualToString:@"oauth_signature"] && obj && ![obj isEqualToString:@""]) {
-            [parameters addObject:[NSDictionary dictionaryWithObjectsAndKeys:[key mk_urlEncodedString], @"key", [obj mk_urlEncodedString], @"value", nil]];
+            [parameters addObject:@{
+                @"key": [key mk_urlEncodedString],
+                @"value": [obj mk_urlEncodedString]
+            }];
         }
     }];
 
@@ -177,7 +180,7 @@ - (NSString *)signatureBaseStringForURL:(NSString *)url method:(NSString *)metho
 
     // Join sorted components
     NSMutableArray *normalizedParameters = [NSMutableArray array];
-    [parameters enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
+    [parameters enumerateObjectsUsingBlock:^(NSDictionary *obj, NSUInteger idx, BOOL *stop) {
         [normalizedParameters addObject:[NSString stringWithFormat:@"%@=%@", [obj objectForKey:@"key"], [obj objectForKey:@"value"]]];
     }];
 
@@ -203,12 +206,12 @@ - (NSString *)signatureBaseStringForRequest:(MKNetworkOperation *)request
     if ([request.filesToBePosted count] == 0 && [request.dataToBePosted count] == 0) {
         // Add parameters from the query string
         NSArray *pairs = [url.query componentsSeparatedByString:@"&"];
-        [pairs enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
+        [pairs enumerateObjectsUsingBlock:^(NSString *obj, NSUInteger idx, BOOL *stop) {
             NSArray *elements = [obj componentsSeparatedByString:@"="];
             NSString *key = [elements objectAtIndex:0];
             NSString *value = (elements.count > 1) ? [elements objectAtIndex:1] : @"";
 
-            [parameters addObject:[NSDictionary dictionaryWithObjectsAndKeys:key, @"key", value, @"value", nil]];
+            [parameters addObject:@{@"key": key, @"value": value}];
         }];
 
         // Add parameters from the request body
@@ -308,9 +311,8 @@ - (void)fillTokenWithResponseBody:(NSString *)body type:(RSOAuthTokenType)tokenT
 {
     NSArray *pairs = [body componentsSeparatedByString:@"&"];
 
-    for (NSString *pair in pairs)
-    {
-        NSArray *elements = [pair componentsSeparatedByString:@"="];
+    [pairs enumerateObjectsUsingBlock:^(NSString *obj, NSUInteger idx, BOOL *stop) {
+        NSArray *elements = [obj componentsSeparatedByString:@"="];
         NSString *key = [[elements objectAtIndex:0] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
         NSString *value = [[elements objectAtIndex:1] urlDecodedString];
 
@@ -323,7 +325,7 @@ - (void)fillTokenWithResponseBody:(NSString *)body type:(RSOAuthTokenType)tokenT
         } else {
             [self addCustomValue:value withKey:key];
         }
-    }
+    }];
 
     _tokenType = tokenType;
 
@@ -377,19 +379,19 @@ - (void)signRequest:(MKNetworkOperation *)request
     if (self.parameterStyle == RSOAuthParameterStyleHeader) {
         NSMutableArray *oauthHeaders = [NSMutableArray array];        
 
-        [_oAuthValues enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
+        [_oAuthValues enumerateKeysAndObjectsUsingBlock:^(id key, NSString *obj, BOOL *stop) {
             if (obj && ![obj isEqualToString:@""]) {
                 [oauthHeaders addObject:[NSString stringWithFormat:@"%@=\"%@\"", [key mk_urlEncodedString], [obj mk_urlEncodedString]]];
             }
         }];
 
         // Set the Authorization header
         NSString *oauthData = [NSString stringWithFormat:@"OAuth %@", [oauthHeaders componentsJoinedByString:@", "]];
-        NSDictionary *oauthHeader = [NSDictionary dictionaryWithObjectsAndKeys:oauthData, @"Authorization", nil];
+        NSDictionary *oauthHeader = @{@"Authorization": oauthData};
 
         [request addHeaders:oauthHeader];        
     } else if (self.parameterStyle == RSOAuthParameterStylePostBody && [request.readonlyRequest.HTTPMethod caseInsensitiveCompare:@"GET"] != NSOrderedSame) {
-        [_oAuthValues enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
+        [_oAuthValues enumerateKeysAndObjectsUsingBlock:^(id key, NSString *obj, BOOL *stop) {
             if (obj && ![obj isEqualToString:@""]) {
                 [request rs_setValue:obj forKey:key];
             }
@@ -398,7 +400,7 @@ - (void)signRequest:(MKNetworkOperation *)request
         NSMutableArray *oauthParams = [NSMutableArray array];        
 
         // Fill the authorization header array
-        [_oAuthValues enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
+        [_oAuthValues enumerateKeysAndObjectsUsingBlock:^(id key, NSString *obj, BOOL *stop) {
             if (obj && ![obj isEqualToString:@""]) {
                 [oauthParams addObject:[NSString stringWithFormat:@"%@=%@", [key mk_urlEncodedString], [obj mk_urlEncodedString]]];
             }
@@ -442,7 +444,7 @@ - (NSString *)generateXOAuthStringForURL:(NSString *)url method:(NSString *)meth
     NSMutableArray *oauthHeaders = [NSMutableArray array];
 
     // Fill the authorization header array
-    [_oAuthValues enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
+    [_oAuthValues enumerateKeysAndObjectsUsingBlock:^(id key, NSString *obj, BOOL *stop) {
         if (obj && ![obj isEqualToString:@""]) {
             [oauthHeaders addObject:[NSString stringWithFormat:@"%@=\"%@\"", [key mk_urlEncodedString], [obj mk_urlEncodedString]]];
         }

TwitterDemo.xcodeproj/project.pbxproj

@@ -243,7 +243,7 @@
 		5B9770BA149789C200791728 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0420;
+				LastUpgradeCheck = 0460;
 				ORGANIZATIONNAME = SharpCube;
 			};
 			buildConfigurationList = 5B9770BD149789C200791728 /* Build configuration list for PBXProject "TwitterDemo" */;
@@ -336,6 +336,10 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
@@ -350,6 +354,7 @@
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
 				PROVISIONING_PROFILE = "";
@@ -364,13 +369,18 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";