Trimming trailing whitespace for values; remove escape double quotes

thebarndog · May 18, 2022 · 7f482b3 · 7f482b3
1 parent 9d897f3
commit 7f482b3
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/Sources/Environment.swift b/Sources/Environment.swift
@@ -52,7 +52,14 @@ public struct Environment {
             } else if let integerValue = Int(stringValue) {
                 self = .integer(integerValue)
             } else {
-                self = .string(stringValue)
+                // replace escape double quotes
+                var value = stringValue
+                if value[value.startIndex] == "\"" && value[value.index(before: value.endIndex)] == "\"" {
+                    value.remove(at: value.startIndex)
+                    value.remove(at: value.index(before: value.endIndex))
+                    value = value.replacingOccurrences(of: "\\\"", with: "\"")
+                }
+                self = .string(value)
             }
         }
 
@@ -177,12 +184,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 {

diff --git a/Tests/DotenvTests.swift b/Tests/DotenvTests.swift
@@ -35,6 +35,8 @@ final class DotenvTests: XCTestCase {
         let env = try Dotenv.load(path: path)
         XCTAssertEqual(env.key1, .string("value1"))
         XCTAssertEqual(env.key2, .string("value2"))
+        XCTAssertEqual(env.key3, .string("value3"))
+        XCTAssertEqual(env.key4, .string("quoted value"))
         XCTAssertNil(env.nonExistentValue)
     }
 

diff --git a/Tests/Resources/fixture.env b/Tests/Resources/fixture.env
@@ -1,2 +1,5 @@
 key1=value1
 key2=value2
+# variable with trailing whitespace
+key3=value3    
+key4="quoted value"