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.

Sign up for GitHub

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

Fix decoding of empty sequences #98

Merged
merged 2 commits into from
May 2, 2019
Merged

Fix decoding of empty sequences #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5af6e3
Fix decoding of empty sequences
MaxDesiatov May 2, 2019
9c3f4ae
Merge branch 'master' into empty-sequence
MaxDesiatov May 2, 2019
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
8 changes: 8 additions & 0 deletions Sources/XMLCoder/Decoder/XMLKeyedDecodingContainer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,14 @@ extension XMLKeyedDecodingContainer {
decoder.codingPath.removeLast()
}
let box: Box

// You can't decode sequences from attributes, but other strategies
// need special handling for empty sequences.
if strategy(key) != .attribute && elementOrNil == nil,
let empty = (type as? AnyEmptySequence.Type)?.init() as? T {
return empty
}

switch strategy(key) {
case .attribute:
guard
Expand Down
179 changes: 176 additions & 3 deletions Tests/XMLCoderTests/NamespaceTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import Foundation
import XCTest
@testable import XMLCoder

private let xmlData = """
private let tableXML = """
<h:table xmlns:h="http://www.w3.org/TR/html4/">
<h:tr>
<h:td>Apples</h:td>
Expand All @@ -26,13 +26,186 @@ private struct Table: Codable, Equatable {
let tr: [TR]
}

private let worksheetXML = """
<?xml version="1.0" encoding="utf-8"?>
<x:worksheet \
xmlns:x="http://schemas.openxmlformats.org/spreadsheetml/2006/main">
<x:sheetData>
<x:row r="1">
<x:c t="str" r="A1">
<x:v>column name</x:v>
</x:c>
<x:c t="str" r="B1">
<x:v>column name</x:v>
</x:c>
<x:c t="str" r="C1">
<x:v>column name</x:v>
</x:c>
<x:c t="str" r="D1">
<x:v>column name</x:v>
</x:c>
<x:c t="str" r="E1">
<x:v>column name</x:v>
</x:c>
<x:c t="str" r="F1">
<x:v>column name</x:v>
</x:c>
<x:c t="str" r="G1">
<x:v>column name</x:v>
</x:c>
<x:c t="str" r="H1">
<x:v>column name</x:v>
</x:c>
<x:c t="str" r="I1">
<x:v>column name</x:v>
</x:c>
<x:c t="str" r="J1">
<x:v>column name</x:v>
</x:c>
<x:c t="str" r="K1">
<x:v>column name</x:v>
</x:c>
<x:c t="str" r="L1">
<x:v>column name</x:v>
</x:c>
<x:c t="str" r="M1">
<x:v>column name</x:v>
</x:c>
<x:c t="str" r="N1">
<x:v>column name</x:v>
</x:c>
<x:c t="str" r="O1">
<x:v>column name</x:v>
</x:c>
<x:c t="str" r="P1">
<x:v>column name</x:v>
</x:c>
<x:c t="str" r="Q1">
<x:v>column name</x:v>
</x:c>
<x:c t="str" r="R1">
<x:v>column name</x:v>
</x:c>
<x:c t="str" r="S1">
<x:v>column name</x:v>
</x:c>
<x:c t="str" r="T1">
<x:v>column name</x:v>
</x:c>
<x:c t="str" r="U1">
<x:v>column name</x:v>
</x:c>
<x:c t="str" r="V1">
<x:v>Scolumn name</x:v>
</x:c>
<x:c t="str" r="W1">
<x:v>column name</x:v>
</x:c>
<x:c t="str" r="X1">
<x:v>column name</x:v>
</x:c>
<x:c t="str" r="Y1">
<x:v>column name</x:v>
</x:c>
<x:c t="str" r="Z1">
<x:v>column name</x:v>
</x:c>
<x:c t="str" r="AA1">
<x:v>column name</x:v>
</x:c>
<x:c t="str" r="AB1">
<x:v>column name</x:v>
</x:c>
<x:c t="str" r="AC1">
<x:v>column name</x:v>
</x:c>
<x:c t="str" r="AD1">
<x:v>column name</x:v>
</x:c>
<x:c t="str" r="AE1">
<x:v>column name</x:v>
</x:c>
<x:c t="str" r="AF1">
<x:v>column name</x:v>
</x:c>
<x:c t="str" r="AG1">
<x:v>column name</x:v>
</x:c>
<x:c t="str" r="AH1">
<x:v>column name</x:v>
</x:c>
<x:c t="str" r="AI1">
<x:v>column name</x:v>
</x:c>
<x:c t="str" r="AJ1">
<x:v>column name</x:v>
</x:c>
</x:row>
<x:row r="2">
</x:row>
</x:sheetData>
</x:worksheet>
""".data(using: .utf8)!

private struct Cell: Codable, Equatable {
let type: String?
let s: String?
let formula: String?
let value: String?

enum CodingKeys: String, CodingKey {
case formula = "f"
case value = "v"
case type = "t"
case s
}
}

private struct Worksheet: Codable {
struct Data: Codable {
public let rows: [Row]

enum CodingKeys: String, CodingKey {
case rows = "row"
}
}

let data: Data?

enum CodingKeys: String, CodingKey {
case data = "sheetData"
}
}

private struct Row: Codable {
let reference: UInt
let height: Double?
let customHeight: String?
let cells: [Cell]

enum CodingKeys: String, CodingKey {
case cells = "c"
case reference = "r"
case height = "ht"
case customHeight
}
}

class NameSpaceTest: XCTestCase {
func testDecoder() throws {
func testTable() throws {
let decoder = XMLDecoder()
decoder.shouldProcessNamespaces = true

let decoded = try decoder.decode(Table.self, from: xmlData)
let decoded = try decoder.decode(Table.self, from: tableXML)

XCTAssertEqual(decoded, Table(tr: [.init(td: ["Apples", "Bananas"])]))
}

func testWorksheet() throws {
let decoder = XMLDecoder()
decoder.shouldProcessNamespaces = true

let worksheet = try decoder.decode(Worksheet.self, from: worksheetXML)
XCTAssertEqual(worksheet.data?.rows[0].cells.count, 36)
}
}