Merge pull request #14 from KeanuPang/feature/update_parsing_values

Trimming trailing whitespace for values; remove escape double quotes

Sources/Environment.swift

@@ -52,7 +52,8 @@ public struct Environment {
             } else if let integerValue = Int(stringValue) {
                 self = .integer(integerValue)
             } else {
-                self = .string(stringValue)
+                // replace escape double quotes
+                self = .string(stringValue.trimmingCharacters(in: .init(charactersIn: "\"")).replacingOccurrences(of: "\\\"", with: "\""))
             }
         }
 
@@ -180,12 +181,16 @@ public struct Environment {
         // we loop over all the entries in the file which are already separated by a newline
         var values: OrderedDictionary<String, Value> = .init()
         for line in lines {
+            // ignore comments
+            if line.starts(with: "#") {
+                continue
+            }
             // split by the delimeter
             let substrings = line.split(separator: Self.delimeter)
             // make sure we can grab two and only two string values
             guard
-                let key = substrings.first,
-                let value = substrings.last,
+                let key = substrings.first?.trimmingCharacters(in: .whitespacesAndNewlines),
+                let value = substrings.last?.trimmingCharacters(in: .whitespacesAndNewlines),
                 substrings.count == 2,
                 !key.isEmpty,
                 !value.isEmpty else {

Tests/DotenvTests.swift

@@ -36,6 +36,9 @@ final class DotenvTests: XCTestCase {
         print(env.values)
         XCTAssertEqual(env.apiKey, .string("some-value"))
         XCTAssertEqual(env.buildNumber, .integer(5))
+        XCTAssertEqual(env.identifier, .string("com.app.example"))
+        XCTAssertEqual(env.mailTemplate, .string("The \"Quoted\" Title"))
+        XCTAssertEqual(env.dbPassphrase, .string("1qaz?#@\"' wsx$"))
         XCTAssertNil(env.nonExistentValue)
     }
 

Tests/Resources/fixture.env

@@ -1,2 +1,5 @@
 API_KEY=some-value
 BUILD_NUMBER=5
+IDENTIFIER="com.app.example"
+MAIL_TEMPLATE="The "Quoted" Title"
+DB_PASSPHRASE="1qaz?#@"' wsx$"