Merge pull request #72 from tumblr/configurable-base-url

Make base URL configurable

Author: mbbischoff

TMTumblrSDK.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'TMTumblrSDK'
-  s.version      = '1.0.8'
+  s.version      = '1.1.0'
   s.summary      = 'An unopinionated and flexible library for easily integrating Tumblr data into your iOS or OS X application.'
   s.author       = { 'Bryan Irace' => '[email protected]' }
   s.homepage     = 'http://tumblr.github.com/TMTumblrSDK'

TMTumblrSDK/APIClient/TMAPIClient.h

@@ -63,6 +63,8 @@ typedef void (^TMAPICallback)(id, NSError *error);
  */
 @property (nonatomic, strong) NSOperationQueue *defaultCallbackQueue;
 
+@property (nonatomic, strong) NSURL *baseURL;
+
 /** @name Singleton instance */
 
 + (instancetype)sharedInstance;

TMTumblrSDK/APIClient/TMAPIClient.m

@@ -21,8 +21,6 @@ @interface TMAPIClient()
 
 NSString *fullBlogName(NSString *blogName);
 
-NSString *URLWithPath(NSString *path);
-
 @end
 
 
@@ -379,7 +377,7 @@ - (JXHTTPOperation *)getRequestWithPath:(NSString *)path parameters:(NSDictionar
     NSMutableDictionary *mutableParameters = [NSMutableDictionary dictionaryWithDictionary:parameters];
     mutableParameters[@"api_key"] = self.OAuthConsumerKey;
 
-    JXHTTPOperation *request = [JXHTTPOperation withURLString:URLWithPath(path) queryParameters:mutableParameters];
+    JXHTTPOperation *request = [JXHTTPOperation withURLString:[self URLWithPath:path] queryParameters:mutableParameters];
     request.continuesInAppBackground = YES;
     request.requestTimeoutInterval = self.timeoutInterval;
 
@@ -392,7 +390,7 @@ - (JXHTTPOperation *)postRequestWithPath:(NSString *)path parameters:(NSDictiona
     NSMutableDictionary *mutableParameters = [NSMutableDictionary dictionaryWithDictionary:parameters];
     mutableParameters[@"api_key"] = self.OAuthConsumerKey;
 
-    JXHTTPOperation *request = [JXHTTPOperation withURLString:URLWithPath(path)];
+    JXHTTPOperation *request = [JXHTTPOperation withURLString:[self URLWithPath:path]];
     request.requestMethod = @"POST";
     request.continuesInAppBackground = YES;
     request.requestBody = [JXHTTPFormEncodedBody withDictionary:mutableParameters];
@@ -410,7 +408,7 @@ - (JXHTTPOperation *)multipartPostRequest:(NSString *)blogName type:(NSString *)
     mutableParameters[@"api_key"] = self.OAuthConsumerKey;
     mutableParameters[@"type"] = type;
 
-    JXHTTPOperation *request = [JXHTTPOperation withURLString:URLWithPath(blogPath(@"post", blogName))];
+    JXHTTPOperation *request = [JXHTTPOperation withURLString:[self URLWithPath:blogPath(@"post", blogName)]];
     request.requestMethod = @"POST";
     request.continuesInAppBackground = YES;
     request.requestBody = [self multipartBodyForParameters:mutableParameters filePathArray:filePathArray
@@ -485,6 +483,10 @@ - (void)sendRequest:(JXHTTPOperation *)request queue:(NSOperationQueue *)queue c
     [self.queue addOperation:request];
 }
 
+- (NSString *)URLWithPath:(NSString *)path {
+    return [[self.baseURL URLByAppendingPathComponent:path] absoluteString];
+}
+
 NSString *blogPath(NSString *ext, NSString *blogName) {
     return [NSString stringWithFormat:@"blog/%@/%@", fullBlogName(blogName), ext];
 }
@@ -497,17 +499,14 @@ - (void)sendRequest:(JXHTTPOperation *)request queue:(NSOperationQueue *)queue c
     return blogName;
 }
 
-NSString *URLWithPath(NSString *path) {
-    return [@"http://api.tumblr.com/v2/" stringByAppendingString:path];
-}
-
 #pragma mark - NSObject
 
 - (id)init {
     if (self = [super init]) {
         self.queue = [[JXHTTPOperationQueue alloc] init];
         self.defaultCallbackQueue = [NSOperationQueue mainQueue];
         self.timeoutInterval = TMAPIClientDefaultRequestTimeoutInterval;
+        self.baseURL = [NSURL URLWithString:@"https://api.tumblr.com/v2/"];
     }
 
     return self;