From bb1ed30e89ddbb94fa6156e1af87e7255e48cd6f Mon Sep 17 00:00:00 2001 From: Mathew Polzin Date: Wed, 12 Dec 2018 20:04:14 -0800 Subject: [PATCH] Rename Document.Body.primaryData to primaryResource --- README.md | 2 +- Sources/JSONAPI/Document/Document.swift | 2 +- .../JSONAPITests/Document/DocumentTests.swift | 148 +++++++++--------- 3 files changed, 76 insertions(+), 76 deletions(-) diff --git a/README.md b/README.md index e3654e3..641863d 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ Note that Playground support for importing non-system Frameworks is still a bit ### JSONAPITestLib #### Entity Validator - [x] Disallow optional array in `Attribute` (should be empty array, not `null`). -- [x] Only allow `TransformedAttribute` and its derivatives within `Attributes` struct. +- [x] Only allow `TransformedAttribute` and its derivatives as stored properties within `Attributes` struct. Computed properties can still be any type because they do not get encoded or decoded. - [x] Only allow `ToManyRelationship` and `ToOneRelationship` within `Relationships` struct. ### Potential Improvements diff --git a/Sources/JSONAPI/Document/Document.swift b/Sources/JSONAPI/Document/Document.swift index 231951f..78bb1fa 100644 --- a/Sources/JSONAPI/Document/Document.swift +++ b/Sources/JSONAPI/Document/Document.swift @@ -67,7 +67,7 @@ public struct Document>, NoMetadata, NoLinks, NoIncludes, NoAPIDescription, UnknownJSONAPIError>.self, data: single_document_no_includes) - XCTAssertEqual(document.body.primaryData?.value[Article.self], article) - XCTAssertNil(document.body.primaryData?.value[Author.self]) + XCTAssertEqual(document.body.primaryResource?.value[Article.self], article) + XCTAssertNil(document.body.primaryResource?.value[Author.self]) } func test_singleDocument_PolyPrimaryResource_encode() { @@ -862,8 +862,8 @@ extension DocumentTests { let article = Article(id: Id(rawValue: "1"), attributes: .none, relationships: .init(author: ToOneRelationship(id: Id(rawValue: "33"))), meta: .none, links: .none) let document = decoded(type: Document>, NoMetadata, NoLinks, NoIncludes, TestAPIDescription, UnknownJSONAPIError>.self, data: single_document_no_includes_with_api_description) - XCTAssertEqual(document.body.primaryData?.value[Article.self], article) - XCTAssertNil(document.body.primaryData?.value[Author.self]) + XCTAssertEqual(document.body.primaryResource?.value[Article.self], article) + XCTAssertNil(document.body.primaryResource?.value[Author.self]) XCTAssertEqual(document.apiDescription.version, "1.0") } @@ -880,11 +880,11 @@ extension DocumentTests { XCTAssertFalse(document.body.isError) XCTAssertNil(document.body.errors) - XCTAssertNotNil(document.body.primaryData) - XCTAssertEqual(document.body.primaryData?.values.count, 3) - XCTAssertEqual(document.body.primaryData?.values[0].id.rawValue, "1") - XCTAssertEqual(document.body.primaryData?.values[1].id.rawValue, "2") - XCTAssertEqual(document.body.primaryData?.values[2].id.rawValue, "3") + XCTAssertNotNil(document.body.primaryResource) + XCTAssertEqual(document.body.primaryResource?.values.count, 3) + XCTAssertEqual(document.body.primaryResource?.values[0].id.rawValue, "1") + XCTAssertEqual(document.body.primaryResource?.values[1].id.rawValue, "2") + XCTAssertEqual(document.body.primaryResource?.values[2].id.rawValue, "3") XCTAssertEqual(document.body.includes?.count, 0) } @@ -899,11 +899,11 @@ extension DocumentTests { XCTAssertFalse(document.body.isError) XCTAssertNil(document.body.errors) - XCTAssertNotNil(document.body.primaryData) - XCTAssertEqual(document.body.primaryData?.values.count, 3) - XCTAssertEqual(document.body.primaryData?.values[0].id.rawValue, "1") - XCTAssertEqual(document.body.primaryData?.values[1].id.rawValue, "2") - XCTAssertEqual(document.body.primaryData?.values[2].id.rawValue, "3") + XCTAssertNotNil(document.body.primaryResource) + XCTAssertEqual(document.body.primaryResource?.values.count, 3) + XCTAssertEqual(document.body.primaryResource?.values[0].id.rawValue, "1") + XCTAssertEqual(document.body.primaryResource?.values[1].id.rawValue, "2") + XCTAssertEqual(document.body.primaryResource?.values[2].id.rawValue, "3") XCTAssertEqual(document.body.includes?.count, 0) XCTAssertEqual(document.apiDescription.version, "1.0") } @@ -919,11 +919,11 @@ extension DocumentTests { XCTAssertFalse(document.body.isError) XCTAssertNil(document.body.errors) - XCTAssertNotNil(document.body.primaryData) - XCTAssertEqual(document.body.primaryData?.values.count, 3) - XCTAssertEqual(document.body.primaryData?.values[0].id.rawValue, "1") - XCTAssertEqual(document.body.primaryData?.values[1].id.rawValue, "2") - XCTAssertEqual(document.body.primaryData?.values[2].id.rawValue, "3") + XCTAssertNotNil(document.body.primaryResource) + XCTAssertEqual(document.body.primaryResource?.values.count, 3) + XCTAssertEqual(document.body.primaryResource?.values[0].id.rawValue, "1") + XCTAssertEqual(document.body.primaryResource?.values[1].id.rawValue, "2") + XCTAssertEqual(document.body.primaryResource?.values[2].id.rawValue, "3") XCTAssertEqual(document.body.includes?.count, 3) XCTAssertEqual(document.body.includes?[Author.self].count, 3) XCTAssertEqual(document.body.includes?[Author.self][0].id.rawValue, "33") @@ -942,11 +942,11 @@ extension DocumentTests { XCTAssertFalse(document.body.isError) XCTAssertNil(document.body.errors) - XCTAssertNotNil(document.body.primaryData) - XCTAssertEqual(document.body.primaryData?.values.count, 3) - XCTAssertEqual(document.body.primaryData?.values[0].id.rawValue, "1") - XCTAssertEqual(document.body.primaryData?.values[1].id.rawValue, "2") - XCTAssertEqual(document.body.primaryData?.values[2].id.rawValue, "3") + XCTAssertNotNil(document.body.primaryResource) + XCTAssertEqual(document.body.primaryResource?.values.count, 3) + XCTAssertEqual(document.body.primaryResource?.values[0].id.rawValue, "1") + XCTAssertEqual(document.body.primaryResource?.values[1].id.rawValue, "2") + XCTAssertEqual(document.body.primaryResource?.values[2].id.rawValue, "3") XCTAssertEqual(document.body.includes?.count, 3) XCTAssertEqual(document.body.includes?[Author.self].count, 3) XCTAssertEqual(document.body.includes?[Author.self][0].id.rawValue, "33")