adiwg-mdjson_schemas 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb8c3d9948dd510f6821421bdcb073ca4dc8790a
-  data.tar.gz: fe3f53f9d7f77e918261b1eb28e3daf01d3bd1bc
+  metadata.gz: b1ce6d6761204f1c143e0a839dde422db8ca392b
+  data.tar.gz: eacd17e6943a5cc50ededa792fdab117ca252ee9
 SHA512:
-  metadata.gz: 238ffb168303b6260e68c10c4497eb5c11949ee93e316571188f56cfa1673030895a1efcb67e6de589ffdd9ac2faa812cf67d2ee0d170c8918dfd4dd3dee1b34
-  data.tar.gz: a63d1693f62dd7f93a728a19a215ff4ea8fa55043a79da0c0aac34d1a7fe1415773d3fe136758e1d26d908293f5c2a2dc4b76a1f0edbcf5948242c90cfb2516f
+  metadata.gz: 2fec3ee661ca83218ae6fd38c0a7ad5246e7c20c504dcf64d5c24a98313a84ab16e38cbfd262f0f52b355287568355abe43e30c6888bde75165f2a18bd2952d9
+  data.tar.gz: 8d1350417d0f836cb2935082d62e1f651c1c39b242a41df6622b236d4a4c3f4c65ec26257a741fb5d4b4bb63452229af4d6f697918a503d92f0d40085fedc1d9

data/.editorconfig

@@ -0,0 +1,34 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+
+[*.js]
+indent_style = space
+indent_size = 2
+
+[*.hbs]
+insert_final_newline = false
+indent_style = space
+indent_size = 2
+
+[*.css]
+indent_style = space
+indent_size = 2
+
+[*.html]
+indent_style = space
+indent_size = 2
+
+[*.{diff,md}]
+trim_trailing_whitespace = false

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 .project
+node_modules

data/.jshintrc

@@ -0,0 +1,35 @@
+{
+  "predef": [
+    "document",
+    "window",
+    "-Promise",
+    "describe",
+    "it"    
+  ],
+  "browser": true,
+  "boss": true,
+  "curly": true,
+  "debug": false,
+  "devel": true,
+  "eqeqeq": true,
+  "evil": true,
+  "forin": false,
+  "immed": false,
+  "laxbreak": false,
+  "newcap": true,
+  "noarg": true,
+  "node": true,
+  "noempty": false,
+  "nonew": false,
+  "nomen": false,
+  "onevar": false,
+  "plusplus": false,
+  "regexp": false,
+  "undef": true,
+  "sub": true,
+  "strict": false,
+  "white": false,
+  "eqnull": true,
+  "esversion": 6,
+  "unused": true
+}

data/LICENSE

@@ -1,24 +1,165 @@
-This is free and unencumbered software released into the public domain.
-
-Anyone is free to copy, modify, publish, use, compile, sell, or
-distribute this software, either in source code form or as a compiled
-binary, for any purpose, commercial or non-commercial, and by any
-means.
-
-In jurisdictions that recognize copyright laws, the author or authors
-of this software dedicate any and all copyright interest in the
-software to the public domain. We make this dedication for the benefit
-of the public at large and to the detriment of our heirs and
-successors. We intend this dedication to be an overt act of
-relinquishment in perpetuity of all present and future rights to this
-software under copyright law.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-For more information, please refer to <http://unlicense.org>
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

data/examples/mdJson.json

@@ -2242,11 +2242,15 @@
     ],
     "funding": [{
         "allocation": [{
+            "sourceAllocationId": "A123FW009",
             "amount": 9999.99,
             "currency": "USD",
             "sourceId": "CID005",
             "recipientId": "CID006",
             "matching": true,
+            "onlineResource": [{
+              "uri": "http://adiwg.org"
+            }],
             "comment": "Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur."
           },
           {

data/examples/processStep.json

@@ -21,7 +21,7 @@
     {
       "role": "role",
       "roleExtent": [{
-        "temporalExtent": [{          
+        "temporalExtent": [{
           "timePeriod": {
             "startDateTime": "2016-10-24T11:10:15.2-10:00"
           }
@@ -32,6 +32,64 @@
       }]
     }
   ],
+  "stepSource": [{
+    "description": "description",
+    "sourceCitation": {
+      "title": "title"
+    },
+    "metadataCitation": [{
+      "title": "title"
+    }, {
+      "title": "title"
+    }],
+    "spatialResolution": {
+      "measure": {
+        "type": "distance",
+        "value": 99.9,
+        "unitOfMeasure": "unitOfMeasure"
+      }
+    },
+    "referenceSystem": {
+      "referenceSystemType": "referenceSystemType",
+      "referenceSystemIdentifier": {
+        "identifier": "identifier"
+      }
+    },
+    "sourceProcessStep": [{
+      "description": "description"
+    }, {
+      "description": "description"
+    }]
+  }],
+  "stepProduct": [{
+    "description": "description",
+    "sourceCitation": {
+      "title": "title"
+    },
+    "metadataCitation": [{
+      "title": "title"
+    }, {
+      "title": "title"
+    }],
+    "spatialResolution": {
+      "measure": {
+        "type": "distance",
+        "value": 99.9,
+        "unitOfMeasure": "unitOfMeasure"
+      }
+    },
+    "referenceSystem": {
+      "referenceSystemType": "referenceSystemType",
+      "referenceSystemIdentifier": {
+        "identifier": "identifier"
+      }
+    },
+    "sourceProcessStep": [{
+      "description": "description"
+    }, {
+      "description": "description"
+    }]
+  }],
   "reference": [{
       "title": "title"
     },

data/examples/source.json

@@ -8,7 +8,13 @@
    }, {
      "title": "title"
    }],
-   "scaleDenominator": 9,
+   "spatialResolution": {
+     "measure": {
+       "type": "distance",
+       "value": 99.9,
+       "unitOfMeasure": "unitOfMeasure"
+     }
+   },
    "referenceSystem": {
      "referenceSystemType": "referenceSystemType",
      "referenceSystemIdentifier": {

data/index.js

@@ -0,0 +1,3 @@
+const requireDirectory = require('require-directory');
+
+module.exports = requireDirectory(module, './schema');

data/lib/adiwg/mdjson_schemas/version.rb

@@ -1,6 +1,6 @@
 module ADIWG
     module MdjsonSchemas
         # Current schema version number
-        VERSION = "2.2.0"
+        VERSION = "2.3.0"
     end
 end

data/package.json

@@ -0,0 +1,45 @@
+{
+  "name": "mdjson-schemas",
+  "version": "2.3.0",
+  "description": "JSON schemas, examples, and templates for ADIwg metadata standards",
+  "main": "index.js",
+  "directories": {
+    "doc": "doc",
+    "example": "examples",
+    "test": "test"
+  },
+  "scripts": {
+    "test": "mocha"
+  },
+  "files":[
+    "examples",
+    "schema"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/adiwg/mdJson-schemas.git"
+  },
+  "keywords": [
+    "json",
+    "metadata",
+    "mdJSON",
+    "json-schema",
+    "ADIwg",
+    "mdEditor",
+    "mdTranslator",
+    "mdCodes"
+  ],
+  "author": "jbradley@arcticlcc.org",
+  "license": "GPL-3.0",
+  "bugs": {
+    "url": "https://github.com/adiwg/mdJson-schemas/issues"
+  },
+  "homepage": "https://github.com/adiwg/mdJson-schemas#readme",
+  "devDependencies": {
+    "ajv": "^5.2.2",
+    "mocha": "^3.5.0"
+  },
+  "dependencies": {
+    "require-directory": "^2.1.1"
+  }
+}

data/schema/attribute.json

@@ -5,7 +5,6 @@
   "title": "",
   "description": "",
   "example":"../examples/attribute.json",
-  "required": [],
   "dependencies": {
     "minValue": ["units"],
     "maxValue": ["units"],

data/schema/funding.json

@@ -3,7 +3,6 @@
   "$schema": "http://json-schema.org/draft-04/schema#",
   "type": "object",
   "description": "",
-  "required": [],
   "minProperties": 1,
   "additionalProperties": true,
   "anyOf": [{
@@ -27,6 +26,10 @@
       "$ref": "./timePeriod.json#",
       "description": "The period for which the allocation is relevant.",
       "example": ""
+    },
+    "description": {
+      "type": "string",
+      "description": "Information describing the funding."
     }
   },
   "definitions": {
@@ -36,6 +39,10 @@
       "required": ["amount", "currency"],
       "additionalProperties": true,
       "properties": {
+        "sourceAllocationId": {
+          "type": "string",
+          "description": "Identifier used by the source contact to reference the allocation."
+        },
         "amount": {
           "type": "number",
           "description": "The amount of the allocation in the indicated currency."
@@ -60,6 +67,13 @@
         "comment": {
           "type": "string",
           "description": "Additional information relevant to the allocation."
+        },
+        "onlineResource": {
+          "type": "array",
+          "description": "On-line information related to the allocation.",
+          "items": {
+            "$ref": "onlineResource.json#"
+          }
         }
       }
     }

data/schema/georectifiedRepresentation.json

@@ -46,7 +46,6 @@
       }]
     },
     "centerPoint": {
-      "type": "array",
       "description": "The earth location in the coordinate system defined by the Spatial Reference System and the grid coordinate of the cell halfway between opposite ends of the grid in the spatial dimensions.",
       "$ref": "#/definitions/point"
     },

data/schema/imageDescription.json

@@ -7,7 +7,6 @@
   "translation": {
     "ISO 19115-2": ["MI_ImageDescription"]
   },
-  "required": [],
   "additionalProperties": true,
   "properties": {
     "illuminationElevationAngle": {

data/schema/lineage.json

@@ -120,6 +120,28 @@
             "$ref": "./responsibility.json#"
           }
         },
+        "stepSource": {
+          "type": "array",
+          "description": "Information about the source data used in the process step.",
+          "translation": {
+            "ISO 19115-2": ["DQ_DataQuality > LI_Lineage > LI_ProcessStep > LI_source"],
+            "FGDC CSDGM": ["dataqual > lineage > procstep > srcused"]
+          },
+          "items": {
+            "$ref": "#/definitions/source"
+          }
+        },
+        "stepProduct": {
+          "type": "array",
+          "description": "Information about an intermediate data set that (1) is significant in the opinion of the data producer, (2) is generated in the processing step, and (3) is used in later processing steps.",
+          "translation": {
+            "ISO 19115-2": ["DQ_DataQuality > LI_Lineage > LI_ProcessStep > LI_source"],
+            "FGDC CSDGM": ["dataqual > lineage > procstep > srcprod"]
+          },
+          "items": {
+            "$ref": "#/definitions/source"
+          }
+        },
         "reference": {
           "type": "array",
           "description": "Citation for process step documentation.",
@@ -143,6 +165,17 @@
         "ISO 19115-2": ["LI_Source"]
       },
       "additionalProperties": true,
+      "anyOf": [{
+          "title": "description  is required",
+          "required": ["description"],
+          "description": "A description  is required."
+        },
+        {
+          "title": "scope  is required",
+          "required": ["scope"],
+          "description": "At least one scope is required."
+        }
+      ],
       "properties": {
         "description": {
           "type": "string",

data/schema/medium.json

@@ -5,7 +5,6 @@
   "title": "medium",
   "description": "Information about offline media on which the resource can be stored or distributed.",
   "example": "../examples/medium.json",
-  "required": [],
   "additionalProperties": true,
   "properties": {
     "mediumSpecification": {

data/schema/schema.json

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

data/schema/spatialRepresentation.json

@@ -5,7 +5,6 @@
   "description": "",
   "translation": {},
   "type": "object",
-  "required": [],
   "additionalProperties": true,
   "oneOf": [{
       "type": "object",

data/schema/spatialResolution.json

@@ -28,7 +28,6 @@
       "required": ["measure"],
       "properties": {
         "measure": {
-          "type": "object",
           "title": "measure",
           "example": "../examples/spatialResolution.json",
           "description": "Scale of geographic extent expressed in ground distance parameters or angle.",

data/schema/transferOption.json

@@ -9,7 +9,6 @@
     "FGDC CSDGM": ["distinfo > stdorder > digform > digtopt"]
   },
   "example": "../examples/transferOption.json",
-  "required": [],
   "additionalProperties": true,
   "properties": {
     "transferSize": {

data/test/tc_version.rb

@@ -7,4 +7,8 @@ class TestSchemaVersion < Minitest::Test
     schema = JSON.load File.new(File.join(File.dirname(__FILE__), '..', 'schema', 'schema.json'))
     assert_equal(ADIWG::MdjsonSchemas::VERSION, schema['version'], 'Gem version and schema versions are not equal')
   end
+  def test_node_version
+    package = JSON.load File.new(File.join(File.dirname(__FILE__), '..', 'package.json'))
+    assert_equal(ADIWG::MdjsonSchemas::VERSION, package['version'], 'Gem version and npm versions are not equal')
+  end
 end

data/test/test.js

@@ -0,0 +1,49 @@
+const assert = require('assert');
+const fs = require('fs');
+const Schemas = require('../index.js');
+const schemaFolder = '../schema/';
+
+describe('Test schemas:', function() {
+
+  describe('Schemas', function() {
+    it('should return an object', function() {
+      assert.ok(Schemas === Object(Schemas));
+    });
+  });
+
+  describe('All schemas present', function() {
+    it('should return ok', function() {
+      fs.readdirSync(__dirname + '/' + schemaFolder).forEach(file => {
+        let schema = Schemas[file.split('.')[0]];
+
+        assert.ok(schema === Object(schema));
+      });
+    });
+  });
+
+  describe('ajv', function() {
+
+    const Ajv = require('ajv');
+    const data = require('../examples/mdJson.json');
+    const ajv = new Ajv({
+      extendRefs: 'fail'
+    });
+
+    it('should load all schemas', function() {
+
+      ajv.addMetaSchema(require('ajv/lib/refs/json-schema-draft-04.json'));
+
+      Object.keys(Schemas).forEach(function(key) {
+        let val = Schemas[key];
+
+        ajv.addSchema(val, key);
+      });
+    });
+
+    it('should validate example', function() {
+      ajv.validate('schema', data);
+      assert.equal(ajv.errors, null);
+    });
+  });
+
+});

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adiwg-mdjson_schemas
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Josh Bradley, Stan Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-07 00:00:00.000000000 Z
+date: 2017-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,8 +74,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".editorconfig"
 - ".github_changelog_generator"
 - ".gitignore"
+- ".jshintrc"
 - ".travis.yml"
 - CHANGELOG.md
 - CREDITS
@@ -168,11 +170,13 @@ files:
 - examples/vectorRepresentation.json
 - examples/verticalExtent.json
 - examples/voucher.json
+- index.js
 - lib/adiwg-mdjson_schemas.rb
 - lib/adiwg/mdjson_schemas.rb
 - lib/adiwg/mdjson_schemas/utils.rb
 - lib/adiwg/mdjson_schemas/validator.rb
 - lib/adiwg/mdjson_schemas/version.rb
+- package.json
 - schema/additionalDocumentation.json
 - schema/associatedResource.json
 - schema/attribute.json
@@ -305,6 +309,7 @@ files:
 - test/tc_version.rb
 - test/tc_verticalExtent.rb
 - test/tc_voucher.rb
+- test/test.js
 - test/tu_utils.rb
 homepage: https://github.com/adiwg/mdJson-schemas
 licenses:
@@ -326,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: JSON schemas for the ADIwg metadata standard
@@ -408,4 +413,5 @@ test_files:
 - test/tc_version.rb
 - test/tc_verticalExtent.rb
 - test/tc_voucher.rb
+- test/test.js
 - test/tu_utils.rb