From 14930c9b4ca6f87c9ac3e2cbdb964fc717b0fa04 Mon Sep 17 00:00:00 2001 From: "Daniel W. Hieber" Date: Tue, 22 Aug 2017 09:54:19 -0500 Subject: [PATCH] Language v6.0.0 (#108) * version bump: v0.20.0 * version bump: Language v6.0.0 * Language name is a MultiLangString --- docs/index.html | 2 +- docs/schemas/Abbreviation.html | 2 +- docs/schemas/Access.html | 2 +- docs/schemas/Address.html | 2 +- docs/schemas/Bundle.html | 2 +- docs/schemas/DateCreated.html | 2 +- docs/schemas/DateModified.html | 2 +- docs/schemas/DateRecorded.html | 2 +- docs/schemas/GeoJSON.html | 2 +- docs/schemas/Language.html | 29 ++++++++++++++++++++++++++--- docs/schemas/Lexeme.html | 2 +- docs/schemas/LexemeReference.html | 2 +- docs/schemas/Lexicon.html | 2 +- docs/schemas/Location.html | 2 +- docs/schemas/Media.html | 2 +- docs/schemas/Morpheme.html | 2 +- docs/schemas/MultiLangString.html | 2 +- docs/schemas/Note.html | 2 +- docs/schemas/Orthography.html | 2 +- docs/schemas/Person.html | 2 +- docs/schemas/Phoneme.html | 2 +- docs/schemas/Reference.html | 2 +- docs/schemas/Sentence.html | 2 +- docs/schemas/Tags.html | 2 +- docs/schemas/Text.html | 2 +- docs/schemas/Transcription.html | 2 +- docs/schemas/Url.html | 2 +- docs/schemas/Word.html | 2 +- package.json | 2 +- schemas/Language.json | 8 ++++---- test/Language.test.js | 4 +++- 31 files changed, 61 insertions(+), 36 deletions(-) diff --git a/docs/index.html b/docs/index.html index bd7a0092..9bc2c221 100644 --- a/docs/index.html +++ b/docs/index.html @@ -268,7 +268,7 @@

Maintainers

diff --git a/docs/schemas/Abbreviation.html b/docs/schemas/Abbreviation.html index 1a741145..6e7d5928 100644 --- a/docs/schemas/Abbreviation.html +++ b/docs/schemas/Abbreviation.html @@ -75,7 +75,7 @@

Description

Home

Schemas

diff --git a/docs/schemas/Access.html b/docs/schemas/Access.html index ceb55acd..3da618ef 100644 --- a/docs/schemas/Access.html +++ b/docs/schemas/Access.html @@ -279,7 +279,7 @@

Allowed Values (enum)

Home

Schemas

diff --git a/docs/schemas/Address.html b/docs/schemas/Address.html index 9fd586f0..3b27359d 100644 --- a/docs/schemas/Address.html +++ b/docs/schemas/Address.html @@ -520,7 +520,7 @@

Description

Home

Schemas

diff --git a/docs/schemas/Bundle.html b/docs/schemas/Bundle.html index 52ea5b2d..8a24ac76 100644 --- a/docs/schemas/Bundle.html +++ b/docs/schemas/Bundle.html @@ -684,7 +684,7 @@

URL: "url"

Home

Schemas

diff --git a/docs/schemas/DateCreated.html b/docs/schemas/DateCreated.html index 401879bd..edd748d0 100644 --- a/docs/schemas/DateCreated.html +++ b/docs/schemas/DateCreated.html @@ -75,7 +75,7 @@

Description

Home

Schemas

diff --git a/docs/schemas/DateModified.html b/docs/schemas/DateModified.html index 6bc0397d..0acfbcc5 100644 --- a/docs/schemas/DateModified.html +++ b/docs/schemas/DateModified.html @@ -75,7 +75,7 @@

Description

Home

Schemas

diff --git a/docs/schemas/DateRecorded.html b/docs/schemas/DateRecorded.html index 1126b951..1c156bf6 100644 --- a/docs/schemas/DateRecorded.html +++ b/docs/schemas/DateRecorded.html @@ -75,7 +75,7 @@

Description

Home

Schemas

diff --git a/docs/schemas/GeoJSON.html b/docs/schemas/GeoJSON.html index 0aa077a7..2143025f 100644 --- a/docs/schemas/GeoJSON.html +++ b/docs/schemas/GeoJSON.html @@ -4409,7 +4409,7 @@

Items

Home

Schemas

diff --git a/docs/schemas/Language.html b/docs/schemas/Language.html index 4e876985..1489d6f3 100644 --- a/docs/schemas/Language.html +++ b/docs/schemas/Language.html @@ -25,7 +25,7 @@

Language

Validate against: http://json-schema.org/schema#

-

Schema ID: http://cdn.digitallinguistics.io/schemas/Language-5.0.0.json

+

Schema ID: http://cdn.digitallinguistics.io/schemas/Language-6.0.0.json

@@ -166,7 +166,7 @@

Additional Names: "additionalNames"

Description

-

An Array of additional names for this Language.

+

An Array of additional names for this Language. Only use this property if the 'name' property is not sufficent to describe the various names for this language.

@@ -517,6 +517,29 @@

Location

+ + + + +
  • +
    + +
    + + +

    Language Name: "name"

    +     + + +
    +

    Description

    +

    The name of this Language, optionally in multiple languages. Use the additionalNames field to list other names for this Language.

    +

    +
    + +

    Must be an instance of the MultiLangString schema.

    + +
    @@ -721,7 +744,7 @@

    Description

    Home

    Schemas

    diff --git a/docs/schemas/Lexeme.html b/docs/schemas/Lexeme.html index e678dabc..70ad3557 100644 --- a/docs/schemas/Lexeme.html +++ b/docs/schemas/Lexeme.html @@ -2771,7 +2771,7 @@

    Default Value

    Home

    Schemas

    diff --git a/docs/schemas/LexemeReference.html b/docs/schemas/LexemeReference.html index 76e5b4ef..5e0c86dd 100644 --- a/docs/schemas/LexemeReference.html +++ b/docs/schemas/LexemeReference.html @@ -372,7 +372,7 @@

    Description

    Home

    Schemas

    diff --git a/docs/schemas/Lexicon.html b/docs/schemas/Lexicon.html index 6e796d3c..6efd6141 100644 --- a/docs/schemas/Lexicon.html +++ b/docs/schemas/Lexicon.html @@ -696,7 +696,7 @@

    Default Value

    Home

    Schemas

    diff --git a/docs/schemas/Location.html b/docs/schemas/Location.html index 348b77a0..c4a2e6bd 100644 --- a/docs/schemas/Location.html +++ b/docs/schemas/Location.html @@ -495,7 +495,7 @@

    Description

    Home

    Schemas

    diff --git a/docs/schemas/Media.html b/docs/schemas/Media.html index 610be21e..350c9d28 100644 --- a/docs/schemas/Media.html +++ b/docs/schemas/Media.html @@ -1038,7 +1038,7 @@

    Description

    Home

    Schemas

    diff --git a/docs/schemas/Morpheme.html b/docs/schemas/Morpheme.html index 03d7c6f7..80b4edea 100644 --- a/docs/schemas/Morpheme.html +++ b/docs/schemas/Morpheme.html @@ -328,7 +328,7 @@

    Default Value

    Home

    Schemas

    diff --git a/docs/schemas/MultiLangString.html b/docs/schemas/MultiLangString.html index 784d9ee2..df0c1cba 100644 --- a/docs/schemas/MultiLangString.html +++ b/docs/schemas/MultiLangString.html @@ -137,7 +137,7 @@

    Description

    Home

    Schemas

    diff --git a/docs/schemas/Note.html b/docs/schemas/Note.html index 477e1439..cec928b9 100644 --- a/docs/schemas/Note.html +++ b/docs/schemas/Note.html @@ -393,7 +393,7 @@

    Allowed Values (enum)

    Home

    Schemas

    diff --git a/docs/schemas/Orthography.html b/docs/schemas/Orthography.html index 28e6a493..a3fefb79 100644 --- a/docs/schemas/Orthography.html +++ b/docs/schemas/Orthography.html @@ -945,7 +945,7 @@

    Tags: "tags"

    Home

    Schemas

    diff --git a/docs/schemas/Person.html b/docs/schemas/Person.html index 07e6d18f..dc445acc 100644 --- a/docs/schemas/Person.html +++ b/docs/schemas/Person.html @@ -1349,7 +1349,7 @@

    URL: "url"

    Home

    Schemas

    diff --git a/docs/schemas/Phoneme.html b/docs/schemas/Phoneme.html index d28fbcde..75abfe77 100644 --- a/docs/schemas/Phoneme.html +++ b/docs/schemas/Phoneme.html @@ -1269,7 +1269,7 @@

    Allowed Values (enum)

    Home

    Schemas

    diff --git a/docs/schemas/Reference.html b/docs/schemas/Reference.html index 3a3788bb..62b70d52 100644 --- a/docs/schemas/Reference.html +++ b/docs/schemas/Reference.html @@ -1321,7 +1321,7 @@

    Description

    Home

    Schemas

    diff --git a/docs/schemas/Sentence.html b/docs/schemas/Sentence.html index 2e664b78..c1d74ce2 100644 --- a/docs/schemas/Sentence.html +++ b/docs/schemas/Sentence.html @@ -810,7 +810,7 @@

    Word

    Home

    Schemas

    diff --git a/docs/schemas/Tags.html b/docs/schemas/Tags.html index 81addb3a..0624d1e3 100644 --- a/docs/schemas/Tags.html +++ b/docs/schemas/Tags.html @@ -273,7 +273,7 @@

    Validates Against (oneOf)

    Home

    Schemas

    diff --git a/docs/schemas/Text.html b/docs/schemas/Text.html index 9cb5c2fa..7367ff13 100644 --- a/docs/schemas/Text.html +++ b/docs/schemas/Text.html @@ -809,7 +809,7 @@

    URL: "url"

    Home

    Schemas

    diff --git a/docs/schemas/Transcription.html b/docs/schemas/Transcription.html index 3c417d92..78b44010 100644 --- a/docs/schemas/Transcription.html +++ b/docs/schemas/Transcription.html @@ -137,7 +137,7 @@

    Description

    Home

    Schemas

    diff --git a/docs/schemas/Url.html b/docs/schemas/Url.html index 5c05f6d7..809a1ae0 100644 --- a/docs/schemas/Url.html +++ b/docs/schemas/Url.html @@ -75,7 +75,7 @@

    Description

    Home

    Schemas

    diff --git a/docs/schemas/Word.html b/docs/schemas/Word.html index d78e6c20..2fcd872f 100644 --- a/docs/schemas/Word.html +++ b/docs/schemas/Word.html @@ -820,7 +820,7 @@

    Description

    Home

    Schemas

    diff --git a/package.json b/package.json index 975c30e4..658f98c7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@digitallinguistics/spec", - "version": "0.19.0", + "version": "0.20.0", "description": "The DLx format for representing linguistic data in JSON", "keywords": [ "DLx", diff --git a/schemas/Language.json b/schemas/Language.json index 30d4e9ac..0e155c5b 100644 --- a/schemas/Language.json +++ b/schemas/Language.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/schema#", - "id": "http://cdn.digitallinguistics.io/schemas/Language-5.0.0.json", + "id": "http://cdn.digitallinguistics.io/schemas/Language-6.0.0.json", "title": "Language", "type": "object", @@ -29,7 +29,7 @@ "additionalNames": { "title": "Additional Names", "type": "array", - "description": "An Array of additional names for this Language.", + "description": "An Array of additional names for this Language. Only use this property if the 'name' property is not sufficent to describe the various names for this language.", "uniqueItems": true, "items": { "title": "Additional Language Name", @@ -82,8 +82,8 @@ "name": { "title": "Language Name", - "type": "string", - "description": "The common name for this Language. Use the `additionalNames` field to list other names for this Language." + "description": "The name of this Language, optionally in multiple languages. Use the `additionalNames` field to list other names for this Language.", + "$ref": "http://cdn.digitallinguistics.io/schemas/MultiLangString.json" }, "orthographies": { diff --git a/test/Language.test.js b/test/Language.test.js index 6feadb4d..b6e4ef78 100644 --- a/test/Language.test.js +++ b/test/Language.test.js @@ -22,7 +22,7 @@ const data = { glottolog: `chit1248`, iso: `iso`, locations: [{ name: { eng: `Charenton` } }], - name: `Chitimacha`, + name: { eng: `Chitimacha` }, orthographies: [], phonemes: [], type: `Language`, @@ -39,8 +39,10 @@ describe(`Language`, function() { it(`invalidates incorrectly-formatted data`, function() { + const badName = { name: `Chitimacha` }; const missingName = {}; expect(validate(missingName)).toBe(false); + expect(validate(badName)).toBe(false); });