Resolved the string export issue in Swift 5.

vigneshuvi · Mar 11, 2020 · 47a2c1e · 47a2c1e
1 parent 8e1f5bf
commit 47a2c1e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/Examples/MacOS/SampleMacSwift/Podfile b/Examples/MacOS/SampleMacSwift/Podfile
@@ -7,7 +7,7 @@ target 'SampleMacSwift' do
   pod 'SwiftLoggly’
   # pod 'SwiftCSVExport'
 
-   pod 'SwiftCSVExport', :git => 'https://github.com/vigneshuvi/SwiftCSVExport.git', :tag => '2.1.0'
+   pod 'SwiftCSVExport', :git => 'https://github.com/vigneshuvi/SwiftCSVExport.git', :tag => '2.3.0'
 
   # Pods for SampleMacSwift
 

diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ Supported swift 4, 4.2 and 5 and latest Xcode
 
 pod 'SwiftCSVExport' , '= 2.0.2' // Swift 4
 pod 'SwiftCSVExport' , '= 2.0.3' // Swift 4.2
-pod 'SwiftCSVExport' , '= 2.2.0' // Swift 5
+pod 'SwiftCSVExport' , '= 2.3.0' // Swift 5
 
 
 ```

diff --git a/Sources/CSVConstants.swift b/Sources/CSVConstants.swift
@@ -105,10 +105,11 @@ extension String {
     func formatCSVRow(_ div:String, value:Any) -> String {
         if let string = value as? String {
             // Wrap around double quotes
-            let fString = "\(string)"
-            return self.length == 0 ? fString  : "\(self)\(div)\(fString)"
+            let doubleQuotes = "'"
+            let fString = doubleQuotes+"\(string)"+doubleQuotes
+            return self.length == 0 ? fString  : "\(self)\(div)  \(string)"
         } else {
-            return self.length == 0 ? "\(value)" : "\(self)\(div)\(value)"
+            return self.length == 0 ? "\(value)" : "\(self)\(div)  \(value)"
         }
     }
 

diff --git a/SwiftCSVExport/Sources/CSVConstants.swift b/SwiftCSVExport/Sources/CSVConstants.swift
@@ -105,10 +105,12 @@ extension String {
     func formatCSVRow(_ div:String, value:Any) -> String {
         if let string = value as? String {
             // Wrap around double quotes
-            let fString = "\(string)"
-            return self.length == 0 ? fString  : "\(self)\(div)\(fString)"
+            let doubleQuotes = "'"
+
+            let fString = doubleQuotes+"\(string)"+doubleQuotes
+            return self.length == 0 ? fString  : "\(self)\(div)  \(string)"
         } else {
-            return self.length == 0 ? "\(value)" : "\(self)\(div)\(value)"
+            return self.length == 0 ? "\(value)" : "\(self)\(div)  \(value)"
         }
     }