Merge pull request #8 from siddick/master

Update swagger-parser to fix swagger 2.0 parsing issue

Author: jharmn

lib/validate.js

@@ -12,24 +12,13 @@ var parser  = Promise.promisifyAll(require("swagger-parser"));
 var yaml    = Promise.promisifyAll(require("js-yaml"));
 var _       = Promise.promisifyAll(require("lodash"));
 
-
 function getSpecPromise(file) {
-  return parser.parseAsync(file)
-  .spread(function(api, metadata) {
-    return api;
-  }).catch(function(e) {
-    console.error("unable to read swagger file\n"+e)
-    process.exit(1);
-  });
+  return parser.parseAsync(file, {});
 }
 
 function getCheckStylePromise(file) {
   return fs.readFileAsync(file)
-  .then(yaml.safeLoad)
-  .catch(function(e) {
-    console.error("unable to read checkstyle\n"+e)
-    process.exit(1);
-  });
+  .then(yaml.safeLoad);
 }
 
 function getSchema(checkStyle) {
@@ -45,6 +34,7 @@ function getSchema(checkStyle) {
   var parameterKeys = {
     'in': Joi.string().valid('query', 'header'),
     format: Joi.string(),
+    $ref: Joi.string(),
     type: Joi.string(),
     description: Joi.string(),
     required: Joi.boolean(),
@@ -61,11 +51,11 @@ function getSchema(checkStyle) {
       version: Joi.string()
     }),
     host: joiRegex(checkStyle.host),
-    scheme: joiRegex(checkStyle.schemes),
+    scheme: joiRegex(checkStyle.scheme),
     basePath: joiRegex(checkStyle.basePath),
     produces: Joi.array().items(joiRegex(checkStyle.produces)),
     consumes: Joi.array().items(joiRegex(checkStyle.consumes)),
-    schemes: Joi.array().items(joiRegex(checkStyle.schemes)),
+    schemes: Joi.array().items(joiRegex(checkStyle.scheme)),
     paths: Joi.object().pattern(pathConvention,
       Joi.object().pattern(verbs, Joi.object().keys({
         summary: Joi.any(),
@@ -94,8 +84,8 @@ function validate(checkStyleFile, specFile, callback) {
   }).spread(function(spec, schema, callback) {
     return Joi.validate(spec, schema);
   }).then(function(result) {
-    callback(result, null);
+    callback(null, result);
   }).catch(function(e) {
-    callback(null, e);
+    callback(e);
   });
 }

package.json

@@ -2,9 +2,9 @@
   "name": "swagger-checkstyle",
   "version": "1.0.0",
   "description": "Checkstyle on swagger definitions",
-  "main": "index.js",
+  "main": "lib/index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "mocha"
   },
   "author": "Jason Harmon",
   "license": "ISC",
@@ -15,7 +15,7 @@
     "js-yaml": "^3.3.1",
     "json-mask": "^0.3.4",
     "lodash": "^3.9.3",
-    "swagger-parser": "^2.5.0"
+    "swagger-parser": "^3.3"
   },
   "devDependencies": {
     "mocha": "^2.2.5",

test/convention_validation.js

@@ -8,7 +8,7 @@ describe('validate', function(done) {
     spec = './examples/uber/swagger.yaml';
     result = null;
 
-    swaggerCheckStyle.validate(checkStyle, spec, function(result, err) {
+    swaggerCheckStyle.validate(checkStyle, spec, function(err, result) {
       if (err) throw err;
       should.not.exist(result.error)
       done();
@@ -18,7 +18,7 @@ describe('validate', function(done) {
     checkStyle = './examples/uber/swagger-checkstyle.yaml';
     spec = './examples/uber/swagger-errors.yaml';
 
-    swaggerCheckStyle.validate(checkStyle, spec, function(result, err) {
+    swaggerCheckStyle.validate(checkStyle, spec, function(err, result) {
       if (err) throw err;
       result.error.name.should.eql("ValidationError");
       done();