Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Generic CSV views #76

Merged
merged 26 commits into from
Jul 1, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
eb0aab0
make CSV generic over View
DivineDominion Apr 26, 2019
e2836c7
clean up public interface, adding documentation
DivineDominion Oct 25, 2016
8a40f76
Merge origin/master into generic-views
DivineDominion Jun 25, 2019
9758451
Merge master into generic-views
DivineDominion Aug 21, 2019
c5738a9
Merge master into generic-views
DivineDominion Aug 21, 2019
61d9e59
Merge v0.5.6 into generic-views
DivineDominion Jun 4, 2020
05b1e16
add more newline tests
DivineDominion Jun 4, 2020
8c65a81
fix typo
DivineDominion Jun 4, 2020
a8af063
fix missing cells at end of enumerated rows
DivineDominion Jun 4, 2020
95a52c2
Merge v0.6.1 into generic-views
DivineDominion Nov 22, 2021
ff8a4bd
drop "View" from NamedView/EnumeratedView
DivineDominion Nov 22, 2021
1650273
add tearDown
DivineDominion Nov 22, 2021
f52ef2c
remove deprecated initializer
DivineDominion Nov 22, 2021
d1343d4
rename parameter to "named" to fit NSImage.init
DivineDominion Nov 22, 2021
8c9d66e
respect row limit during parsing
DivineDominion Nov 22, 2021
d782490
add Podspec and Package.swift to Xcode project
DivineDominion Nov 22, 2021
0f8cdf1
rename test file
DivineDominion Nov 22, 2021
4dc2e56
rename test files to match implementation
DivineDominion Jul 1, 2022
7a83fb2
Merge v0.7.0 into generic-views
DivineDominion Jul 1, 2022
2d73697
Make tests 'throwing' so they don't cause an exception
DivineDominion Jul 1, 2022
b641951
fix test
DivineDominion Jul 1, 2022
ef13878
rename "Delimiter" to "CSVDelimiter" (cannot nest in generic CSV<T>)
DivineDominion Jul 1, 2022
79a6225
update README for merged code
DivineDominion Jul 1, 2022
3d56b8a
make column loading optional to reflect the saving from README
DivineDominion Jul 1, 2022
a84ef0d
delete unused file artifacts after merging
DivineDominion Jul 1, 2022
435e558
add semicolon delimiter guessing case reported as error
DivineDominion Jul 1, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
drop "View" from NamedView/EnumeratedView
  • Loading branch information
DivineDominion committed Nov 22, 2021
commit ff8a4bd5c84f6b715f9dc5ab8311558ba7f30562
56 changes: 28 additions & 28 deletions SwiftCSV.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,25 @@

/* Begin PBXBuildFile section */
3D1E59C01945FFAD001CF760 /* SwiftCSV.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D1E59B41945FFAC001CF760 /* SwiftCSV.framework */; };
3D1E59C71945FFAD001CF760 /* CSVTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D1E59C61945FFAD001CF760 /* CSVTests.swift */; };
3D1E59C71945FFAD001CF760 /* NamedViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D1E59C61945FFAD001CF760 /* NamedViewTests.swift */; };
3D3749E3194D6DF7008F262A /* TSVTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D3749E2194D6DF7008F262A /* TSVTests.swift */; };
3D444BCD1C7D88290001C60C /* String+Lines.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D444BCC1C7D88290001C60C /* String+Lines.swift */; };
3DAAEE9C1C74C7EC00A933DB /* CSV.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3DAAEE9B1C74C7EC00A933DB /* CSV.swift */; };
5015AD8A274BA20A0050F975 /* ParserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5015AD89274BA20A0050F975 /* ParserTests.swift */; };
5015AD8B274BA20A0050F975 /* ParserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5015AD89274BA20A0050F975 /* ParserTests.swift */; };
5015AD8C274BA20A0050F975 /* ParserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5015AD89274BA20A0050F975 /* ParserTests.swift */; };
508975D21DBB897A006F3DBE /* NamedView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 508975D11DBB897A006F3DBE /* NamedView.swift */; };
508975D31DBB897A006F3DBE /* NamedView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 508975D11DBB897A006F3DBE /* NamedView.swift */; };
508975D41DBB897A006F3DBE /* NamedView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 508975D11DBB897A006F3DBE /* NamedView.swift */; };
508975D51DBB897A006F3DBE /* NamedView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 508975D11DBB897A006F3DBE /* NamedView.swift */; };
508975D21DBB897A006F3DBE /* NamedCSVView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 508975D11DBB897A006F3DBE /* NamedCSVView.swift */; };
508975D31DBB897A006F3DBE /* NamedCSVView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 508975D11DBB897A006F3DBE /* NamedCSVView.swift */; };
508975D41DBB897A006F3DBE /* NamedCSVView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 508975D11DBB897A006F3DBE /* NamedCSVView.swift */; };
508975D51DBB897A006F3DBE /* NamedCSVView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 508975D11DBB897A006F3DBE /* NamedCSVView.swift */; };
508975D71DBF34CF006F3DBE /* ParsingState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 508975D61DBF34CF006F3DBE /* ParsingState.swift */; };
508975D81DBF34CF006F3DBE /* ParsingState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 508975D61DBF34CF006F3DBE /* ParsingState.swift */; };
508975D91DBF34CF006F3DBE /* ParsingState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 508975D61DBF34CF006F3DBE /* ParsingState.swift */; };
508975DA1DBF34CF006F3DBE /* ParsingState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 508975D61DBF34CF006F3DBE /* ParsingState.swift */; };
508975DC1DBF3B70006F3DBE /* EnumeratedView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 508975DB1DBF3B70006F3DBE /* EnumeratedView.swift */; };
508975DD1DBF3B70006F3DBE /* EnumeratedView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 508975DB1DBF3B70006F3DBE /* EnumeratedView.swift */; };
508975DE1DBF3B70006F3DBE /* EnumeratedView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 508975DB1DBF3B70006F3DBE /* EnumeratedView.swift */; };
508975DF1DBF3B70006F3DBE /* EnumeratedView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 508975DB1DBF3B70006F3DBE /* EnumeratedView.swift */; };
508975DC1DBF3B70006F3DBE /* EnumeratedCSVView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 508975DB1DBF3B70006F3DBE /* EnumeratedCSVView.swift */; };
508975DD1DBF3B70006F3DBE /* EnumeratedCSVView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 508975DB1DBF3B70006F3DBE /* EnumeratedCSVView.swift */; };
508975DE1DBF3B70006F3DBE /* EnumeratedCSVView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 508975DB1DBF3B70006F3DBE /* EnumeratedCSVView.swift */; };
508975DF1DBF3B70006F3DBE /* EnumeratedCSVView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 508975DB1DBF3B70006F3DBE /* EnumeratedCSVView.swift */; };
508975E11DBF3E51006F3DBE /* EnumeratedViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 508975E01DBF3E51006F3DBE /* EnumeratedViewTests.swift */; };
508975E21DBF3E51006F3DBE /* EnumeratedViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 508975E01DBF3E51006F3DBE /* EnumeratedViewTests.swift */; };
508975E31DBF3E51006F3DBE /* EnumeratedViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 508975E01DBF3E51006F3DBE /* EnumeratedViewTests.swift */; };
Expand All @@ -44,12 +44,12 @@
5FB74BDB1CCB92F1009DDBF1 /* CSV.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3DAAEE9B1C74C7EC00A933DB /* CSV.swift */; };
5FB74BDC1CCB92F1009DDBF1 /* String+Lines.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D444BCC1C7D88290001C60C /* String+Lines.swift */; };
5FB74BDF1CCB92F1009DDBF1 /* Parser.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE9B02D71CBE57B8009FE424 /* Parser.swift */; };
5FB74BE01CCB9312009DDBF1 /* CSVTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D1E59C61945FFAD001CF760 /* CSVTests.swift */; };
5FB74BE01CCB9312009DDBF1 /* NamedViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D1E59C61945FFAD001CF760 /* NamedViewTests.swift */; };
5FB74BE11CCB9312009DDBF1 /* QuotedTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE6C86061CB5CE44009A351D /* QuotedTests.swift */; };
5FB74BE21CCB9312009DDBF1 /* TSVTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D3749E2194D6DF7008F262A /* TSVTests.swift */; };
5FB74BE31CCB9312009DDBF1 /* URLTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE06B67F1CB726B5009578CC /* URLTests.swift */; };
5FB74BE41CCB9312009DDBF1 /* PerformanceTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = E46085931CCB1F5C00385286 /* PerformanceTest.swift */; };
5FB74BE51CCB931F009DDBF1 /* CSVTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D1E59C61945FFAD001CF760 /* CSVTests.swift */; };
5FB74BE51CCB931F009DDBF1 /* NamedViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D1E59C61945FFAD001CF760 /* NamedViewTests.swift */; };
5FB74BE61CCB931F009DDBF1 /* QuotedTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE6C86061CB5CE44009A351D /* QuotedTests.swift */; };
5FB74BE71CCB931F009DDBF1 /* TSVTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D3749E2194D6DF7008F262A /* TSVTests.swift */; };
5FB74BE81CCB931F009DDBF1 /* URLTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE06B67F1CB726B5009578CC /* URLTests.swift */; };
Expand Down Expand Up @@ -106,16 +106,16 @@
/* Begin PBXFileReference section */
3D1E59B41945FFAC001CF760 /* SwiftCSV.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftCSV.framework; sourceTree = BUILT_PRODUCTS_DIR; };
3D1E59BF1945FFAD001CF760 /* SwiftCSVTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SwiftCSVTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
3D1E59C61945FFAD001CF760 /* CSVTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CSVTests.swift; sourceTree = "<group>"; };
3D1E59C61945FFAD001CF760 /* NamedViewTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NamedViewTests.swift; sourceTree = "<group>"; };
3D3749E2194D6DF7008F262A /* TSVTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TSVTests.swift; sourceTree = "<group>"; };
3D444BCC1C7D88290001C60C /* String+Lines.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+Lines.swift"; sourceTree = "<group>"; };
3DAAEE9B1C74C7EC00A933DB /* CSV.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = CSV.swift; sourceTree = "<group>"; tabWidth = 4; };
5015AD89274BA20A0050F975 /* ParserTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParserTests.swift; sourceTree = "<group>"; };
5034F4712272E0DC001C02D1 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
5034F4722272E0E4001C02D1 /* LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
508975D11DBB897A006F3DBE /* NamedView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NamedView.swift; sourceTree = "<group>"; };
508975D11DBB897A006F3DBE /* NamedCSVView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NamedCSVView.swift; sourceTree = "<group>"; };
508975D61DBF34CF006F3DBE /* ParsingState.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ParsingState.swift; sourceTree = "<group>"; };
508975DB1DBF3B70006F3DBE /* EnumeratedView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EnumeratedView.swift; sourceTree = "<group>"; };
508975DB1DBF3B70006F3DBE /* EnumeratedCSVView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EnumeratedCSVView.swift; sourceTree = "<group>"; };
508975E01DBF3E51006F3DBE /* EnumeratedViewTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EnumeratedViewTests.swift; sourceTree = "<group>"; };
50A2B23324894DC900B168A9 /* NewlineTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewlineTests.swift; sourceTree = "<group>"; };
50F241A4274BB8DB00520A69 /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = "<group>"; };
Expand Down Expand Up @@ -222,8 +222,8 @@
isa = PBXGroup;
children = (
3DAAEE9B1C74C7EC00A933DB /* CSV.swift */,
508975D11DBB897A006F3DBE /* NamedView.swift */,
508975DB1DBF3B70006F3DBE /* EnumeratedView.swift */,
508975D11DBB897A006F3DBE /* NamedCSVView.swift */,
508975DB1DBF3B70006F3DBE /* EnumeratedCSVView.swift */,
3D444BCC1C7D88290001C60C /* String+Lines.swift */,
BE9B02D71CBE57B8009FE424 /* Parser.swift */,
508975D61DBF34CF006F3DBE /* ParsingState.swift */,
Expand All @@ -235,7 +235,7 @@
isa = PBXGroup;
children = (
BE06B67E1CB72680009578CC /* Res */,
3D1E59C61945FFAD001CF760 /* CSVTests.swift */,
3D1E59C61945FFAD001CF760 /* NamedViewTests.swift */,
508975E01DBF3E51006F3DBE /* EnumeratedViewTests.swift */,
50A2B23324894DC900B168A9 /* NewlineTests.swift */,
BE6C86061CB5CE44009A351D /* QuotedTests.swift */,
Expand Down Expand Up @@ -553,10 +553,10 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
508975D21DBB897A006F3DBE /* NamedView.swift in Sources */,
508975D21DBB897A006F3DBE /* NamedCSVView.swift in Sources */,
3DAAEE9C1C74C7EC00A933DB /* CSV.swift in Sources */,
BE9B02D81CBE57B8009FE424 /* Parser.swift in Sources */,
508975DC1DBF3B70006F3DBE /* EnumeratedView.swift in Sources */,
508975DC1DBF3B70006F3DBE /* EnumeratedCSVView.swift in Sources */,
508975D71DBF34CF006F3DBE /* ParsingState.swift in Sources */,
3D444BCD1C7D88290001C60C /* String+Lines.swift in Sources */,
);
Expand All @@ -567,7 +567,7 @@
buildActionMask = 2147483647;
files = (
E46085941CCB1F5C00385286 /* PerformanceTest.swift in Sources */,
3D1E59C71945FFAD001CF760 /* CSVTests.swift in Sources */,
3D1E59C71945FFAD001CF760 /* NamedViewTests.swift in Sources */,
50A2B23424894DC900B168A9 /* NewlineTests.swift in Sources */,
F5C19F502283243C00920B06 /* ResourceHelper.swift in Sources */,
508975E11DBF3E51006F3DBE /* EnumeratedViewTests.swift in Sources */,
Expand All @@ -582,10 +582,10 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
508975D31DBB897A006F3DBE /* NamedView.swift in Sources */,
508975D31DBB897A006F3DBE /* NamedCSVView.swift in Sources */,
5FB74BD11CCB92E5009DDBF1 /* CSV.swift in Sources */,
5FB74BD21CCB92E5009DDBF1 /* String+Lines.swift in Sources */,
508975DD1DBF3B70006F3DBE /* EnumeratedView.swift in Sources */,
508975DD1DBF3B70006F3DBE /* EnumeratedCSVView.swift in Sources */,
508975D81DBF34CF006F3DBE /* ParsingState.swift in Sources */,
5FB74BD51CCB92E5009DDBF1 /* Parser.swift in Sources */,
);
Expand All @@ -595,7 +595,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
5FB74BE01CCB9312009DDBF1 /* CSVTests.swift in Sources */,
5FB74BE01CCB9312009DDBF1 /* NamedViewTests.swift in Sources */,
5FB74BE11CCB9312009DDBF1 /* QuotedTests.swift in Sources */,
50A2B23524894DC900B168A9 /* NewlineTests.swift in Sources */,
F5C19F512283C0C100920B06 /* ResourceHelper.swift in Sources */,
Expand All @@ -611,10 +611,10 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
508975D41DBB897A006F3DBE /* NamedView.swift in Sources */,
508975D41DBB897A006F3DBE /* NamedCSVView.swift in Sources */,
5FB74BD61CCB92EB009DDBF1 /* CSV.swift in Sources */,
5FB74BD71CCB92EB009DDBF1 /* String+Lines.swift in Sources */,
508975DE1DBF3B70006F3DBE /* EnumeratedView.swift in Sources */,
508975DE1DBF3B70006F3DBE /* EnumeratedCSVView.swift in Sources */,
508975D91DBF34CF006F3DBE /* ParsingState.swift in Sources */,
5FB74BDA1CCB92EB009DDBF1 /* Parser.swift in Sources */,
);
Expand All @@ -624,7 +624,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
5FB74BE51CCB931F009DDBF1 /* CSVTests.swift in Sources */,
5FB74BE51CCB931F009DDBF1 /* NamedViewTests.swift in Sources */,
5FB74BE61CCB931F009DDBF1 /* QuotedTests.swift in Sources */,
50A2B23624894DC900B168A9 /* NewlineTests.swift in Sources */,
F5C19F522283C0C300920B06 /* ResourceHelper.swift in Sources */,
Expand All @@ -640,10 +640,10 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
508975D51DBB897A006F3DBE /* NamedView.swift in Sources */,
508975D51DBB897A006F3DBE /* NamedCSVView.swift in Sources */,
5FB74BDB1CCB92F1009DDBF1 /* CSV.swift in Sources */,
5FB74BDC1CCB92F1009DDBF1 /* String+Lines.swift in Sources */,
508975DF1DBF3B70006F3DBE /* EnumeratedView.swift in Sources */,
508975DF1DBF3B70006F3DBE /* EnumeratedCSVView.swift in Sources */,
508975DA1DBF34CF006F3DBE /* ParsingState.swift in Sources */,
5FB74BDF1CCB92F1009DDBF1 /* Parser.swift in Sources */,
);
Expand Down
4 changes: 2 additions & 2 deletions SwiftCSV/CSV.swift
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ public protocol CSVView {
/// let firstEntry = csv.rows[0]
/// let fullName = firstEntry["firstName"] + " " + firstEntry["lastName"]
///
public typealias NamedCSV = CSV<NamedView>
public typealias NamedCSV = CSV<Named>

/// CSV variant that exposes columns and rows as arrays.
/// Example:
///
/// let csv = EnumeratedCSV(...)
/// let allIds = csv.columns.filter { $0.header == "id" }.rows
///
public typealias EnumeratedCSV = CSV<EnumeratedView>
public typealias EnumeratedCSV = CSV<Enumerated>

open class CSV<DataView : CSVView> {
public static var comma: Character { return "," }
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// EnumeratedView.swift
// EnumeratedCSVView.swift
// SwiftCSV
//
// Created by Christian Tietze on 25/10/16.
Expand All @@ -8,7 +8,7 @@

import Foundation

public struct EnumeratedView: CSVView {
public struct Enumerated: CSVView {

public struct Column {
public let header: String
Expand All @@ -22,7 +22,7 @@ public struct EnumeratedView: CSVView {

public init(header: [String], text: String, delimiter: Character, loadColumns: Bool = false) throws {
var rows = [[String]]()
var columns: [EnumeratedView.Column] = []
var columns: [Enumerated.Column] = []

try Parser.enumerateAsArray(text: text, delimiter: delimiter, startAt: 1) { fields in
rows.append(fields)
Expand All @@ -32,8 +32,8 @@ public struct EnumeratedView: CSVView {
rows = makingRectangular(rows: rows)

if loadColumns {
columns = header.enumerated().map { (index: Int, header: String) -> EnumeratedView.Column in
return EnumeratedView.Column(
columns = header.enumerated().map { (index: Int, header: String) -> Enumerated.Column in
return Enumerated.Column(
header: header,
rows: rows.map { $0[safe: index] ?? "" })
}
Expand Down
4 changes: 2 additions & 2 deletions SwiftCSV/NamedView.swift → SwiftCSV/NamedCSVView.swift
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
//
// NamedView.swift
// NamedCSVView.swift
// SwiftCSV
//
// Created by Christian Tietze on 22/10/16.
// Copyright © 2016 Naoto Kaneko. All rights reserved.
//

public struct NamedView: CSVView {
public struct Named: CSVView {

public typealias Row = [String : String]

Expand Down
8 changes: 4 additions & 4 deletions SwiftCSVTests/EnumeratedViewTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ import XCTest

class EnumeratedViewTests: XCTestCase {

var csv: CSV<EnumeratedView>!
var csv: CSV<Enumerated>!

override func setUp() {
super.setUp()

csv = try! CSV<EnumeratedView>(string: "id,name,age\n1,Alice,18\n2,Bob,19\n3,Charlie,20", delimiter: ",", loadColumns: true)
csv = try! CSV<Enumerated>(string: "id,name,age\n1,Alice,18\n2,Bob,19\n3,Charlie,20", delimiter: ",", loadColumns: true)
}

func testInit_whenThereAreIncompleteRows_makesRows() throws {
csv = try CSV<EnumeratedView>(string: "id,name,age\n1,Alice,18\n2\n3,Charlie", delimiter: ",", loadColumns: true)
csv = try CSV<Enumerated>(string: "id,name,age\n1,Alice,18\n2\n3,Charlie", delimiter: ",", loadColumns: true)
let expected = [
["1", "Alice", "18"],
["2", "", ""],
Expand Down Expand Up @@ -74,7 +74,7 @@ class EnumeratedViewTests: XCTestCase {
}

func testSerializationWithDoubleQuotes() {
csv = try! CSV<EnumeratedView>(string: "id,\"the, name\",age\n1,\"Alice, In, Wonderland\",18\n2,Bob,19\n3,Charlie,20")
csv = try! CSV<Enumerated>(string: "id,\"the, name\",age\n1,\"Alice, In, Wonderland\",18\n2,Bob,19\n3,Charlie,20")
XCTAssertEqual(csv.serialized, "id,\"the, name\",age\n1,\"Alice, In, Wonderland\",18\n2,Bob,19\n3,Charlie,20")
}
}
Loading