diff --git a/app.js b/app.js index c0b72610..32b8f788 100644 --- a/app.js +++ b/app.js @@ -54,4 +54,4 @@ app.use( require('./middleware/404') ); app.use( require('./middleware/408') ); app.use( require('./middleware/500') ); -module.exports = app; \ No newline at end of file +module.exports = app; diff --git a/controller/doc.js b/controller/doc.js index 76e10c3e..42cb0069 100644 --- a/controller/doc.js +++ b/controller/doc.js @@ -1,14 +1,11 @@ - var service = { mget: require('../service/mget') }; var geojsonify = require('../helper/geojsonify').search; function setup( backend ){ - // allow overriding of dependencies backend = backend || require('../src/backend'); - + function controller( req, res, next ){ - var query = req.clean.ids.map( function(id) { return { _index: 'pelias', @@ -18,7 +15,6 @@ function setup( backend ){ }); service.mget( backend, query, function( err, docs ){ - // error handler if( err ){ return next( err ); } @@ -30,9 +26,7 @@ function setup( backend ){ // respond return res.status(200).json( geojson ); - }); - } return controller; diff --git a/sanitiser/doc.js b/sanitiser/doc.js index 07f07aa1..352777a6 100644 --- a/sanitiser/doc.js +++ b/sanitiser/doc.js @@ -1,4 +1,3 @@ - var _sanitize = require('../sanitiser/_sanitize'), sanitizers = { id: require('../sanitiser/_id'), diff --git a/test/ciao/doc/msuccess.coffee b/test/ciao/doc/msuccess.coffee index 56808be4..ae49b82a 100644 --- a/test/ciao/doc/msuccess.coffee +++ b/test/ciao/doc/msuccess.coffee @@ -13,4 +13,4 @@ json.date.should.be.within now-5000, now+5000 #? valid geojson json.type.should.equal 'FeatureCollection' -json.features.should.be.instanceof Array \ No newline at end of file +json.features.should.be.instanceof Array diff --git a/test/ciao/doc/success.coffee b/test/ciao/doc/success.coffee index 3818aca6..bd1b64bd 100644 --- a/test/ciao/doc/success.coffee +++ b/test/ciao/doc/success.coffee @@ -13,4 +13,4 @@ json.date.should.be.within now-5000, now+5000 #? valid geojson json.type.should.equal 'FeatureCollection' -json.features.should.be.instanceof Array \ No newline at end of file +json.features.should.be.instanceof Array diff --git a/test/unit/controller/doc.js b/test/unit/controller/doc.js index 0bab18f2..e9e3918b 100644 --- a/test/unit/controller/doc.js +++ b/test/unit/controller/doc.js @@ -1,4 +1,3 @@ - var setup = require('../../../controller/doc'), mockBackend = require('../mock/backend'); @@ -93,7 +92,7 @@ module.exports.tests.functional_success = function(test, common) { text: 'test name2, city2, state2' } }]; - + test('functional success (with details)', function(t) { var backend = mockBackend( 'client/mget/ok/1', function( cmd ){ t.deepEqual(cmd, { body: { docs: [ { _id: 123, _index: 'pelias', _type: 'a' } ] } }, 'correct backend command'); @@ -141,4 +140,4 @@ module.exports.all = function (tape, common) { for( var testCase in module.exports.tests ){ module.exports.tests[testCase](test, common); } -}; \ No newline at end of file +}; diff --git a/test/unit/run.js b/test/unit/run.js index 75051927..222a1836 100644 --- a/test/unit/run.js +++ b/test/unit/run.js @@ -25,4 +25,4 @@ var tests = [ tests.map(function(t) { t.all(tape, common); -}); \ No newline at end of file +}); diff --git a/test/unit/sanitiser/doc.js b/test/unit/sanitiser/doc.js index c44f8808..2f88dc0a 100644 --- a/test/unit/sanitiser/doc.js +++ b/test/unit/sanitiser/doc.js @@ -7,7 +7,7 @@ var doc = require('../../../sanitiser/doc'), defaultLengthError = function(input) { return 'invalid param \''+ input + '\': text length, must be >0'; }, defaultFormatError = 'invalid: must be of the format type:id for ex: \'geoname:4163334\'', defaultError = 'invalid param \'id\': text length, must be >0', - defaultMissingTypeError = function(input) { + defaultMissingTypeError = function(input) { var type = input.split(delimiter)[0]; return type + ' is invalid. It must be one of these values - [' + indeces.join(', ') + ']'; }, defaultClean = { ids: [ { id: '123', type: 'geoname' } ], details: true }, @@ -111,7 +111,7 @@ module.exports.tests.sanitize_details = function(test, common) { t.equal(clean.details, false, 'default details set (to false)'); t.end(); }); - }); + }); }); var valid_values = ['true', true, 1]; @@ -121,7 +121,7 @@ module.exports.tests.sanitize_details = function(test, common) { t.equal(clean.details, true, 'details set to true'); t.end(); }); - }); + }); }); var valid_false_values = ['false', false, 0]; @@ -131,7 +131,7 @@ module.exports.tests.sanitize_details = function(test, common) { t.equal(clean.details, false, 'details set to false'); t.end(); }); - }); + }); }); test('test default behavior', function(t) { @@ -196,4 +196,4 @@ module.exports.all = function (tape, common) { for( var testCase in module.exports.tests ){ module.exports.tests[testCase](test, common); } -}; \ No newline at end of file +};