adiwg-mdjson_schemas 2.0.0.pre.beta.6 → 2.0.0.pre.beta.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87d677caee4e6a6556fd60b9e1cdea9b7d11b941
-  data.tar.gz: 50d702d2b5a43611e051c78143b85330e5021dfa
+  metadata.gz: 359b30d54dff72063bded6390a24598a0c73aa96
+  data.tar.gz: a479441718ba1508eaf456adbd9099078e8c553b
 SHA512:
-  metadata.gz: 03b8922937589ba54c874341528419d87c4d7810a68f593b1831198369d13f61fc19f25c08835e992b2e49f55eccf9f5a6f87e3819b6c66754e9da256715326a
-  data.tar.gz: 9c6c2e9316cc7f750ef3ff9b12d4aa06311d87ce0ade699be02eaae98ab1c0e92974e0991767cacba1262272652d5525aacc69b5a7e41addf97e983482b8126c
+  metadata.gz: 9fb433fae0a1af8091de5ddba91ddb9b51d15d783246aa57301b604178936e0d43d83e0b72cd3dbf15029cdb85dfb228968c844a2e733bb2eeb174cf84f7cbf0
+  data.tar.gz: e76b36a500550540d6c8cca7d0f5ebdf16a0b8dc757eed7ff0c68b6d19b6370c402203d26b082256f48f5a5fc2a5ee22b97c7fa9c421878c24cf1adcbbe66000

data/examples/contact.json

@@ -49,4 +49,12 @@
      "memberOfOrganization0",
      "memberOfOrganization1"
    ]
+ }, {
+   "contactId": "contactId",
+   "isOrganization": false,
+   "positionName": "positionName"
+ }, {
+   "contactId": "contactId",
+   "isOrganization": true,
+   "name": "name"
  }]

data/lib/adiwg/mdjson_schemas/version.rb

@@ -1,6 +1,6 @@
 module ADIWG
     module MdjsonSchemas
         # Current schema version number
-        VERSION = "2.0.0-beta.6"
+        VERSION = "2.0.0-beta.7"
     end
 end

data/schema/contact.json

@@ -9,7 +9,7 @@
   "example": "../examples/contact.json",
   "type": "object",
   "title": "contact",
-  "required": ["contactId", "name", "isOrganization"],
+  "required": ["contactId", "isOrganization"],
   "additionalProperties": true,
   "properties": {
     "contactId": {
@@ -122,6 +122,29 @@
       "description": "User defined contact type."
     }
   },
+  "oneOf": [{
+    "description": "name is required for organization",
+    "required": ["name"],
+    "properties": {
+      "isOrganization": {
+        "enum": [true]
+      }
+    }
+  }, {
+    "description": "name or positionName is required for individual",
+    "properties": {
+      "isOrganization": {
+        "enum": [false]
+      }
+    },
+    "anyOf": [{
+      "description": "name is required",
+      "required": ["name"]
+    }, {
+      "description": "positionName is required",
+      "required": ["positionName"]
+    }]
+  }],
   "definitions": {
     "phone": {
       "type": "object",

data/schema/schema.json

@@ -1,7 +1,7 @@
 {
   "id": "schema.json#",
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "version": "2.0.0-beta.6",
+  "version": "2.0.0-beta.7",
   "description": "schema for ADIwg mdJSON metadata",
   "example": "../examples/mdJson.json",
   "type": "object",

data/schema/timePeriod.json

@@ -30,7 +30,6 @@
       "type": "array",
       "description": "Names associated with the time period.",
       "translation": {},
-      "minItems": 1,
       "items": {
         "type": "string"
       }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adiwg-mdjson_schemas
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.beta.6
+  version: 2.0.0.pre.beta.7
 platform: ruby
 authors:
 - Josh Bradley, Stan Smith