return URL for friendlier api; update test

Author: dkarivalis

Classes/Auth/TMOAuth.h

@@ -61,14 +61,14 @@ __attribute__((objc_subclassing_restricted))
  @param tokenSecret OAuth user secret
  @param timestamp Unix / epoch time
  */
-+ (NSString *)signUrlWithQueryComponent:(NSURL *)URL
-                                 method:(NSString *)method
-                         postParameters:(NSDictionary *)postParameters
-                                  nonce:(NSString *)nonce
-                            consumerKey:(NSString *)consumerKey
-                         consumerSecret:(NSString *)consumerSecret
-                                  token:(NSString *)token
-                            tokenSecret:(NSString *)tokenSecret
-                              timestamp:(NSString *)timestamp;
++ (NSURL *)signUrlWithQueryComponent:(NSURL *)URL
+                              method:(NSString *)method
+                      postParameters:(NSDictionary *)postParameters
+                               nonce:(NSString *)nonce
+                         consumerKey:(NSString *)consumerKey
+                      consumerSecret:(NSString *)consumerSecret
+                               token:(NSString *)token
+                         tokenSecret:(NSString *)tokenSecret
+                           timestamp:(NSString *)timestamp;
 
 @end

Classes/Auth/TMOAuth.m

@@ -52,15 +52,15 @@ + (NSString *)headerForURL:(NSURL *)URL
     return auth.headerString;
 }
 
-+ (NSString *)signUrlWithQueryComponent:(NSURL *)URL
-                                 method:(NSString *)method
-                         postParameters:(NSDictionary *)postParameters
-                                  nonce:(NSString *)nonce
-                            consumerKey:(NSString *)consumerKey
-                         consumerSecret:(NSString *)consumerSecret
-                                  token:(NSString *)token
-                            tokenSecret:(NSString *)tokenSecret
-                              timestamp:(NSString *)timestamp {
++ (NSURL *)signUrlWithQueryComponent:(NSURL *)URL
+                              method:(NSString *)method
+                      postParameters:(NSDictionary *)postParameters
+                               nonce:(NSString *)nonce
+                         consumerKey:(NSString *)consumerKey
+                      consumerSecret:(NSString *)consumerSecret
+                               token:(NSString *)token
+                         tokenSecret:(NSString *)tokenSecret
+                           timestamp:(NSString *)timestamp {
 
     NSMutableDictionary *oAuthParameters = [TMOAuth OAuthParametersFromURL:nil
                                                                        url: URL
@@ -72,7 +72,7 @@ + (NSString *)signUrlWithQueryComponent:(NSURL *)URL
                                                                      token: token
                                                                tokenSecret: tokenSecret
                                                                  timestamp: timestamp];
-    return [URL.absoluteString stringByAppendingFormat:@"?%@", [TMURLEncoding encodedDictionary:oAuthParameters]];
+    return [NSURL URLWithString:[URL.absoluteString stringByAppendingFormat:@"?%@", [TMURLEncoding encodedDictionary:oAuthParameters]]];
 }
 
 - (id)initWithURL:(NSURL *)URL

ExampleiOS/ExampleiOSTests/TMOAuthTests.m

@@ -16,22 +16,16 @@ @interface TMOAuthTests : XCTestCase
 @implementation TMOAuthTests
 
 - (void)testSignUrlWithQueryComponentCalculatesProperSignature {
-    NSString *signedURL = [TMOAuth signUrlWithQueryComponent:[NSURL URLWithString:@"https://tumblr.com/"]
-                                                      method:@"GET"
-                                              postParameters:[NSDictionary dictionary]
-                                                       nonce:@"1234"
-                                                 consumerKey:@"consumerKey"
-                                              consumerSecret:@"consumerSecret"
-                                                       token:@"token"
-                                                 tokenSecret:@"tokenSecret"
-                                                   timestamp:@"1511967770"];
-    
-    NSURLComponents *urlComponents = [NSURLComponents componentsWithString:signedURL];
-    NSArray *queryItems = urlComponents.queryItems;
-    NSPredicate *predicate = [NSPredicate predicateWithFormat:@"name=%@", @"oauth_signature"];
-    NSURLQueryItem *queryItem = [queryItems filteredArrayUsingPredicate:predicate].firstObject;
-    
-    XCTAssert([queryItem.value isEqualToString:@"w/LP1MdJwiCfakR3GbW9IoeOz1E="], @"The generated OAuth signature should match the expected value.");
+    NSURL *signedURL = [TMOAuth signUrlWithQueryComponent:[NSURL URLWithString:@"https://tumblr.com/"]
+                                                   method:@"GET"
+                                           postParameters:[NSDictionary dictionary]
+                                                    nonce:@"1234"
+                                              consumerKey:@"consumerKey"
+                                           consumerSecret:@"consumerSecret"
+                                                    token:@"token"
+                                              tokenSecret:@"tokenSecret"
+                                                timestamp:@"1511967770"];
+    XCTAssert([signedURL.absoluteString isEqualToString:@"https://tumblr.com/?oauth_consumer_key=consumerKey&oauth_nonce=1234&oauth_signature=w/LP1MdJwiCfakR3GbW9IoeOz1E%3D&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1511967770&oauth_token=token&oauth_version=1.0"], @"The generated OAuth signature should match the expected value.");
 }
 
 - (void)testInitSetsInstanceVariables {