adiwg-mdjson_schemas 2.0.0.pre.alpha.8 → 2.0.0.pre.alpha.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d91a5d28503fe5c7369ccb16da4805668aafb6e1
-  data.tar.gz: 9c3b6b3d37d535c6287f57a6564e961fe2e85a71
+  metadata.gz: 4d41e4ffe998388d6bc497346096fba0d1074b7d
+  data.tar.gz: 9f03d2c308be13662597703355a3634718c9979b
 SHA512:
-  metadata.gz: 37ddb8658e4319a04d0fbd1d2a3d7ccd5bd20f06352c64e37b2712671ed1e184f7144131da654e9118c9003549cca6c5fdfca583eaa5fbf7b601e2264afe706e
-  data.tar.gz: 0a6373e5bd0eca227fe5a735e76128c7c64f08daeee741cb62c5215663476e72edd546670e35b97a03f5f72d5395a465f6e456033b255bc033969ae053e344cd
+  metadata.gz: 915223a0b712728e0835f11f7a869fc643723ce8f3c725309038bb88078007aa549dadc9578eeacffedb9eec43d5c724ed05c27b31a93f32466e424bce2a4aa4
+  data.tar.gz: 0306a5a4d30ea60a230d023d1949a9f95efee35b19e61abecc55b01e49b268fc1b3ffe1d990c501408515dceae85dc29b58b7dabbd09fb3c4f81b315882b9510

data/examples/scope.json

@@ -1,33 +1,37 @@
  [{
    "scopeCode": "scopeCode",
    "scopeDescription": [{
-     "type": "dataset",
-     "description": "description"
+     "dataset": "dataset"
    }],
-   "timePeriod": [{
-     "id": "id",
-     "description": "description",
-     "identifier": {
-       "identifier": "identifier",
-       "namespace": "namespace"
-     },
-     "periodName": [
-       "periodName0",
-       "periodName1"
-     ],
-     "startDateTime": "2016-10-14T11:10:15.2-10:00",
-     "endDateTime": "2016-12-31",
-     "timeInterval": {
-       "interval": 9.9,
-       "units": "units"
-     },
-     "duration": {
-       "years": 1,
-       "months": 1,
-       "days": 1,
-       "hours": 1,
-       "minutes": 1,
-       "seconds": 1
-     }
+   "scopeExtent": [{
+     "temporalExtent": [{
+       "type": "period",
+       "timePeriod": {
+         "id": "id",
+         "description": "description",
+         "identifier": {
+           "identifier": "identifier",
+           "namespace": "namespace"
+         },
+         "periodName": [
+           "periodName0",
+           "periodName1"
+         ],
+         "startDateTime": "2016-10-14T11:10:15.2-10:00",
+         "endDateTime": "2016-12-31",
+         "timeInterval": {
+           "interval": 9.9,
+           "units": "units"
+         },
+         "duration": {
+           "years": 1,
+           "months": 1,
+           "days": 1,
+           "hours": 1,
+           "minutes": 1,
+           "seconds": 1
+         }
+       }
+     }]
    }]
  }]

data/examples/scopeDescription.json

@@ -0,0 +1,6 @@
+[{
+  "dataset": "",
+  "attribute": "",
+  "feature": "",
+  "other": ""
+}]

data/lib/adiwg/mdjson_schemas/version.rb

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

data/schema/funding.json

@@ -19,7 +19,6 @@
     "allocation": {
       "type": "array",
       "description": "Funds contributed to support the development of the resource.",
-      "example": "",
       "items": {
         "$ref": "#/definitions/allocation"
       }

data/schema/identifier.json

@@ -37,7 +37,6 @@
       },
       "authority": {
         "description": "Citation for the authority issuing the identifier.",
-        "example": "",
         "translation": {
           "ISO 19115-2": ["MD_Identifier > authority > CI_Citation"]
         },

data/schema/responsibility.json

@@ -20,7 +20,7 @@
     },
     "roleExtent": {
       "type": "array",
-      "description": "The period of time for which the role is valid.",
+      "description": "The area or period of time for which the role is valid.",
       "translation": {},
       "items": {
         "$ref": "./extent.json#"

data/schema/schema.json

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

data/schema/scope.json

@@ -19,32 +19,44 @@
       "description": "Detailed description/listing of the items specified by the scope.",
       "translation": {},
       "items": {
-        "type": "object",
-        "required": ["type", "description"],
-        "additionalProperties": true,
-        "properties": {
-          "type": {
-            "type": "string",
-            "description": "The type of item described.",
-            "translation": {},
-            "minLength": 1,
-            "enum": ["dataset", "attribute", "feature", "other"]
-          },
-          "description": {
-            "type": "string",
-            "description": "Description of the scope item.",
-            "translation": {},
-            "minLength": 1
-          }
-        }
+        "$ref": "#/definitions/scopeDescription"
       }
     },
-    "timePeriod": {
+    "scopeExtent": {
       "type": "array",
-      "description": "information about the temporal extent of the resource specified by the scope",
+      "description": "Information about the horizontal, vertical and temporal extent of the resource specified by the scope.",
       "translation": {},
       "items": {
-        "$ref": "./timePeriod.json#"
+        "$ref": "./extent.json#"
+      }
+    }
+  },
+  "definitions": {
+    "scopeDescription": {
+      "type": "object",
+      "additionalProperties": true,
+      "minProperties": 1,
+      "properties": {
+        "dataset": {
+          "type": "string",
+          "description": "Dataset to which the information applies.",
+          "translation": {}
+        },
+        "attribute": {
+          "type": "string",
+          "description": "Instances of attribute types to which the information is applied.",
+          "translation": {}
+        },
+        "feature": {
+          "type": "string",
+          "description": "Instances of feature types to which the information is applied.",
+          "translation": {}
+        },
+        "other": {
+          "type": "string",
+          "description": "Class of information that does not fall into the other categories to which the information applies.",
+          "translation": {}
+        }
       }
     }
   }

data/schema/temporalExtent.json

@@ -11,7 +11,6 @@
     "type": {
       "type": "string",
       "description": "The type of temporal extent.",
-      "example": "",
       "translation": {},
       "enum": ["instant", "period"]
     }

data/test/tc_scope.rb

@@ -5,4 +5,8 @@ class TestScope < TestHelper
         errors = JSON::Validator.fully_validate('scope.json', @@example + 'scope.json', strict: @@strict, list: true)
         assert(errors.empty?, errors.join("\n"))
     end
+    def test_scopeDescription
+        errors = JSON::Validator.fully_validate('scope.json', @@example + 'scopeDescription.json', fragment: '#/definitions/scopeDescription', strict: @@strict, list: true)
+        assert(errors.empty?, errors.join("\n"))
+    end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adiwg-mdjson_schemas
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.8
+  version: 2.0.0.pre.alpha.9
 platform: ruby
 authors:
 - Josh Bradley, Stan Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-15 00:00:00.000000000 Z
+date: 2017-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -144,6 +144,7 @@ files:
 - examples/resourceType.json
 - examples/responsibleParty.json
 - examples/scope.json
+- examples/scopeDescription.json
 - examples/securityConstraint.json
 - examples/series.json
 - examples/source.json