a127-magic
Advanced tools
Comparing version 0.7.1 to 0.7.2
@@ -107,2 +107,6 @@ /**************************************************************************** | ||
magic.controllers.controllers = path.resolve(appRoot, magic.controllers.controllers); | ||
} else if (_.isArray(magic.controllers.controllers)) { | ||
magic.controllers.controllers = _.map(magic.controllers.controllers, function(_path) { | ||
return path.resolve(appRoot, _path); | ||
}) | ||
} | ||
@@ -109,0 +113,0 @@ magic.volos.helpers = path.resolve(appRoot, magic.volos.helpers); |
@@ -43,3 +43,9 @@ /**************************************************************************** | ||
var mainControllers = startConfig.mock ? magic.controllers.mocks : magic.controllers.controllers; | ||
if (mainControllers) { controllers.push(mainControllers); } | ||
if (mainControllers) { | ||
if (Array.isArray(mainControllers)) { | ||
controllers = controllers.concat(mainControllers); | ||
} else { | ||
controllers.push(mainControllers); | ||
} | ||
} | ||
controllers.push(magic.volosAuth.controllers); | ||
@@ -52,2 +58,6 @@ | ||
var validatorConfig = { | ||
validateResponse: !!config.validateResponse | ||
}; | ||
var swaggerTools = magic.swaggerTools; | ||
@@ -59,3 +69,3 @@ | ||
magic.volosAuth, | ||
swaggerTools.swaggerValidator(), | ||
swaggerTools.swaggerValidator(validatorConfig), | ||
magic.volosApp, | ||
@@ -62,0 +72,0 @@ addResourceToRequest(magic.resource), |
{ | ||
"name": "a127-magic", | ||
"version": "0.7.1", | ||
"version": "0.7.2", | ||
"description": "Apigee 127 Swagger Loader and Middleware", | ||
@@ -5,0 +5,0 @@ "keywords": [ |
You got your Volos in my Swagger! You got your Swagger in my Volos! | ||
This module initializes and controls an Apigee-127 Swagger-driven project. Full documentation is available [here](https://github.com/apigee-127/a127-documentation/wiki). | ||
Basic usage example: | ||
var a127 = require('a127-magic'); | ||
var app = require('express')(); | ||
a127.init(function(config) { | ||
app.use(a127.middleware(config)); | ||
app.listen(process.env.PORT || 10010); | ||
}); | ||
(See also the Apigee-127 [project-skeleton](https://github.com/apigee-127/a127/blob/master/project-skeleton/app.js) |
@@ -6,2 +6,3 @@ var a127config = require('../lib/config'); | ||
var middleware = require('../lib/middleware'); | ||
var should = require('should'); | ||
@@ -19,5 +20,15 @@ describe('middleware', function() { | ||
it('must load correctly', function(done) { | ||
config.validateResponse.should.be.true; | ||
middleware(config); | ||
var magic = config['a127.magic']; | ||
should.exist(magic); | ||
var swaggerTools = magic.swaggerTools; | ||
should.exist(swaggerTools); | ||
done(); | ||
}); | ||
}); |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
103064
605
16