Merge pull request #283 from octokit/nested-objects

Set the baseURL for nested objects

OctoKit/OCTObject.m

@@ -85,6 +85,23 @@ - (void)setBaseURL:(NSURL *)baseURL {
 		NSString *baseURLString = [NSString stringWithFormat:@"%@://%@", baseURL.scheme, baseURL.host];
 		self.server = [OCTServer serverWithBaseURL:[NSURL URLWithString:baseURLString]];
 	}
+
+	// Also set the base URL for any nested objects.
+	for (NSString *propertyKey in self.class.JSONKeyPathsByPropertyKey) {
+		id value = [self valueForKey:propertyKey];
+		if ([value isKindOfClass:OCTObject.class]) {
+			OCTObject *object = value;
+			object.baseURL = baseURL;
+		} else if ([value conformsToProtocol:@protocol(NSFastEnumeration)]) {
+			id<NSFastEnumeration> enumerator = value;
+			for (id value in enumerator) {
+				if ([value isKindOfClass:OCTObject.class]) {
+					OCTObject *object = value;
+					object.baseURL = baseURL;
+				}
+			}
+		}
+	}
 }
 
 - (BOOL)validateObjectID:(id *)objectID error:(NSError **)error {

OctoKit/OCTPullRequest.m

@@ -7,10 +7,10 @@
 //
 
 #import "OCTPullRequest.h"
+
 #import "OCTUser.h"
 #import "OCTRepository.h"
 #import "NSValueTransformer+OCTPredefinedTransformerAdditions.h"
-#import "OCTObject+Private.h"
 
 @implementation OCTPullRequest
 
@@ -102,11 +102,4 @@ + (NSValueTransformer *)baseRepositoryJSONTransformer {
 	return [MTLValueTransformer mtl_JSONDictionaryTransformerWithModelClass:OCTRepository.class];
 }
 
-- (void)setBaseURL:(NSURL *)baseURL {
-	super.baseURL = baseURL;
-
-	self.headRepository.baseURL = baseURL;
-	self.baseRepository.baseURL = baseURL;
-}
-
 @end

OctoKit/OCTRepository.m

@@ -7,6 +7,7 @@
 //
 
 #import "OCTRepository.h"
+
 #import "NSValueTransformer+OCTPredefinedTransformerAdditions.h"
 
 static NSString *const OCTRepositoryHTMLIssuesPath = @"issues";

OctoKitTests/OCTRepositorySpec.m

@@ -12,6 +12,7 @@
 #import <Quick/Quick.h>
 
 #import "OCTObjectSpec.h"
+#import "OCTObject+Private.h"
 
 QuickSpecBegin(OCTRepositorySpec)
 
@@ -135,6 +136,13 @@
 		expect(repository.forkParent).notTo(beNil());
 		expect(repository.forkParent.objectID).to(equal(@"1296267"));
 	});
+
+	it(@"should set its nested OCTObjects' servers", ^{
+		NSURL *URL = [NSURL URLWithString:@"https://myserver.com"];
+		repository.baseURL = URL;
+		expect(repository.forkParent.baseURL).to(equal(URL));
+		expect(repository.forkSource.baseURL).to(equal(URL));
+	});
 });
 
 it(@"should migrate from pre-MTLModel OCTObject", ^{