Move WordPressComRESTAPIVersionedPathBuilder to APIInterface/

Author: mokagio

WooCommerce/WordPressAuthenticator/WordPressKit/APIInterface/WordPressComRESTAPIVersionedPathBuilder.m

@@ -0,0 +1,55 @@
+#import <Foundation/Foundation.h>
+#import "WordPressKit/WordPressComRESTAPIVersionedPathBuilder.h"
+
+static NSString* const WordPressComRESTApiVersionStringInvalid = @"invalid_api_version";
+static NSString* const WordPressComRESTApiVersionString_1_0 = @"rest/v1";
+static NSString* const WordPressComRESTApiVersionString_1_1 = @"rest/v1.1";
+static NSString* const WordPressComRESTApiVersionString_1_2 = @"rest/v1.2";
+static NSString* const WordPressComRESTApiVersionString_1_3 = @"rest/v1.3";
+static NSString* const WordPressComRESTApiVersionString_2_0 = @"wpcom/v2";
+
+@implementation WordPressComRESTAPIVersionedPathBuilder
+
++ (NSString *)pathForEndpoint:(NSString *)endpoint 
+                  withVersion:(WordPressComRESTAPIVersion)apiVersion
+{
+    NSString *apiVersionString = [self apiVersionStringWithEnumValue:apiVersion];
+
+    return [NSString stringWithFormat:@"%@/%@", apiVersionString, endpoint];
+}
+
++ (NSString *)apiVersionStringWithEnumValue:(WordPressComRESTAPIVersion)apiVersion
+{
+    NSString *result = nil;
+
+    switch (apiVersion) {
+        case WordPressComRESTAPIVersion_1_0:
+            result = WordPressComRESTApiVersionString_1_0;
+            break;
+
+        case WordPressComRESTAPIVersion_1_1:
+            result = WordPressComRESTApiVersionString_1_1;
+            break;
+
+        case WordPressComRESTAPIVersion_1_2:
+            result = WordPressComRESTApiVersionString_1_2;
+            break;
+
+        case WordPressComRESTAPIVersion_1_3:
+            result = WordPressComRESTApiVersionString_1_3;
+            break;
+
+        case WordPressComRESTAPIVersion_2_0:
+            result = WordPressComRESTApiVersionString_2_0;
+            break;
+
+        default:
+            NSAssert(NO, @"This should never by executed");
+            result = WordPressComRESTApiVersionStringInvalid;
+            break;
+    }
+
+    return result;
+}
+
+@end

WooCommerce/WordPressAuthenticator/WordPressKit/APIInterface/include/WordPressComRESTAPIVersionedPathBuilder.h

@@ -0,0 +1,10 @@
+#import <Foundation/Foundation.h>
+#import <WordPressKit/WordPressComRESTAPIVersion.h>
+
+@interface WordPressComRESTAPIVersionedPathBuilder: NSObject
+
++ (NSString *)pathForEndpoint:(NSString *)endpoint
+                  withVersion:(WordPressComRESTAPIVersion)apiVersion
+NS_SWIFT_NAME(path(forEndpoint:withVersion:));
+
+@end

WooCommerce/WordPressAuthenticator/WordPressKit/BasicBlogAPIObjc/ServiceRemoteWordPressComREST.h

@@ -49,12 +49,4 @@ NS_SWIFT_NAME(path(forEndpoint:withVersion:));
 
 @end
 
-@interface WordPressComRESTVersionedPathBuilder: NSObject
-
-+ (NSString *)pathForEndpoint:(NSString *)endpoint
-                  withVersion:(WordPressComRESTAPIVersion)apiVersion
-NS_SWIFT_NAME(path(forEndpoint:withVersion:));
-
-@end
-
 NS_ASSUME_NONNULL_END

WooCommerce/WordPressAuthenticator/WordPressKit/BasicBlogAPIObjc/ServiceRemoteWordPressComREST.m

@@ -22,59 +22,8 @@ - (NSString *)pathForEndpoint:(NSString *)resourceUrl
 {
     NSParameterAssert([resourceUrl isKindOfClass:[NSString class]]);
 
-    return [WordPressComRESTVersionedPathBuilder pathForEndpoint:resourceUrl
-                                                     withVersion:apiVersion];
+    return [WordPressComRESTAPIVersionedPathBuilder pathForEndpoint:resourceUrl
+                                                        withVersion:apiVersion];
 }
 
 @end
-
-static NSString* const ServiceRemoteWordPressComRESTApiVersionStringInvalid = @"invalid_api_version";
-static NSString* const ServiceRemoteWordPressComRESTApiVersionString_1_0 = @"rest/v1";
-static NSString* const ServiceRemoteWordPressComRESTApiVersionString_1_1 = @"rest/v1.1";
-static NSString* const ServiceRemoteWordPressComRESTApiVersionString_1_2 = @"rest/v1.2";
-static NSString* const ServiceRemoteWordPressComRESTApiVersionString_1_3 = @"rest/v1.3";
-static NSString* const ServiceRemoteWordPressComRESTApiVersionString_2_0 = @"wpcom/v2";
-
-@implementation WordPressComRESTVersionedPathBuilder
-
-+ (NSString *)pathForEndpoint:(NSString *)endpoint withVersion:(WordPressComRESTAPIVersion)apiVersion
-{
-    NSString *apiVersionString = [self apiVersionStringWithEnumValue:apiVersion];
-
-    return [NSString stringWithFormat:@"%@/%@", apiVersionString, endpoint];
-}
-
-+ (NSString *)apiVersionStringWithEnumValue:(WordPressComRESTAPIVersion)apiVersion
-{
-    NSString *result = nil;
-
-    switch (apiVersion) {
-        case WordPressComRESTAPIVersion_1_0:
-            result = ServiceRemoteWordPressComRESTApiVersionString_1_0;
-            break;
-
-        case WordPressComRESTAPIVersion_1_1:
-            result = ServiceRemoteWordPressComRESTApiVersionString_1_1;
-            break;
-
-        case WordPressComRESTAPIVersion_1_2:
-            result = ServiceRemoteWordPressComRESTApiVersionString_1_2;
-            break;
-
-        case WordPressComRESTAPIVersion_1_3:
-            result = ServiceRemoteWordPressComRESTApiVersionString_1_3;
-            break;
-
-        case WordPressComRESTAPIVersion_2_0:
-            result = ServiceRemoteWordPressComRESTApiVersionString_2_0;
-            break;
-
-        default:
-            NSAssert(NO, @"This should never by executed");
-            result = ServiceRemoteWordPressComRESTApiVersionStringInvalid;
-            break;
-    }
-
-    return result;
-}
-@end