From 7e3434fdcfbd55f0450f4e20f30a1b9d4bdfb20f Mon Sep 17 00:00:00 2001 From: Mark Biesheuvel Date: Wed, 27 Apr 2016 13:31:28 +0200 Subject: [PATCH 1/5] Add (minimal) metadata to schema #204 --- resume.json | 6 +++++- schema.json | 15 ++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/resume.json b/resume.json index 5ac6100e..b5bf007b 100644 --- a/resume.json +++ b/resume.json @@ -126,5 +126,9 @@ "name": "Erlich Bachman", "reference": "It is my pleasure to recommend Richard, his performance working as a consultant for Main St. Company proved that he will be a valuable addition to any company." } - ] + ], + "metadata": { + "url": "https://raw.githubusercontent.com/jsonresume/resume-schema/master/resume.json", + "dateModified": 1461755909 + } } diff --git a/schema.json b/schema.json index 44b75c8e..2036ca6c 100644 --- a/schema.json +++ b/schema.json @@ -375,6 +375,19 @@ } } - } + }, + "metadata": { + "type": "object", + "additionalProperties": { + "type": ["string", "number"] + }, + "properties": { + "url": { + "type": "string", + "description": "URL (as per RFC 3986) to latest version of this document" + } + }, + "description": "List any key-value pairs related to this document" + } } } From 597d284b49ac5739ffb3a17e98af61b65abf6273 Mon Sep 17 00:00:00 2001 From: Mark Biesheuvel Date: Wed, 27 Apr 2016 13:51:36 +0200 Subject: [PATCH 2/5] Switch spaces to tabs --- schema.json | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/schema.json b/schema.json index 2036ca6c..5a21885b 100644 --- a/schema.json +++ b/schema.json @@ -373,21 +373,20 @@ "description": "e.g. Joe blogs was a great employee, who turned up to work at least once a week. He exceeded my expectations when it came to doing nothing." } } - } }, "metadata": { - "type": "object", - "additionalProperties": { - "type": ["string", "number"] - }, - "properties": { - "url": { - "type": "string", - "description": "URL (as per RFC 3986) to latest version of this document" - } - }, - "description": "List any key-value pairs related to this document" - } + "type": "object", + "additionalProperties": { + "type": ["string", "number"] + }, + "properties": { + "url": { + "type": "string", + "description": "URL (as per RFC 3986) to latest version of this document" + } + }, + "description": "List any key-value pairs related to this document" + } } } From cbff7f5f86f1cb9d2cfc55cb664b09de055c8431 Mon Sep 17 00:00:00 2001 From: Mark Biesheuvel Date: Wed, 27 Apr 2016 13:56:06 +0200 Subject: [PATCH 3/5] Rename metadata to meta --- resume.json | 2 +- schema.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resume.json b/resume.json index b5bf007b..b16aca87 100644 --- a/resume.json +++ b/resume.json @@ -127,7 +127,7 @@ "reference": "It is my pleasure to recommend Richard, his performance working as a consultant for Main St. Company proved that he will be a valuable addition to any company." } ], - "metadata": { + "meta": { "url": "https://raw.githubusercontent.com/jsonresume/resume-schema/master/resume.json", "dateModified": 1461755909 } diff --git a/schema.json b/schema.json index 5a21885b..48ea851a 100644 --- a/schema.json +++ b/schema.json @@ -375,7 +375,7 @@ } } }, - "metadata": { + "meta": { "type": "object", "additionalProperties": { "type": ["string", "number"] From 7ab1a562be4af951d3f9a5881e86a82ea9bf8076 Mon Sep 17 00:00:00 2001 From: Mark Biesheuvel Date: Wed, 27 Apr 2016 14:08:33 +0200 Subject: [PATCH 4/5] Update description --- schema.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema.json b/schema.json index 48ea851a..cce8e1ef 100644 --- a/schema.json +++ b/schema.json @@ -386,7 +386,7 @@ "description": "URL (as per RFC 3986) to latest version of this document" } }, - "description": "List any key-value pairs related to this document" + "description": "The schema version and any other tooling configuration lives here" } } } From 81fce91edf8974f4719eb484358c61e57c09c6d7 Mon Sep 17 00:00:00 2001 From: Mark Biesheuvel Date: Wed, 27 Apr 2016 14:08:56 +0200 Subject: [PATCH 5/5] Allow all additional properties --- schema.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/schema.json b/schema.json index cce8e1ef..6b289505 100644 --- a/schema.json +++ b/schema.json @@ -377,9 +377,7 @@ }, "meta": { "type": "object", - "additionalProperties": { - "type": ["string", "number"] - }, + "additionalProperties": true, "properties": { "url": { "type": "string",