adiwg-mdjson_schemas 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1ce6d6761204f1c143e0a839dde422db8ca392b
-  data.tar.gz: eacd17e6943a5cc50ededa792fdab117ca252ee9
+  metadata.gz: 5db38b6cc6c2e515d927ca854b3077f957dd28ac
+  data.tar.gz: 4c9ce71989511d990c82e4fb918f9f7cfe7369b1
 SHA512:
-  metadata.gz: 2fec3ee661ca83218ae6fd38c0a7ad5246e7c20c504dcf64d5c24a98313a84ab16e38cbfd262f0f52b355287568355abe43e30c6888bde75165f2a18bd2952d9
-  data.tar.gz: 8d1350417d0f836cb2935082d62e1f651c1c39b242a41df6622b236d4a4c3f4c65ec26257a741fb5d4b4bb63452229af4d6f697918a503d92f0d40085fedc1d9
+  metadata.gz: 65ae2ea14d83de5c54da9af169892d50f4c4f91a180a91db5a76bb246c67fed0e15f83b94a96d7a448240c1bb266a1c746dfb98441cbdf54a706669b33e0f3d7
+  data.tar.gz: c4f2d3cf61733b34dfc3e8a8662188aa2a604f855cba348085eb180b104a163b042a9f0988ac9affe7451b56a5b37b02c580461ffe426e4831e6c7c69edeffe0

data/.gitignore

@@ -17,3 +17,4 @@ test/version_tmp
 tmp
 .project
 node_modules
+resources/js

data/CHANGELOG.md

@@ -1,7 +1,9 @@
 # Change Log
 
-## [v2.2.0](https://github.com/adiwg/mdJson-schemas/tree/v2.2.0)
+## [v2.3.0](https://github.com/adiwg/mdJson-schemas/tree/v2.3.0) (2017-08-31)
+[Full Changelog](https://github.com/adiwg/mdJson-schemas/compare/v2.2.0...v2.3.0)
 
+## [v2.2.0](https://github.com/adiwg/mdJson-schemas/tree/v2.2.0) (2017-06-07)
 [Full Changelog](https://github.com/adiwg/mdJson-schemas/compare/v2.1.2...v2.2.0)
 
 **Implemented enhancements:**
@@ -63,4 +65,4 @@
 - Fixed spatialRepresentation ([1833df8](https://github.com/adiwg/mdJson-schemas/commit/1833df80b9324dfbc5eb067821bde4a8011ccc08) )
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/index.js

@@ -1,3 +1,14 @@
-const requireDirectory = require('require-directory');
+'use strict';
 
-module.exports = requireDirectory(module, './schema');
+const glob = require('glob');
+const path = require('path');
+const all = {};
+
+glob.sync('./resources/js/!(schemas).js').forEach(function(file) {
+  const obj = require(path.resolve(file));
+  const name = path.basename(file, '.js');
+
+  all[name] = obj;
+});
+
+module.exports = exports = all;

data/lib/adiwg/mdjson_schemas/version.rb

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

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mdjson-schemas",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "JSON schemas, examples, and templates for ADIwg metadata standards",
   "main": "index.js",
   "directories": {
@@ -9,11 +9,14 @@
     "test": "test"
   },
   "scripts": {
-    "test": "mocha"
+    "test": "mocha",
+    "prepublish": "scripts/prepublish.js",
+    "pretest": "scripts/prepublish.js"
   },
-  "files":[
+  "files": [
     "examples",
-    "schema"
+    "schema",
+    "resources"
   ],
   "repository": {
     "type": "git",
@@ -37,9 +40,10 @@
   "homepage": "https://github.com/adiwg/mdJson-schemas#readme",
   "devDependencies": {
     "ajv": "^5.2.2",
-    "mocha": "^3.5.0"
-  },
-  "dependencies": {
-    "require-directory": "^2.1.1"
+    "buildify": "^0.4.0",
+    "glob": "^7.1.2",
+    "mkdirp": "^0.5.1",
+    "mocha": "^3.5.0",
+    "rimraf": "^2.6.1"
   }
 }

data/schema/schema.json

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

data/scripts/prepublish.js

@@ -0,0 +1,41 @@
+#!/usr/bin/env node
+
+'use strict';
+
+let fs = require('fs');
+let buildify = require('buildify');
+let rimraf = require('rimraf');
+let mkdirp = require('mkdirp');
+let all = require('../index.js');
+let path = 'resources/js';
+
+if(fs.existsSync(path)) {
+  rimraf.sync(path);
+  console.log('Removed existing resources/js files.');
+}
+mkdirp.sync(path);
+
+console.log('Created resources/js');
+
+let files = fs.readdirSync('schema');
+
+for(let file of files) {
+  let name = path + '/' + file.split('.')[0] + '.js';
+
+  buildify()
+    .load('schema/' + file)
+    .perform(function(content) {
+      return 'module.exports = ' + content + ';';
+    })
+    .save(name);
+  //console.log('Created ' + name);
+}
+
+buildify()
+  .setContent(JSON.stringify(all))
+  .perform(function(content) {
+    return 'module.exports = ' + content + ';';
+  })
+  .save(path + '/' +'schemas.js');
+
+process.exit();

data/test/test.js

@@ -1,6 +1,9 @@
+'use strict';
+
 const assert = require('assert');
 const fs = require('fs');
 const Schemas = require('../index.js');
+const SchemasFile = require('../resources/js/schemas.js');
 const schemaFolder = '../schema/';
 
 describe('Test schemas:', function() {
@@ -44,6 +47,21 @@ describe('Test schemas:', function() {
       ajv.validate('schema', data);
       assert.equal(ajv.errors, null);
     });
+
+    it('should load all schemas from schemas.js file', function() {
+      ajv.removeSchema();
+
+      Object.keys(SchemasFile).forEach(function(key) {
+        let val = SchemasFile[key];
+
+        ajv.addSchema(val, key);
+      });
+    });
+
+    it('should validate example again', 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.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Josh Bradley, Stan Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-31 00:00:00.000000000 Z
+date: 2017-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -232,6 +232,7 @@ files:
 - schema/usage.json
 - schema/vectorRepresentation.json
 - schema/verticalExtent.json
+- scripts/prepublish.js
 - test/draft-04.json
 - test/helper.rb
 - test/tc_additionalDocumentation.rb
@@ -331,7 +332,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: JSON schemas for the ADIwg metadata standard