Merge pull request #12 from AppcentMobile/release/1.1.1

🎷 [UPDATE] Release 1.1.1, plist updated.

Author: burakcolakappcent

ACMNetworking.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name         = "ACMNetworking"
-    spec.version      = "1.1.0"
+    spec.version      = "1.1.1"
     spec.summary      = "ACMNetworking iOS Library"
     spec.description  = <<-DESC
             ACMNetworking is a package that help developers to make requests easily.
@@ -14,4 +14,4 @@ Pod::Spec.new do |spec|
     spec.swift_version = '5.0'  
     spec.source       = { :git => "https://github.com/AppcentMobile/ACMNetworking.git", :tag => "#{spec.version}" }
     spec.source_files  = "Sources/**/*.{h,m,swift}"
-  end
+  end

Sources/ACMNetworking/Library/Manager/ACMBaseEndpoint.swift

@@ -8,6 +8,10 @@ import Foundation
 ///
 /// Base endpoint struct for holding endpoint information
 public struct ACMBaseEndpoint {
+    // MARK: Config
+
+    var config: ACMPlistModel?
+
     // MARK: Override fetching config file
 
     var configOverride: Bool = false
@@ -98,31 +102,26 @@ public struct ACMBaseEndpoint {
         return urlRequest
     }
 
-    private var config: ACMPlistModel {
-        guard let model = ACMPlistUtils.shared.config else {
-            return emptyConfig
-        }
-        return model
-    }
-
-    var emptyConfig: ACMPlistModel {
-        ACMPlistModel(baseURL: "", timeout: 0, isLogEnabled: false)
-    }
-
     func session(delegate: URLSessionDelegate) -> URLSession {
         let configuration = URLSessionConfiguration.default
-        configuration.timeoutIntervalForRequest = config.timeout
-        configuration.timeoutIntervalForResource = config.timeout
+        configuration.timeoutIntervalForRequest = config?.timeout ?? 0
+        configuration.timeoutIntervalForResource = config?.timeout ?? 0
 
         return URLSession(configuration: configuration, delegate: delegate, delegateQueue: OperationQueue.main)
     }
 
-    init(configOverride: Bool, host: String? = nil, scheme: ACMBaseScheme, path: String = "", queryItems: [URLQueryItem]? = nil, params: [String: Any?]? = nil, headers: NSMutableDictionary? = nil, method: ACMBaseMethod, authHeader: String? = nil, mediaData: NSMutableData? = nil, retryCount: Int? = nil) {
+    init(config: ACMPlistModel? = nil, configOverride: Bool, host: String? = nil, scheme: ACMBaseScheme, path: String = "", queryItems: [URLQueryItem]? = nil, params: [String: Any?]? = nil, headers: NSMutableDictionary? = nil, method: ACMBaseMethod, authHeader: String? = nil, mediaData: NSMutableData? = nil, retryCount: Int? = nil) {
+        if let config = config {
+            self.config = config
+        } else {
+            self.config = ACMPlistUtils.shared.config()
+        }
+        ACMBaseLogger.shared.config = self.config
         ACMNetworkingConstants.configOverride = configOverride
         if let host = host {
             self.host = host
         } else {
-            self.host = config.baseURL
+            self.host = self.config?.baseURL
         }
         self.scheme = scheme
         self.path = path

Sources/ACMNetworking/Library/Manager/ACMBaseLogger.swift

@@ -9,11 +9,13 @@ final class ACMBaseLogger {
     /// shared instance
     static var shared = ACMBaseLogger()
 
+    var config: ACMPlistModel?
+
     private init() {}
 
     /// is BaseLoggerging enable
     var isEnabled: Bool {
-        return ACMPlistUtils.shared.config?.isLogEnabled ?? false
+        return config?.isLogEnabled ?? false
     }
 
     /// BaseLogger for success. Will add ✅ emoji to see better

Sources/ACMNetworking/Library/Manager/ACMEndpoint.swift

@@ -13,6 +13,7 @@ public final class ACMEndpoint {
     /// Init method for creating new object
     public init() {}
 
+    var config: ACMPlistModel?
     var configOverride: Bool = false
     var host: String?
     var scheme: ACMBaseScheme = .https
@@ -28,6 +29,18 @@ public final class ACMEndpoint {
     var mediaData: NSMutableData?
     var retryCount: Int?
 
+    /// Set config model
+    ///
+    /// - Parameters:
+    ///     - config: ACMPlistModel
+    ///
+    /// - Returns
+    ///     - Self
+    public func set(config: ACMPlistModel) -> Self {
+        self.config = config
+        return self
+    }
+
     /// Update override plist
     ///
     /// - Parameters:
@@ -300,6 +313,6 @@ public final class ACMEndpoint {
     /// - Returns
     ///     - Self
     public func build() -> ACMBaseEndpoint {
-        return ACMBaseEndpoint(configOverride: configOverride, host: host, scheme: scheme, path: path, queryItems: queryItems, params: params, headers: headers, method: method, authHeader: authHeader, mediaData: mediaData, retryCount: retryCount)
+        return ACMBaseEndpoint(config: config, configOverride: configOverride, host: host, scheme: scheme, path: path, queryItems: queryItems, params: params, headers: headers, method: method, authHeader: authHeader, mediaData: mediaData, retryCount: retryCount)
     }
 }

Sources/ACMNetworking/Library/Models/ACMPlistModel.swift

@@ -5,8 +5,21 @@
 /// ACMPlistModel
 ///
 /// A struct that holds the plist
-struct ACMPlistModel: Codable {
+open class ACMPlistModel: Codable {
     var baseURL: String
     var timeout: Double
     var isLogEnabled: Bool
+
+    enum CodingKeys: CodingKey {
+        case baseURL
+        case timeout
+        case isLogEnabled
+    }
+
+    open func encode(to encoder: Encoder) throws {
+        var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(baseURL, forKey: .baseURL)
+        try container.encode(timeout, forKey: .timeout)
+        try container.encode(isLogEnabled, forKey: .isLogEnabled)
+    }
 }

Sources/ACMNetworking/Library/Utils/Plist/ACMPlistUtils.swift

@@ -7,36 +7,36 @@ import Foundation
 /// ACMPlistUtils
 ///
 /// Utility class for plist
-final class ACMPlistUtils {
-    static let shared = ACMPlistUtils()
+public final class ACMPlistUtils {
+    public static let shared = ACMPlistUtils()
 
-    var config: ACMPlistModel? {
+    public func config<T: Codable>(type _: T.Type? = ACMPlistModel) -> T? {
+        guard let data = getData(), let plist = getList(with: data, type: T.self) else {
+            throwFatalError(with: ACMPropertyListSerializationError.fileNotParsed)
+            return nil
+        }
+        return plist
+    }
+
+    private func getData() -> Data? {
         guard let path = Bundle.main.path(forResource: ACMPListContants.fileName, ofType: ACMPListContants.fileExtension) else {
             throwFatalError(with: ACMPropertyListSerializationError.fileNotFound)
             return nil
         }
         let url = URL(fileURLWithPath: path)
 
         do {
-            let data = try Data(contentsOf: url)
-
-            guard let plist = getList(with: data) else {
-                throwFatalError(with: ACMPropertyListSerializationError.fileNotParsed)
-                return nil
-            }
-
-            return plist
+            return try Data(contentsOf: url)
         } catch {
             throwFatalError(with: ACMPropertyListSerializationError.dataNotAvailable)
             return nil
         }
     }
 
-    private func getList(with data: Data) -> ACMPlistModel? {
+    private func getList<T: Codable>(with data: Data, type: T.Type) -> T? {
         let decoder = PropertyListDecoder()
         do {
-            let model = try decoder.decode(ACMPlistModel.self, from: data)
-            return model
+            return try decoder.decode(T.self, from: data)
         } catch let DecodingError.dataCorrupted(context) {
             throwFatalError(with: ACMPropertyListSerializationError.dataCorrupted(context: context))
             return nil