Refactor StudyplusAPI class

Author: koji-1009

Lib/StudyplusSDK.xcodeproj/project.pbxproj

@@ -13,7 +13,7 @@
 		183FDAAB1E75148D0085589F /* Studyplus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 183FDAAA1E75148D0085589F /* Studyplus.swift */; };
 		183FDAAD1E753E430085589F /* StudyplusLoginDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 183FDAAC1E753E430085589F /* StudyplusLoginDelegate.swift */; };
 		183FDAAF1E7544240085589F /* StudyplusError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 183FDAAE1E7544240085589F /* StudyplusError.swift */; };
-		183FDAB11E754DCB0085589F /* StudyplusAPIRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 183FDAB01E754DCB0085589F /* StudyplusAPIRequest.swift */; };
+		183FDAB11E754DCB0085589F /* StudyplusAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 183FDAB01E754DCB0085589F /* StudyplusAPI.swift */; };
 		183FDAB31E7561B90085589F /* StudyplusRecord.swift in Sources */ = {isa = PBXBuildFile; fileRef = 183FDAB21E7561B90085589F /* StudyplusRecord.swift */; };
 /* End PBXBuildFile section */
 
@@ -37,7 +37,7 @@
 		183FDAAA1E75148D0085589F /* Studyplus.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Studyplus.swift; sourceTree = "<group>"; };
 		183FDAAC1E753E430085589F /* StudyplusLoginDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StudyplusLoginDelegate.swift; sourceTree = "<group>"; };
 		183FDAAE1E7544240085589F /* StudyplusError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StudyplusError.swift; sourceTree = "<group>"; };
-		183FDAB01E754DCB0085589F /* StudyplusAPIRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StudyplusAPIRequest.swift; sourceTree = "<group>"; };
+		183FDAB01E754DCB0085589F /* StudyplusAPI.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StudyplusAPI.swift; sourceTree = "<group>"; };
 		183FDAB21E7561B90085589F /* StudyplusRecord.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StudyplusRecord.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -82,8 +82,8 @@
 			isa = PBXGroup;
 			children = (
 				183FDA6B1E7510920085589F /* Info.plist */,
+				65E3911625F889A700490547 /* internal */,
 				183FDAAA1E75148D0085589F /* Studyplus.swift */,
-				183FDAB01E754DCB0085589F /* StudyplusAPIRequest.swift */,
 				183FDAAE1E7544240085589F /* StudyplusError.swift */,
 				183FDAAC1E753E430085589F /* StudyplusLoginDelegate.swift */,
 				183FDAB21E7561B90085589F /* StudyplusRecord.swift */,
@@ -101,6 +101,14 @@
 			path = StudyplusSDKTests;
 			sourceTree = "<group>";
 		};
+		65E3911625F889A700490547 /* internal */ = {
+			isa = PBXGroup;
+			children = (
+				183FDAB01E754DCB0085589F /* StudyplusAPI.swift */,
+			);
+			path = internal;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -218,7 +226,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				183FDAB11E754DCB0085589F /* StudyplusAPIRequest.swift in Sources */,
+				183FDAB11E754DCB0085589F /* StudyplusAPI.swift in Sources */,
 				183FDAB31E7561B90085589F /* StudyplusRecord.swift in Sources */,
 				183FDAAD1E753E430085589F /* StudyplusLoginDelegate.swift in Sources */,
 				183FDAAF1E7544240085589F /* StudyplusError.swift in Sources */,

Lib/StudyplusSDK/Studyplus.swift

@@ -165,7 +165,7 @@ final public class Studyplus {
             return
         }
 
-        StudyplusAPIRequest(accessToken: accessToken).post(record, completion: completion)
+        StudyplusAPI(accessToken: accessToken).post(record, completion: completion)
     }
 
     /// It is responsible for processing custom URL scheme

Lib/StudyplusSDK/StudyplusAPIRequest.swift renamed to Lib/StudyplusSDK/internal/StudyplusAPI.swift

@@ -1,5 +1,5 @@
 //
-//  StudyplusAPIRequest.swift
+//  StudyplusAPI.swift
 //  StudyplusSDK
 //
 //  The MIT License (MIT)
@@ -26,11 +26,22 @@
 
 import Foundation
 
-internal struct StudyplusAPIRequest {
+private struct StudyplusURL {
+    private static let scheme: String = "https"
+    private static let host: String = "external-api.studyplus.jp"
+    private static let version: String = "v1"
 
-    private static let base: String = "https://external-api.studyplus.jp"
-    private static let path: String = "/v1/study_records"
-    private let studyRecordUrl: URL = URL(string: base + path)!
+    static var records: URL {
+        var components = URLComponents()
+        components.scheme = scheme
+        components.host = host
+        components.path = "/\(version)/study_records"
+
+        return components.url!
+    }
+}
+
+internal struct StudyplusAPI {
 
     private let accessToken: String
     private var encoder: JSONEncoder {
@@ -54,7 +65,7 @@ internal struct StudyplusAPIRequest {
     }
 
     private func exec(_ record: StudyplusRecord, completion: @escaping (Result<Void, StudyplusPostError>) -> Void) {
-        var request = URLRequest(url: studyRecordUrl)
+        var request = URLRequest(url: StudyplusURL.records)
         request.httpMethod = "POST"
         request.addValue("application/json; charaset=utf-8", forHTTPHeaderField: "Content-Type")
         request.addValue("OAuth \(accessToken)", forHTTPHeaderField: "Authorization")