Strategies restructuring

Author: dehesa

README.md

@@ -3,9 +3,9 @@
 </p>
 
 <p align="center">
-    <img src="docs/Assets/Badges/Swift.svg" alt="Swift 5.x">
-    <img src="docs/Assets/Badges/Apple.svg" alt="macOS 10.10+ - iOS 8+ - tvOS 9+ - watchOS 2+">
-    <img src="docs/Assets/Badges/Ubuntu.svg" alt="Ubuntu 18.04">
+    <a href="https://swift.org/about/#swiftorg-and-open-source"><img src="docs/Assets/Badges/Swift.svg" alt="Swift 5.x"></a>
+    <a href="https://www.apple.com/macos"><img src="docs/Assets/Badges/Apple.svg" alt="macOS 10.10+ - iOS 8+ - tvOS 9+ - watchOS 2+"></a>
+    <a href="https://ubuntu.com"><img src="docs/Assets/Badges/Ubuntu.svg" alt="Ubuntu 18.04"></a>
     <a href="http://doge.mit-license.org"><img src="docs/Assets/Badges/License.svg" alt="MIT License"></a>
 </p>
 

sources/Active/Reader/ReaderConfiguration.swift

@@ -3,6 +3,10 @@ import Foundation
 extension CSVReader {
     /// Configuration for how to read CSV data.
     public struct Configuration {
+        /// The encoding used to identify the underlying data or `nil` if you want the CSV reader to try to figure it out.
+        ///
+        /// If no encoding is provided and the input data doesn't contain a Byte Order Marker (BOM), UTF8 is presumed.
+        public var encoding: String.Encoding?
         /// The field and row delimiters.
         public var delimiters: Delimiter.Pair
         /// The strategy to allow/disable escaped fields and how.
@@ -11,10 +15,6 @@ extension CSVReader {
         public var headerStrategy: Strategy.Header
         /// Trims the given characters at the beginning and end of each row, and between fields.
         public var trimStrategry: CharacterSet
-        /// The encoding used to identify the underlying data or `nil` if you want the CSV reader to try to figure it out.
-        ///
-        /// If no encoding is provided and the input data doesn't contain a Byte Order Marker (BOM), UTF8 is presumed.
-        public var encoding: String.Encoding?
         /// Boolean indicating whether the data/file/string should be completely parsed at reader's initialization.
         ///
         /// Setting this property to `true` samples the data/file/string at initialization time. This process returns some interesting data such as blob/file size, full-file encoding validation, etc.
@@ -23,11 +23,11 @@ extension CSVReader {
 
         /// Designated initializer setting the default values.
         public init() {
+            self.encoding = nil
             self.delimiters = (field: ",", row: "\n")
             self.escapingStrategy = .doubleQuote
             self.headerStrategy = .none
             self.trimStrategry = .init()
-            self.encoding = nil
             self.presample = false
         }
     }

sources/Active/Reader/ReaderEncodings.swift

@@ -1,5 +1,31 @@
 import Foundation
 
+internal extension CSVReader {
+    /// Select the appropriate encoding depending on the `String` encoding provided by the user and the encoding inferred from the Byte Order Marker.
+    /// - parameter provided: The user provided `String` encoding.
+    /// - parameter inferred: The `String` encoding inferred from the data Byte Order Marker.
+    /// - throws: `CSVError<CSVReader>` exclusively.
+    /// - returns: The appropriate `String.Encoding` matching from the provided and inferred values.
+    static func selectEncodingFrom(provided: String.Encoding?, inferred: String.Encoding?) throws -> String.Encoding {
+        switch (provided, inferred) {
+        case (nil, nil): return .utf8
+        case (nil, let rhs?): return rhs
+        case (let lhs?, nil): return lhs
+        case (let lhs?, let rhs?) where lhs == rhs: return lhs
+        case (let lhs?, let rhs?): // Only executes when lhs != rhs
+            switch (lhs, rhs) {
+            case (.utf16, .utf16LittleEndian),
+                 (.utf16, .utf16BigEndian),
+                 (.utf32, .utf32LittleEndian),
+                 (.utf32, .utf32BigEndian),
+                 (.unicode, .utf16LittleEndian),
+                 (.unicode, .utf16BigEndian): return rhs
+            default: throw CSVReader.Error.mismatchedEncoding(provided: lhs, inferred: rhs)
+            }
+        }
+    }
+}
+
 internal extension String.Encoding {
     /// Starts parsing the CSV file to try to figure out its encoding.
     ///
@@ -38,32 +64,6 @@ internal extension String.Encoding {
     }
 }
 
-internal extension CSVReader {
-    /// Select the appropriate encoding depending on the `String` encoding provided by the user and the encoding inferred from the Byte Order Marker.
-    /// - parameter provided: The user provided `String` encoding.
-    /// - parameter inferred: The `String` encoding inferred from the data Byte Order Marker.
-    /// - throws: `CSVError<CSVReader>` exclusively.
-    /// - returns: The appropriate `String.Encoding` matching from the provided and inferred values.
-    static func selectEncodingFrom(provided: String.Encoding?, inferred: String.Encoding?) throws -> String.Encoding {
-        switch (provided, inferred) {
-        case (nil, nil): return .utf8
-        case (nil, let rhs?): return rhs
-        case (let lhs?, nil): return lhs
-        case (let lhs?, let rhs?) where lhs == rhs: return lhs
-        case (let lhs?, let rhs?): // Only executes when lhs != rhs
-            switch (lhs, rhs) {
-            case (.utf16, .utf16LittleEndian),
-                 (.utf16, .utf16BigEndian),
-                 (.utf32, .utf32LittleEndian),
-                 (.utf32, .utf32BigEndian),
-                 (.unicode, .utf16LittleEndian),
-                 (.unicode, .utf16BigEndian): return rhs
-            default: throw CSVReader.Error.mismatchedEncoding(provided: lhs, inferred: rhs)
-            }
-        }
-    }
-}
-
 fileprivate extension String.Encoding {
     /// Creates an encoding if the data return by `dataFetcher` contains BOM bytes.
     /// - parameter unusedBytes: The input data bytes that have been read, but are not part from the BOM.