Merge pull request #64 from APIs-guru/master

Small cleanups

.eslintrc

@@ -27,11 +27,14 @@
     object-curly-spacing: [2, "never"]
     quotes: [2, "single", "avoid-escape"]
     radix: 2
-    space-after-keywords: [2, "always"]
+    keyword-spacing: [2, {"after": true}]
     space-before-blocks: [2, "always"]
     space-before-function-paren: [2, "always"]
     space-in-parens: [2, "never"]
     spaced-comment: [2, "always"]
     strict: [2, "global"]
     valid-jsdoc: [2, {"requireReturn": false, "prefer": {"return": "returns"}}]
     wrap-iife: 2
+
+  globals:
+    Promise: true

README.md

@@ -53,8 +53,9 @@ npm install sway --save
 
 ## Documentation
 
-The documentation for this project can be found here: https://github.com/apigee-127/sway/blob/master/docs/README.md
-Of course, if you just want a quick link to the API documentation, that would be here: https://github.com/apigee-127/sway/blob/master/docs/API.md
+The documentation for this project can be found here: [/docs/README](/docs/README.md)
+
+Of course, if you just want a quick link to the API documentation, that would be here:[/docs/API.md](/docs/API.md)
 
 ## Contributing
 

lib/helpers.js

@@ -31,8 +31,6 @@ var mocker = require('json-schema-faker');
 var ZSchema = require('z-schema');
 
 var collectionFormats = [undefined, 'csv', 'multi', 'pipes', 'ssv', 'tsv'];
-var draft04Json = require('./validation/json-schema-draft-04.json');
-var draft04Url = 'http://json-schema.org/draft-04/schema';
 var jsonMocker = createJSONMocker();
 var jsonSchemaValidator = createJSONValidator();
 // https://github.com/swagger-api/swagger-spec/blob/master/versions/2.0.md#parameter-object
@@ -80,9 +78,6 @@ function createJSONValidator () {
     reportPathAsArray: true
   });
 
-  // Add the draft-04 spec
-  validator.setRemoteReference(draft04Url, draft04Json);
-
   // Add the custom validators
   _.each(formatValidators, function (handler, name) {
     ZSchema.registerFormat(name, handler);
@@ -356,8 +351,6 @@ module.exports.removeCirculars = function (obj) {
   walk([], obj, []);
 }
 
-module.exports.supportedHttpMethods = ['get', 'put', 'post', 'delete', 'options', 'head', 'patch'];
-
 /**
  * Validates the provided value against the JSON Schema by name or value.
  *

lib/types/path.js

@@ -25,11 +25,11 @@
 'use strict';
 
 var _ = require('lodash');
-var helpers = require('../helpers');
 var JsonRefs = require('json-refs');
 var Operation = require('./operation');
 var Parameter = require('./parameter');
 var pathToRegexp = require('path-to-regexp');
+var supportedHttpMethods = require('swagger-methods');
 
 /**
  * The Path object.
@@ -100,7 +100,7 @@ function Path (api, path, definition, definitionFullyResolved, pathToDefinition)
   this.operationObjects = _.reduce(definitionFullyResolved, function (operations, operationDef, method) {
     var oPath = pathToDefinition.concat(method);
 
-    if (helpers.supportedHttpMethods.indexOf(method) > -1) {
+    if (supportedHttpMethods.indexOf(method) > -1) {
       operations.push(new Operation(that, method, _.get(api.definitionRemotesResolved, oPath), operationDef, oPath));
     }