adiwg-mdjson_schemas 2.0.0.pre.alpha.3 → 2.0.0.pre.alpha.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3cdae95dcf0a460bc93654369b5cf59dfb832a3
-  data.tar.gz: e50163ac9bf8b00fa5a2b44742306167ff9e9377
+  metadata.gz: ad1c6be709dfa258c73c063aa7ed9671f2cf47b3
+  data.tar.gz: 168b1ce853a75c4f89f91c31ffb9767772226af9
 SHA512:
-  metadata.gz: f484a68bef624eee01a6b950631efe1a2573858e038e36b8e87da82c416883afd5d82440ebbb10baffc652767bb0b57b19985371261481a2b2139b53de7c76db
-  data.tar.gz: 38a6edb6458cfb3a3351f9196be4d449027fbdf2e363db97b536bbd0e6cf7ac44c2936fa29183a09b5415f8fea8d9bf76a2352ba0a056e30b754e05951ce572a
+  metadata.gz: 138a3c4e7d46403e952090c2e96350d77f14cb837c3c830bea0fed4044a9f8bbd2361faef164d31f2aeb0abba22d5151146656368252fb0085bbf6e49f3dbb12
+  data.tar.gz: 5ad98b1028f5fb4c2b18a3a2ffbac0b8938fe45e1efb138669eb54208f89893e8a8c3689b92897bb13ed4cd204b870a28f8f3e91b6382592a69fa737cca29370

data/examples/address.json

@@ -7,9 +7,5 @@
   "city": "city",
   "administrativeArea": "administrativeArea",
   "postalCode": "postalCode",
-  "country": "country",
-  "electronicMailAddress": [
-    "email0@example.com",
-    "email1@example.com"
-  ]
+  "country": "country"
 }]

data/examples/contact.json

@@ -22,10 +22,14 @@
      "service": ["service0", "service1", "service2"]
    }],
    "address": [{
-     "electronicMailAddress": ["electronicMailAddress@foo.bar"]
+     "addressType": ["mailing", "physical"]
    }, {
-     "electronicMailAddress": ["electronicMailAddress@foo.bar"]
+     "addressType": ["mailing", "physical"]
    }],
+   "electronicMailAddress": [
+     "email0@example.com",
+     "email1@example.com"
+   ],
    "onlineResource": [{
      "uri": "urn:uri"
    }, {

data/examples/mdJson.json

@@ -69,6 +69,10 @@
       }
     }
   },
+  "metadataRepository": [{
+    "repository": "uuid",
+    "metadataFormat": "format"
+  }],
   "dataDictionary": [{
     "subject": "subject",
     "responsibleParty": {

data/examples/metadataRepository.json

@@ -0,0 +1,7 @@
+[{
+  "repository": "fb44075d-14fa-49ab-934a-76a38a78f6ec",
+  "metadataFormat": "iso19115_1"
+}, {
+  "repository": "933b8ffa-58dd-40ee-a01e-fe4d009f52b0",
+  "metadataFormat": "iso19115_2"
+}]

data/lib/adiwg/mdjson_schemas/version.rb

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

data/schema/contact.json

@@ -76,6 +76,19 @@
         "$ref": "#/definitions/address"
       }
     },
+    "electronicMailAddress": {
+      "type": "array",
+      "description": "E-mail or electronic mailbox address.",
+      "translation": {
+        "ISO 19115-2": ["CI_Address > electronicMailAddress"],
+        "FGDC CSDGM": ["cntinfo > cntemail"]
+      },
+      "items": {
+        "type": "string",
+        "pattern": "^.+@.+\\..+$"
+      },
+      "uniqueItems": true
+    },
     "onlineResource": {
       "type": "array",
       "description": "Information about accessing on-line resources and services. This may be a website, profile page, GitHub page, etc. related to the contact.",
@@ -123,7 +136,7 @@
   "definitions": {
     "phone": {
       "type": "object",
-      "example":"../examples/phone.json",
+      "example": "../examples/phone.json",
       "required": ["phoneNumber"],
       "properties": {
         "phoneName": {
@@ -152,7 +165,7 @@
     },
     "address": {
       "type": "object",
-      "example":"../examples/address.json",
+      "example": "../examples/address.json",
       "description": "Physical and email address at which the organization or individual may be contacted.",
       "translation": {
         "ISO 19115-2": [
@@ -161,13 +174,13 @@
         "FGDC CSDGM": ["cntinfo > cntaddr"]
       },
       "properties": {
-        "addressType":{
-            "type" : "array",
-            "description" : "The type of address, usually mailing and/or physical.",
-            "translation": {},
-            "items" : {
-              "type": "string"
-            }
+        "addressType": {
+          "type": "array",
+          "description": "The type of address, usually mailing and/or physical.",
+          "translation": {},
+          "items": {
+            "type": "string"
+          }
         },
         "deliveryPoint": {
           "type": "array",
@@ -212,19 +225,6 @@
             "ISO 19115-2": ["CI_Address > postalCode"],
             "FGDC CSDGM": ["cntinfo > cntaddr > postal"]
           }
-        },
-        "electronicMailAddress": {
-          "type": "array",
-          "description": "E-mail or electronic mailbox address.",
-          "translation": {
-            "ISO 19115-2": ["CI_Address > electronicMailAddress"],
-            "FGDC CSDGM": ["cntinfo > cntemail"]
-          },
-          "items": {
-            "type": "string",
-            "pattern": "^.+@.+\\..+$"
-          },
-          "uniqueItems": true
         }
       },
       "additionalProperties": true

data/schema/metadataRepository.json

@@ -0,0 +1,22 @@
+{
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "id" : "metadataRepository.json#",
+    "type" : "object",
+    "title" : "metadataRepository",
+    "description" : "",
+    "example":"../examples/metadataRepository.json",
+    "required" : ["repository"],
+    "additionalProperties" : true,
+    "properties" : {
+      "repository": {
+          "type" : "string",
+          "description" : "Identifier for the metadata repository to which the metadata record is to be pushed.",
+          "minLength" : 1
+      },
+      "metadataFormat": {
+          "type" : "string",
+          "description" : "Indicates in what format the metadata record should be delivered to the repository.",
+          "minLength" : 1
+      }
+    }
+}

data/schema/schema.json

@@ -36,6 +36,14 @@
     "metadata": {
       "$ref": "metadata.json"
     },
+    "metadataRepository": {
+      "type": "array",
+      "description": "Identifies repositories for distribution of the resource metadata.",
+      "uniqueItems": true,
+      "items": {
+        "$ref": "metadataRepository.json"
+      }
+    },
     "dataDictionary": {
       "type": "array",
       "description": "A description of the contents, format and structure of the physical objects in a data resource.",

data/test/tc_metadataRepository.rb

@@ -0,0 +1,8 @@
+require 'helper.rb'
+
+class TestmetadataRepository < TestHelper
+    def test_MetadataRepository
+        errors = JSON::Validator.fully_validate('metadataRepository.json', @@example + 'metadataRepository.json', strict: @@strict, list: true)
+        assert(errors.empty?, errors.join("\n"))
+    end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adiwg-mdjson_schemas
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.3
+  version: 2.0.0.pre.alpha.4
 platform: ruby
 authors:
 - Josh Bradley, Stan Smith
@@ -133,6 +133,7 @@ files:
 - examples/medium.json
 - examples/metadata.json
 - examples/metadataInfo.json
+- examples/metadataRepository.json
 - examples/onlineResource.json
 - examples/orderProcess.json
 - examples/party.json
@@ -202,6 +203,7 @@ files:
 - schema/medium.json
 - schema/metadata.json
 - schema/metadataInfo.json
+- schema/metadataRepository.json
 - schema/onlineResource.json
 - schema/orderProcess.json
 - schema/releasability.json
@@ -268,6 +270,7 @@ files:
 - test/tc_medium.rb
 - test/tc_metadata.rb
 - test/tc_metadataInfo.rb
+- test/tc_metadataRepository.rb
 - test/tc_onlineResource.rb
 - test/tc_orderProcess.rb
 - test/tc_party.rb
@@ -369,6 +372,7 @@ test_files:
 - test/tc_medium.rb
 - test/tc_metadata.rb
 - test/tc_metadataInfo.rb
+- test/tc_metadataRepository.rb
 - test/tc_onlineResource.rb
 - test/tc_orderProcess.rb
 - test/tc_party.rb