fix nasty bug where if you provided the host in the path it would sta…

…ck the paths
maddox · Mar 14, 2009 · a66c28d · a66c28d
1 parent 087f5a1
commit a66c28d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/Source/HTTPRiot/HTTPRiotRequest.m b/Source/HTTPRiot/HTTPRiotRequest.m
@@ -169,21 +169,16 @@ - (NSMutableURLRequest *)configuredRequest
 
 - (NSURL *)composedURI
 {
-    NSString *finalString;
     NSURL *tmpURI = [NSURL URLWithString:path];
     NSURL *baseURI = [options objectForKey:@"baseURI"];
 
     if([tmpURI host] == nil && [baseURI host] == nil)
         [NSException raise:@"UnspecifiedHost" format:@"host wasn't provided in baseURI or path"];
 
     if([tmpURI host])
-        finalString = [[tmpURI absoluteString] stringByAppendingPathComponent:path];
-    else
-        finalString = [[baseURI absoluteString] stringByAppendingPathComponent:path];
-
-    tmpURI = [NSURL URLWithString:finalString];
-
-    return tmpURI;
+        return tmpURI;
+
+    return [NSURL URLWithString:[[baseURI absoluteString] stringByAppendingPathComponent:path]];
 }
 
 #pragma mark - Class Methods

diff --git a/Source/Tests/HTTPRiotRequestTest.m b/Source/Tests/HTTPRiotRequestTest.m
@@ -171,13 +171,15 @@ - (void)testDELETE
 
 - (void) testBasicAuth 
 {
+    NSError *error = nil;
     NSDictionary *auth = [NSDictionary dictionaryWithObjectsAndKeys:@"user", @"username", @"pass", @"password", nil];
     NSMutableDictionary *opts = [NSMutableDictionary dictionaryWithDictionary:defaultOptions];
     [opts addEntriesFromDictionary:[NSDictionary dictionaryWithObject:auth forKey:@"basicAuth"]];
     id person = [HTTPRiotRequest requestWithMethod:kHTTPRiotMethodGet
                                               path:[HTTPRiotTestServer stringByAppendingString:@"/auth"]
                                            options:opts
-                                             error:nil];
+                                             error:&error];
     STAssertNotNil(person, nil);
+    STAssertNil(error, nil);
 }
 @end