Skip to content

Commit

Permalink
Make XLSXFile a class, not a struct (#100)
Browse files Browse the repository at this point in the history 
`XLSXFile` has a reference property of the `Archive` type, which is a class that represents an archive file handle. It would make sense to make `XLSXFile` a class to reflect its reference semantic.
  • Loading branch information
@MaxDesiatov
MaxDesiatov authored Apr 5, 2020
1 parent b58b2ce commit cdaf991
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 15 deletions.
28 changes: 14 additions & 14 deletions CoreXLSX.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
D15021CB21A1C3DF00BFA4FC /* ZIPFoundation.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = D15021C321A1C31800BFA4FC /* ZIPFoundation.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
D15021DF21A1CB0500BFA4FC /* CellReference.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_11 /* CellReference.swift */; };
D15021E021A1CB0500BFA4FC /* ColumnReference.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_12 /* ColumnReference.swift */; };
D15021E121A1CB0500BFA4FC /* CoreXLSX.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_13 /* CoreXLSX.swift */; };
D15021E121A1CB0500BFA4FC /* XLSXFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_13 /* XLSXFile.swift */; };
D15021E221A1CB0500BFA4FC /* Relationships.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_14 /* Relationships.swift */; };
D15021E321A1CB0500BFA4FC /* Worksheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_15 /* Worksheet.swift */; };
D15021E621A1CB5000BFA4FC /* ZIPFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D15021E421A1CB5000BFA4FC /* ZIPFoundation.framework */; };
Expand All @@ -27,14 +27,14 @@
D15021FA21A1D1A500BFA4FC /* ZIPFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D15021F821A1D1A500BFA4FC /* ZIPFoundation.framework */; };
D15021FB21A1D1DB00BFA4FC /* CellReference.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_11 /* CellReference.swift */; };
D15021FC21A1D1DB00BFA4FC /* ColumnReference.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_12 /* ColumnReference.swift */; };
D15021FD21A1D1DB00BFA4FC /* CoreXLSX.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_13 /* CoreXLSX.swift */; };
D15021FD21A1D1DB00BFA4FC /* XLSXFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_13 /* XLSXFile.swift */; };
D15021FE21A1D1DB00BFA4FC /* Relationships.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_14 /* Relationships.swift */; };
D15021FF21A1D1DB00BFA4FC /* Worksheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_15 /* Worksheet.swift */; };
D150220F21A1D95400BFA4FC /* XMLCoder.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D150220D21A1D95400BFA4FC /* XMLCoder.framework */; };
D150221021A1D95400BFA4FC /* ZIPFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D150220E21A1D95400BFA4FC /* ZIPFoundation.framework */; };
D150221121A1D97E00BFA4FC /* CellReference.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_11 /* CellReference.swift */; };
D150221221A1D97E00BFA4FC /* ColumnReference.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_12 /* ColumnReference.swift */; };
D150221321A1D97E00BFA4FC /* CoreXLSX.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_13 /* CoreXLSX.swift */; };
D150221321A1D97E00BFA4FC /* XLSXFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_13 /* XLSXFile.swift */; };
D150221421A1D97E00BFA4FC /* Relationships.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_14 /* Relationships.swift */; };
D150221521A1D97E00BFA4FC /* Worksheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_15 /* Worksheet.swift */; };
D15C747322CB459C0041320B /* Comments.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82AAB1C722A154A800C30F99 /* Comments.swift */; };
Expand Down Expand Up @@ -72,11 +72,11 @@
D1FD864121A1F09E00B7F8D6 /* SharedStrings.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1FD863D21A1F09E00B7F8D6 /* SharedStrings.swift */; };
OBJ_62 /* CellReference.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_11 /* CellReference.swift */; };
OBJ_63 /* ColumnReference.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_12 /* ColumnReference.swift */; };
OBJ_64 /* CoreXLSX.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_13 /* CoreXLSX.swift */; };
OBJ_64 /* XLSXFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_13 /* XLSXFile.swift */; };
OBJ_65 /* Relationships.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_14 /* Relationships.swift */; };
OBJ_66 /* Worksheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_15 /* Worksheet.swift */; };
OBJ_90 /* CellReference.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_18 /* CellReference.swift */; };
OBJ_91 /* CoreXLSX.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_19 /* CoreXLSX.swift */; };
OBJ_91 /* XLSXFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_19 /* XLSXFile.swift */; };
OBJ_92 /* Relationships.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_20 /* Relationships.swift */; };
OBJ_93 /* XCTestManifests.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_21 /* XCTestManifests.swift */; };
/* End PBXBuildFile section */
Expand Down Expand Up @@ -142,11 +142,11 @@
D1FD863D21A1F09E00B7F8D6 /* SharedStrings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharedStrings.swift; sourceTree = "<group>"; };
OBJ_11 /* CellReference.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CellReference.swift; sourceTree = "<group>"; };
OBJ_12 /* ColumnReference.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColumnReference.swift; sourceTree = "<group>"; };
OBJ_13 /* CoreXLSX.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreXLSX.swift; sourceTree = "<group>"; };
OBJ_13 /* XLSXFile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XLSXFile.swift; sourceTree = "<group>"; };
OBJ_14 /* Relationships.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Relationships.swift; sourceTree = "<group>"; };
OBJ_15 /* Worksheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Worksheet.swift; sourceTree = "<group>"; };
OBJ_18 /* CellReference.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CellReference.swift; sourceTree = "<group>"; };
OBJ_19 /* CoreXLSX.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreXLSX.swift; sourceTree = "<group>"; };
OBJ_19 /* XLSXFile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XLSXFile.swift; sourceTree = "<group>"; };
OBJ_20 /* Relationships.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Relationships.swift; sourceTree = "<group>"; };
OBJ_21 /* XCTestManifests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XCTestManifests.swift; sourceTree = "<group>"; };
OBJ_6 /* Package.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = Package.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -265,7 +265,7 @@
isa = PBXGroup;
children = (
D1A8190C21A9D107004FCA33 /* Worksheet */,
OBJ_13 /* CoreXLSX.swift */,
OBJ_13 /* XLSXFile.swift */,
OBJ_14 /* Relationships.swift */,
D1C96B7F21A806A500303975 /* Workbook.swift */,
D1FD863D21A1F09E00B7F8D6 /* SharedStrings.swift */,
Expand All @@ -290,7 +290,7 @@
children = (
D1B6A2C32297F0F3005B8A6E /* Border.swift */,
OBJ_18 /* CellReference.swift */,
OBJ_19 /* CoreXLSX.swift */,
OBJ_19 /* XLSXFile.swift */,
D12211DB227B555600888BCB /* Formula.swift */,
D1769CCA225F456300521A47 /* Namespaces.swift */,
OBJ_20 /* Relationships.swift */,
Expand Down Expand Up @@ -560,7 +560,7 @@
buildActionMask = 2147483647;
files = (
D1BBD9C7223D0E2F00B28C7B /* Styles.swift in Sources */,
D15021E121A1CB0500BFA4FC /* CoreXLSX.swift in Sources */,
D15021E121A1CB0500BFA4FC /* XLSXFile.swift in Sources */,
D1FD863F21A1F09E00B7F8D6 /* SharedStrings.swift in Sources */,
D15021DF21A1CB0500BFA4FC /* CellReference.swift in Sources */,
D1A8191221A9D4F7004FCA33 /* CellQueries.swift in Sources */,
Expand All @@ -579,7 +579,7 @@
buildActionMask = 2147483647;
files = (
D1BBD9C8223D0E2F00B28C7B /* Styles.swift in Sources */,
D15021FD21A1D1DB00BFA4FC /* CoreXLSX.swift in Sources */,
D15021FD21A1D1DB00BFA4FC /* XLSXFile.swift in Sources */,
D1FD864021A1F09E00B7F8D6 /* SharedStrings.swift in Sources */,
D15021FB21A1D1DB00BFA4FC /* CellReference.swift in Sources */,
D1A8191321A9D4F8004FCA33 /* CellQueries.swift in Sources */,
Expand All @@ -598,7 +598,7 @@
buildActionMask = 2147483647;
files = (
D1BBD9C9223D0E2F00B28C7B /* Styles.swift in Sources */,
D150221321A1D97E00BFA4FC /* CoreXLSX.swift in Sources */,
D150221321A1D97E00BFA4FC /* XLSXFile.swift in Sources */,
D1FD864121A1F09E00B7F8D6 /* SharedStrings.swift in Sources */,
D150221121A1D97E00BFA4FC /* CellReference.swift in Sources */,
D1A8191421A9D4F8004FCA33 /* CellQueries.swift in Sources */,
Expand All @@ -623,7 +623,7 @@
D1A8191121A9D4ED004FCA33 /* CellQueries.swift in Sources */,
D1A8190B21A9D0EF004FCA33 /* Cell.swift in Sources */,
D1B4F8E0221C10AC00C53C42 /* Path.swift in Sources */,
OBJ_64 /* CoreXLSX.swift in Sources */,
OBJ_64 /* XLSXFile.swift in Sources */,
OBJ_65 /* Relationships.swift in Sources */,
OBJ_66 /* Worksheet.swift in Sources */,
D1C96B8021A806A500303975 /* Workbook.swift in Sources */,
Expand All @@ -642,7 +642,7 @@
D1EB1B3421B151440043CD1E /* SharedStrings.swift in Sources */,
D1BBD9D8223D3E0E00B28C7B /* Styles.swift in Sources */,
D1A8190921A9CB89004FCA33 /* Worksheet.swift in Sources */,
OBJ_91 /* CoreXLSX.swift in Sources */,
OBJ_91 /* XLSXFile.swift in Sources */,
OBJ_92 /* Relationships.swift in Sources */,
D12211DC227B555600888BCB /* Formula.swift in Sources */,
OBJ_93 /* XCTestManifests.swift in Sources */,
Expand Down
5 changes: 4 additions & 1 deletion Sources/CoreXLSX/CoreXLSX.swift → Sources/CoreXLSX/XLSXFile.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@ public enum CoreXLSXError: Error {
case unsupportedWorksheetPath
}

public struct XLSXFile {
/** The entry point class that represents an open file handle to an existing `.xlsx` file on the
user's filesystem.
*/
public class XLSXFile {
public let filepath: String
private let archive: Archive
private let decoder: XMLDecoder
Expand Down
0 Tests/CoreXLSXTests/CoreXLSX.swift → Tests/CoreXLSXTests/XLSXFile.swift
View file
File renamed without changes.

0 comments on commit cdaf991

Please sign in to comment.