Add custom configuration objects

Author: mczachurski

Sources/ExtendedConfiguration/Application+Settings.swift

@@ -24,10 +24,10 @@ extension Application {
         }
 
         public struct Configuration {
-            public var items: [String: Any] = [:]
-            
-            public mutating func appendOrReplace(key: String, value: Any) {
-                self.items[key] = value
+            internal var items: [String: Any] = [:]
+                        
+            public subscript(index: String) -> Any? {
+                self.items[index]
             }
         }
 
@@ -63,7 +63,7 @@ extension Application {
                 }
 
                 jsonObject.forEach { (key: String, value: Any) in
-                    self.append(jsonKey: key, jsonValue: value)
+                    self.set(value, forKey: key)
                 }
 
                 break
@@ -73,27 +73,49 @@ extension Application {
                 case .withPrefix(let prefix):
                     ProcessInfo.processInfo.environment.forEach { (key: String, value: String) in
                         if key.starts(with: prefix) {
-                            self.configuration.appendOrReplace(key: key, value: value)
+                            self.configuration.items[key] = value
                         }
                     }
                 default:
                     ProcessInfo.processInfo.environment.forEach { (key: String, value: String) in
-                        self.configuration.appendOrReplace(key: key, value: value)
+                        self.configuration.items[key] = value
                     }
                 }
 
                 break
             }
         }
-        
-        private func append(jsonKey: String, jsonValue: Any) {
-            if let jsonObject = jsonValue as? [String: Any] {
+
+        public func set(_ setting: Any, forKey jsonKey: String) {
+            if let jsonObject = setting as? [String: Any] {
                 jsonObject.forEach { (key: String, value: Any) in
-                    self.append(jsonKey: jsonKey + "." + key, jsonValue: value)
+                    self.set(value, forKey: jsonKey + "." + key)
                 }
             } else {
-                self.configuration.appendOrReplace(key: jsonKey, value: jsonValue)
+                self.configuration.items[jsonKey] = setting
+            }
+        }
+        
+        public func set<T>(_ setting: Any, for type: T.Type) {
+            let key = String(describing: T.self)
+            self.set(setting, forKey: key)
+        }
+
+        public func get<T>(_ type: T.Type) -> T? {
+            let key = String(describing: T.self)
+            return self.get(type, for: key)
+        }
+        
+        public func get<T>(_ type: T.Type, for key: String) -> T? {
+            return self.configuration.items[key] as? T
+        }
+
+        public func get<T>(_ type: T.Type, for key: String, withDefault defaultValue: T) -> T? {
+            if let value = self.configuration.items[key] as? T {
+                return value
             }
+            
+            return defaultValue
         }
 
         public func getString(for key: String) -> String? {

Tests/ExtendedConfigurationTests/AppModel.swift

@@ -0,0 +1,4 @@
+internal struct AppModel {
+    var name: String
+    var version: String
+}

Tests/ExtendedConfigurationTests/ExtendedConfigurationTests.swift

@@ -62,6 +62,36 @@ final class ExtendedConfigurationTests: XCTestCase {
         XCTAssertEqual("stringValue03", app.settings.getString(for: "group02.key03"))
         XCTAssertEqual(321, app.settings.getInt(for: "group02.key04"))
     }
+    
+    func testCustomConfigurationShouldBeReturnedForKey() throws {
+        // Arrange.
+        try createSettingsFile(fileName: "configuration.json")
+        let app = Application(.testing)
+        defer { app.shutdown() }
+
+        // Act.
+        app.settings.set(AppModel(name: "name01", version: "1.0.0"), forKey: "customkey")
+        let appModel = app.settings.get(AppModel.self, for: "customkey")
+        
+        // Assert.
+        XCTAssertEqual("name01", appModel?.name)
+        XCTAssertEqual("1.0.0", appModel?.version)
+    }
+    
+    func testCustomConfigurationShouldBeReturnedForType() throws {
+        // Arrange.
+        try createSettingsFile(fileName: "configuration.json")
+        let app = Application(.testing)
+        defer { app.shutdown() }
+
+        // Act.
+        app.settings.set(AppModel(name: "name02", version: "2.0.0"), for: AppModel.self)
+        let appModel = app.settings.get(AppModel.self)
+        
+        // Assert.
+        XCTAssertEqual("name02", appModel?.name)
+        XCTAssertEqual("2.0.0", appModel?.version)
+    }
 
     private func createSettingsFile(fileName: String) throws {
         let content = """