Fix exceptions when loading OAS documents with extensions on paths an…

…d responses

lib/types/api.js

@@ -102,13 +102,19 @@ function SwaggerApi (definition, definitionRemotesResolved, definitionFullyResol
   debug('  Paths:');
 
   // Create the Path objects
-  this.pathObjects = _.map(definitionFullyResolved.paths, function (pathDef, path) {
-    return new Path(that,
-                    path,
-                    _.get(definitionRemotesResolved, ['paths', path]),
-                    pathDef,
-                    ['paths', path]);
-  });
+  this.pathObjects = _.reduce(definitionFullyResolved.paths, function (paths, pathDef, path) {
+    // do not process extensions
+    if (_.startsWith(path, 'x-')) {
+      return paths;
+    }
+    paths.push(new Path(
+      that,
+      path,
+      _.get(definitionRemotesResolved, ['paths', path]),
+      pathDef,
+      ['paths', path]));
+    return paths;
+  }, []);
 }
 
 /**

lib/types/operation.js

@@ -120,15 +120,20 @@ function Operation (pathObject, method, definition, definitionFullyResolved, pat
   this._debug('          Responses:');
 
   // Create response objects from responses defined in the operation definition
-  this.responseObjects = _.map(this.definitionFullyResolved.responses, function (responseDef, code) {
+  this.responseObjects = _.reduce(this.definitionFullyResolved.responses, function (responses, responseDef, code) {
+    // do not process extensions
+    if (_.startsWith(code, 'x-')) {
+      return responses;
+    }
     var rPath = pathToDefinition.concat(['responses', code])
 
-    return new Response(that,
-                        code,
-                        _.get(that.pathObject.api.definitionRemotesResolved, rPath),
-                        responseDef,
-                        rPath);
-  });
+    responses.push(new Response(that,
+      code,
+      _.get(that.pathObject.api.definitionRemotesResolved, rPath),
+      responseDef,
+      rPath));
+    return responses;
+  }, []);
 
   this._debug('          Security:');
 

lib/validation/validators.js

@@ -322,6 +322,11 @@ function validateReferences (api) {
   });
 
   _.forEach(api.definitionFullyResolved.responses, function (def, name) {
+    // do not process extensions
+    if (_.startsWith(name, 'x-')) {
+      return;
+    }
+
     referenceable.push(JsonRefs.pathToPtr(['responses', name]));
   });
 
@@ -398,6 +403,11 @@ function validateReferences (api) {
   _.forEach(api.definitionFullyResolved.security, createSecurityProcessor(['security']));
 
   _.forEach(api.definitionFullyResolved.paths, function (pathDef, name) {
+    // do not process extensions
+    if (_.startsWith(name, 'x-')) {
+      return;
+    }
+
     var pPath = ['paths', name];
 
     _.forEach(pathDef.security, createSecurityProcessor(pPath.concat('security')));
@@ -477,6 +487,11 @@ function validateSchemaObjects (api) {
 
   function validateResponses (responses, path) {
     _.forEach(responses, function (responseDef, name) {
+      // do not process extensions
+      if (_.startsWith(name, 'x-')) {
+        return;
+      }
+
       var rPath = path.concat(name);
 
       _.forEach(responseDef.headers, function (header, hName) {
@@ -502,6 +517,11 @@ function validateSchemaObjects (api) {
 
   // Validate paths and operations
   _.forEach(api.definitionFullyResolved.paths, function (pathDef, path) {
+    // do not process extensions
+    if (_.startsWith(path, 'x-')) {
+      return;
+    }
+
     var pPath = ['paths', path];
 
     // Validate path-level parameter definitions
@@ -570,6 +590,11 @@ function validatePathsAndOperations (api) {
     var normalizedPath = path;
     var pPath = ['paths', path];
 
+    // do not process extensions
+    if (_.startsWith(path, 'x-')) {
+      return metadata;
+    }
+
     _.forEach(path.match(/\{(.*?)\}/g), function (arg, index) {
       // Record the path parameter name
       declaredPathParameters.push(arg.replace(/[{}]/g, ''));

test/browser/documents/2.0/swagger.yaml

@@ -31,6 +31,10 @@ tags:
 schemes:
 - "http"
 paths:
+  x-an-extension-null:
+  x-an-extension-primitive: 1
+  x-an-extension-array: []
+  x-an-extension-object: {}
   /pet:
     post:
       tags:
@@ -52,6 +56,10 @@ paths:
         schema:
           $ref: "#/definitions/Pet"
       responses:
+        x-an-extension-null:
+        x-an-extension-primitive: 1
+        x-an-extension-array: []
+        x-an-extension-object: {}
         405:
           description: "Invalid input"
     put:

test/test-api.js

@@ -344,8 +344,12 @@ function runTests (mode) {
     });
 
     describe('#getPaths', function () {
-      it('should return the expected path objects', function () {
-        assert.equal(swaggerApi.getPaths().length, Object.keys(swaggerApi.definitionFullyResolved.paths).length);
+      it('should return the expected path objects without extensions', function () {
+        var paths = Object.keys(swaggerApi.definitionFullyResolved.paths).filter(function (path) {
+          return path.indexOf('x-') !== 0;
+        });
+
+        assert.equal(swaggerApi.getPaths().length, paths.length);
       });
     });