Run schemas through ajv

Author: blakeembrey

package.json

@@ -11,7 +11,7 @@
   ],
   "scripts": {
     "lint": "standard",
-    "test-std": "mocha -R spec --bail",
+    "test-spec": "mocha -R spec --bail",
     "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- -R spec --bail",
     "test": "npm run lint && npm run test-cov"
   },
@@ -39,13 +39,13 @@
   },
   "homepage": "https://github.com/mulesoft-labs/raml-object-standard",
   "devDependencies": {
+    "ajv": "^0.7.0",
     "chai": "^1.10.0",
     "istanbul": "^0.3.5",
     "mocha": "^2.1.0",
     "pre-commit": "^1.0.1",
     "raml-parser": "^0.8.10",
-    "standard": "^2.1.1",
-    "z-schema": "^3.4.3"
+    "standard": "^2.1.1"
   },
   "dependencies": {
     "extend": "^2.0.0"

schema.json

@@ -497,7 +497,7 @@
     "rootResource": {
       "type": "object",
       "patternProperties": {
-        "^\\/": {
+        "^/": {
           "$ref": "#/definitions/resource"
         }
       },
@@ -528,7 +528,7 @@
         "^(?:head|get|post|put|patch|delete|options|trace|connect)$": {
           "$ref": "#/definitions/method"
         },
-        "^\\/": {
+        "^/": {
           "$ref": "#/definitions/resource"
         }
       },

test/support/validate.js

@@ -1,21 +1,15 @@
 var schema = require('../../schema.json')
-var ZSchema = require('z-schema')
-var join = require('path').join
-var readFile = require('fs').readFileSync
-var validator = new ZSchema()
-
-validator.setRemoteReference(
-  'http://json-schema.org/draft-04/schema',
-  JSON.parse(readFile(join(__dirname, '../../vendor/schema'), 'utf8'))
-)
+var Ajv = require('ajv')
+var ajv = Ajv({ allErrors: true, verbose: true })
+var validate = ajv.compile(schema)
 
 module.exports = validateObject
 
 function validateObject (obj) {
-  var result = validator.validate(obj, schema)
+  var result = validate(obj)
 
   return {
     valid: result,
-    errors: validator.getLastErrors()
+    errors: validate.errors
   }
 }

test/transform-raml-js-parser-08.js

@@ -7,15 +7,13 @@ var transform = require('../transform/raml-js-parser-08')
 
 describe('transform raml js parser 0.8', function () {
   it('should parse and transform raml into standard object', function () {
-    this.timeout(5 * 60 * 1000)
-
     return parser.loadFile(join(__dirname, 'fixtures/github_v3/api.raml'))
       .then(function (data) {
         var raml = transform(data)
         var result = validate(raml)
 
         expect(result.valid).to.be.true
-        expect(result.errors).to.be.empty
+        expect(result.errors).to.not.exist
 
         expect(raml.title).to.be.a('string')
         expect(raml.version).to.be.a('string')