Remove BaseController dependency and remove unused code

test/acceptance/overviews_queries.js

@@ -4,7 +4,6 @@ var assert = require('../support/assert');
 var cartodbServer = require('../../lib/cartodb/server');
 var ServerOptions = require('./ported/support/ported_server_options');
 var testClient = require('./ported/support/test_client');
-var BaseController = require('../../lib/cartodb/controllers/base');
 
 describe('overviews_queries', function() {
 
@@ -13,15 +12,7 @@ describe('overviews_queries', function() {
 
     var IMAGE_EQUALS_TOLERANCE_PER_MIL = 2;
 
-    var req2paramsFn;
-    before(function() {
-        req2paramsFn = BaseController.prototype.req2params;
-        BaseController.prototype.req2params = ServerOptions.req2params;
-    });
-
     after(function() {
-        BaseController.prototype.req2params = req2paramsFn;
-
         testHelper.rmdirRecursiveSync(global.environment.millstone.cache_basedir);
     });
 

test/acceptance/ported/attributes.js

@@ -4,13 +4,10 @@ var assert        = require('../../support/assert');
 var step          = require('step');
 var cartodbServer = require('../../../lib/cartodb/server');
 var PortedServerOptions = require('./support/ported_server_options');
-var BaseController = require('../../../lib/cartodb/controllers/base');
 
 var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token');
 
-
 describe('attributes', function() {
-
     var server = cartodbServer(PortedServerOptions);
     server.setMaxListeners(0);
 
@@ -49,16 +46,6 @@ describe('attributes', function() {
         testHelper.deleteRedisKeys(keysToDelete, done);
     });
 
-    var req2paramsFn;
-    before(function() {
-        req2paramsFn = BaseController.prototype.req2params;
-        BaseController.prototype.req2params = PortedServerOptions.req2params;
-    });
-
-    after(function() {
-        BaseController.prototype.req2params = req2paramsFn;
-    });
-
     it("can only be fetched from layer having an attributes spec", function(done) {
 
             var expected_token;

test/acceptance/ported/blend.js

@@ -3,21 +3,7 @@ require('../../support/test_helper');
 var assert = require('../../support/assert');
 var testClient = require('./support/test_client');
 
-var PortedServerOptions = require('./support/ported_server_options');
-var BaseController = require('../../../lib/cartodb/controllers/base');
-
 describe('blend png renderer', function() {
-
-    var req2paramsFn;
-    before(function() {
-        req2paramsFn = BaseController.prototype.req2params;
-        BaseController.prototype.req2params = PortedServerOptions.req2params;
-    });
-
-    after(function() {
-        BaseController.prototype.req2params = req2paramsFn;
-    });
-
     var IMAGE_TOLERANCE_PER_MIL = 20;
 
     function plainTorqueMapConfig(plainColor) {

test/acceptance/ported/blend_filtering.js

@@ -5,20 +5,13 @@ var testClient = require('./support/test_client');
 var fs = require('fs');
 var http = require('http');
 
-var PortedServerOptions = require('./support/ported_server_options');
-var BaseController = require('../../../lib/cartodb/controllers/base');
-
 describe('blend layer filtering', function() {
 
     var IMG_TOLERANCE_PER_MIL = 20;
 
     var httpRendererResourcesServer;
 
-    var req2paramsFn;
     before(function(done) {
-        req2paramsFn = BaseController.prototype.req2params;
-        BaseController.prototype.req2params = PortedServerOptions.req2params;
-
         // Start a server to test external resources
         httpRendererResourcesServer = http.createServer( function(request, response) {
             var filename = __dirname + '/../../fixtures/http/light_nolabels-1-0-0.png';
@@ -32,7 +25,6 @@ describe('blend layer filtering', function() {
     });
 
     after(function(done) {
-        BaseController.prototype.req2params = req2paramsFn;
         httpRendererResourcesServer.close(done);
     });
 

test/acceptance/ported/blend_http_fallback.js

@@ -5,19 +5,13 @@ var testClient = require('./support/test_client');
 var fs = require('fs');
 var http = require('http');
 
-var PortedServerOptions = require('./support/ported_server_options');
-var BaseController = require('../../../lib/cartodb/controllers/base');
-
 describe('blend http fallback', function() {
 
     var IMG_TOLERANCE_PER_MIL = 20;
 
     var httpRendererResourcesServer;
 
-    var req2paramsFn;
     before(function(done) {
-        req2paramsFn = BaseController.prototype.req2params;
-        BaseController.prototype.req2params = PortedServerOptions.req2params;
         // Start a server to test external resources
         httpRendererResourcesServer = http.createServer( function(request, response) {
             if (request.url.match(/^\/error404\//)) {
@@ -39,7 +33,6 @@ describe('blend http fallback', function() {
     });
 
     after(function(done) {
-        BaseController.prototype.req2params = req2paramsFn;
         httpRendererResourcesServer.close(done);
     });
 

test/acceptance/ported/blend_http_timeout.js

@@ -6,21 +6,7 @@ var serverOptions = require('./support/ported_server_options');
 var fs = require('fs');
 var http = require('http');
 
-var PortedServerOptions = require('./support/ported_server_options');
-var BaseController = require('../../../lib/cartodb/controllers/base');
-
 describe.skip('blend http client timeout', function() {
-
-    var req2paramsFn;
-    before(function() {
-        req2paramsFn = BaseController.prototype.req2params;
-        BaseController.prototype.req2params = PortedServerOptions.req2params;
-    });
-
-    after(function() {
-        BaseController.prototype.req2params = req2paramsFn;
-    });
-
     var mapConfig = {
         version: '1.3.0',
         layers: [

test/acceptance/ported/external_resources.js

@@ -1,16 +1,12 @@
 var testHelper = require('../../support/test_helper');
 
-
 var assert = require('../../support/assert');
 var fs = require('fs');
 var PortedServerOptions = require('./support/ported_server_options');
 var http = require('http');
 var testClient = require('./support/test_client');
-
 var nock = require('nock');
 
-var BaseController = require('../../../lib/cartodb/controllers/base');
-
 describe('external resources', function() {
 
     var res_serv; // resources server
@@ -19,12 +15,8 @@ describe('external resources', function() {
 
     var IMAGE_EQUALS_TOLERANCE_PER_MIL = 25;
 
-    var req2paramsFn;
     before(function(done) {
         nock.enableNetConnect('127.0.0.1');
-
-        req2paramsFn = BaseController.prototype.req2params;
-        BaseController.prototype.req2params = PortedServerOptions.req2params;
         // Start a server to test external resources
         res_serv = http.createServer( function(request, response) {
             ++res_serv_status.numrequests;
@@ -44,8 +36,6 @@ describe('external resources', function() {
     });
 
     after(function(done) {
-        BaseController.prototype.req2params = req2paramsFn;
-
         testHelper.rmdirRecursiveSync(global.environment.millstone.cache_basedir);
 
         // Close the resources server

test/acceptance/ported/limits.js

@@ -6,19 +6,14 @@ var assert = require('../../support/assert');
 var testClient = require('./support/test_client');
 var serverOptions = require('./support/ported_server_options');
 
-var PortedServerOptions = require('./support/ported_server_options');
-var BaseController = require('../../../lib/cartodb/controllers/base');
-
 describe.skip('render limits', function() {
 
     var IMAGE_EQUALS_TOLERANCE_PER_MIL = 25;
 
     var limitsConfig;
     var onTileErrorStrategy;
-    var req2paramsFn;
+
     before(function() {
-        req2paramsFn = BaseController.prototype.req2params;
-        BaseController.prototype.req2params = PortedServerOptions.req2params;
         limitsConfig = serverOptions.renderer.mapnik.limits;
         serverOptions.renderer.mapnik.limits = {
             render: 50,
@@ -31,7 +26,6 @@ describe.skip('render limits', function() {
     });
 
     after(function() {
-        BaseController.prototype.req2params = req2paramsFn;
         serverOptions.renderer.mapnik.limits = limitsConfig;
         serverOptions.renderer.onTileErrorStrategy = onTileErrorStrategy;
     });

test/acceptance/ported/multilayer.js

@@ -8,7 +8,6 @@ var mapnik = require('windshaft').mapnik;
 var cartodbServer = require('../../../lib/cartodb/server');
 var ServerOptions = require('./support/ported_server_options');
 var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token');
-var BaseController = require('../../../lib/cartodb/controllers/base');
 
 describe('multilayer', function() {
 
@@ -24,16 +23,6 @@ describe('multilayer', function() {
       assert.equal(res.headers['access-control-allow-origin'], '*');
     }
 
-    var req2paramsFn;
-    before(function() {
-      req2paramsFn = BaseController.prototype.req2params;
-      BaseController.prototype.req2params = ServerOptions.req2params;
-    });
-
-    after(function() {
-        BaseController.prototype.req2params = req2paramsFn;
-    });
-
     // See https://github.com/Vizzuality/Windshaft/issues/70
     it("post layergroup with encoding in content-type", function(done) {
       var layergroup =  {

test/acceptance/ported/multilayer_error_cases.js

@@ -7,23 +7,11 @@ var ServerOptions = require('./support/ported_server_options');
 var testClient = require('./support/test_client');
 var TestClient = require('../../support/test-client');
 
-var BaseController = require('../../../lib/cartodb/controllers/base');
-
 describe('multilayer error cases', function() {
 
     var server = cartodbServer(ServerOptions);
     server.setMaxListeners(0);
 
-    var req2paramsFn;
-    before(function() {
-        req2paramsFn = BaseController.prototype.req2params;
-        BaseController.prototype.req2params = ServerOptions.req2params;
-    });
-
-    after(function() {
-        BaseController.prototype.req2params = req2paramsFn;
-    });
-
     // var client = null;
     afterEach(function(done) {
         if (this.client) {

test/acceptance/ported/multilayer_interactivity.js

@@ -7,23 +7,11 @@ var getLayerTypeFn = require('windshaft').model.MapConfig.prototype.getType;
 var PortedServerOptions = require('./support/ported_server_options');
 var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token');
 
-var BaseController = require('../../../lib/cartodb/controllers/base');
-
 describe('multilayer interactivity and layers order', function() {
 
     var server = cartodbServer(PortedServerOptions);
     server.setMaxListeners(0);
 
-    var req2paramsFn;
-    before(function() {
-        req2paramsFn = BaseController.prototype.req2params;
-        BaseController.prototype.req2params = PortedServerOptions.req2params;
-    });
-
-    after(function() {
-        BaseController.prototype.req2params = req2paramsFn;
-    });
-
     function layerType(layer) {
         return layer.type || 'undefined';
     }

test/acceptance/ported/raster.js

@@ -4,8 +4,6 @@ var assert = require('../../support/assert');
 var step = require('step');
 var cartodbServer = require('../../../lib/cartodb/server');
 var ServerOptions = require('./support/ported_server_options');
-
-var BaseController = require('../../../lib/cartodb/controllers/base');
 var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token');
 
 describe('raster', function() {
@@ -20,18 +18,7 @@ describe('raster', function() {
 
     var IMAGE_EQUALS_TOLERANCE_PER_MIL = 2;
 
-    var req2paramsFn;
-    before(function() {
-        req2paramsFn = BaseController.prototype.req2params;
-        BaseController.prototype.req2params = ServerOptions.req2params;
-    });
-
-    after(function() {
-        BaseController.prototype.req2params = req2paramsFn;
-    });
-
     it("can render raster for valid mapconfig", function(done) {
-
       var mapconfig =  {
         version: '1.2.0',
         layers: [

test/acceptance/ported/regressions.js

@@ -1,22 +1,10 @@
 var testHelper = require('../../support/test_helper');
 
 var assert = require('../../support/assert');
-var ServerOptions = require('./support/ported_server_options');
 var testClient = require('./support/test_client');
 
-var BaseController = require('../../../lib/cartodb/controllers/base');
-
 describe('regressions', function() {
-
-    var req2paramsFn;
-    before(function() {
-        req2paramsFn = BaseController.prototype.req2params;
-        BaseController.prototype.req2params = ServerOptions.req2params;
-    });
-
-
     after(function() {
-        BaseController.prototype.req2params = req2paramsFn;
         testHelper.rmdirRecursiveSync(global.environment.millstone.cache_basedir);
     });
 

test/acceptance/ported/retina.js

@@ -5,7 +5,6 @@ var mapnik = require('windshaft').mapnik;
 var cartodbServer = require('../../../lib/cartodb/server');
 var ServerOptions = require('./support/ported_server_options');
 
-var BaseController = require('../../../lib/cartodb/controllers/base');
 var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token');
 
 describe('retina support', function() {
@@ -15,15 +14,6 @@ describe('retina support', function() {
     var server = cartodbServer(ServerOptions);
     server.setMaxListeners(0);
 
-    var req2paramsFn;
-    before(function() {
-        req2paramsFn = BaseController.prototype.req2params;
-        BaseController.prototype.req2params = ServerOptions.req2params;
-    });
-
-    after(function() {
-        BaseController.prototype.req2params = req2paramsFn;
-    });
 
     var keysToDelete;
     beforeEach(function(done) {

test/acceptance/ported/server.js

@@ -5,22 +5,12 @@ var cartodbServer = require('../../../lib/cartodb/server');
 var ServerOptions = require('./support/ported_server_options');
 var testClient = require('./support/test_client');
 
-var BaseController = require('../../../lib/cartodb/controllers/base');
-
 describe('server', function() {
 
     var server = cartodbServer(ServerOptions);
     server.setMaxListeners(0);
 
-    var req2paramsFn;
-    before(function() {
-        req2paramsFn = BaseController.prototype.req2params;
-        BaseController.prototype.req2params = ServerOptions.req2params;
-    });
-
     after(function() {
-        BaseController.prototype.req2params = req2paramsFn;
-
         testHelper.rmdirRecursiveSync(global.environment.millstone.cache_basedir);
     });
 

test/acceptance/ported/server_gettile.js

@@ -7,8 +7,6 @@ var cartodbServer = require('../../../lib/cartodb/server');
 var ServerOptions = require('./support/ported_server_options');
 var testClient = require('./support/test_client');
 
-var BaseController = require('../../../lib/cartodb/controllers/base');
-
 describe('server_gettile', function() {
 
     var server = cartodbServer(ServerOptions);
@@ -16,16 +14,7 @@ describe('server_gettile', function() {
 
     var IMAGE_EQUALS_TOLERANCE_PER_MIL = 25;
 
-    var req2paramsFn;
-    before(function() {
-        req2paramsFn = BaseController.prototype.req2params;
-        BaseController.prototype.req2params = ServerOptions.req2params;
-    });
-
-
     after(function() {
-        BaseController.prototype.req2params = req2paramsFn;
-
         testHelper.rmdirRecursiveSync(global.environment.millstone.cache_basedir);
     });
 

test/acceptance/ported/server_png8_format.js

@@ -6,13 +6,11 @@ var fs = require('fs');
 var cartodbServer = require('../../../lib/cartodb/server');
 var ServerOptions = require('./support/ported_server_options');
 
-var BaseController = require('../../../lib/cartodb/controllers/base');
 var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token');
 
 var IMAGE_EQUALS_TOLERANCE_PER_MIL = 85;
 
 describe('server_png8_format', function() {
-
     var serverOptionsPng32 = ServerOptions;
     serverOptionsPng32.grainstore = _.clone(ServerOptions.grainstore);
     serverOptionsPng32.grainstore.mapnik_tile_format = 'png32';
@@ -25,13 +23,9 @@ describe('server_png8_format', function() {
     var serverPng8 = cartodbServer(serverOptionsPng8);
     serverPng8.setMaxListeners(0);
 
-
     var layergroupId;
 
-    var req2paramsFn;
     before(function(done) {
-        req2paramsFn = BaseController.prototype.req2params;
-        BaseController.prototype.req2params = ServerOptions.req2params;
         var testPngFilesDir = __dirname + '/../../results/png';
         fs.readdirSync(testPngFilesDir)
             .filter(function(fileName) {
@@ -45,10 +39,6 @@ describe('server_png8_format', function() {
         done();
     });
 
-    after(function() {
-        BaseController.prototype.req2params = req2paramsFn;
-    });
-
     var keysToDelete;
     beforeEach(function() {
         keysToDelete = {

test/acceptance/ported/static_maps.js

@@ -5,9 +5,6 @@ var testClient = require('./support/test_client');
 var http = require('http');
 var fs = require('fs');
 
-var PortedServerOptions = require('./support/ported_server_options');
-var BaseController = require('../../../lib/cartodb/controllers/base');
-
 describe('static_maps', function() {
 
     var validUrlTemplate = 'http://127.0.0.1:8033/{s}/{z}/{x}/{y}.png';
@@ -15,11 +12,7 @@ describe('static_maps', function() {
 
     var httpRendererResourcesServer;
 
-    var req2paramsFn;
     before(function(done) {
-        req2paramsFn = BaseController.prototype.req2params;
-        BaseController.prototype.req2params = PortedServerOptions.req2params;
-
         // Start a server to test external resources
         httpRendererResourcesServer = http.createServer( function(request, response) {
             var filename = __dirname + '/../../fixtures/http/basemap.png';
@@ -33,7 +26,6 @@ describe('static_maps', function() {
     });
 
     after(function(done) {
-        BaseController.prototype.req2params = req2paramsFn;
         httpRendererResourcesServer.close(done);
     });
 

test/acceptance/ported/torque.js

@@ -6,7 +6,6 @@ var step = require('step');
 var cartodbServer = require('../../../lib/cartodb/server');
 var ServerOptions = require('./support/ported_server_options');
 
-var BaseController = require('../../../lib/cartodb/controllers/base');
 var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token');
 
 describe('torque', function() {
@@ -14,16 +13,6 @@ describe('torque', function() {
     var server = cartodbServer(ServerOptions);
     server.setMaxListeners(0);
 
-    var req2paramsFn;
-    before(function() {
-        req2paramsFn = BaseController.prototype.req2params;
-        BaseController.prototype.req2params = ServerOptions.req2params;
-    });
-
-    after(function() {
-        BaseController.prototype.req2params = req2paramsFn;
-    });
-
     var keysToDelete;
     beforeEach(function() {
         keysToDelete = {};

test/acceptance/ported/torque_boundaries.js

@@ -4,21 +4,9 @@ var assert = require('../../support/assert');
 var cartodbServer = require('../../../lib/cartodb/server');
 var ServerOptions = require('./support/ported_server_options');
 
-var BaseController = require('../../../lib/cartodb/controllers/base');
 var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token');
 
 describe('torque boundary points', function() {
-
-    var req2paramsFn;
-    before(function() {
-        req2paramsFn = BaseController.prototype.req2params;
-        BaseController.prototype.req2params = ServerOptions.req2params;
-    });
-
-    after(function() {
-        BaseController.prototype.req2params = req2paramsFn;
-    });
-
     var layergroupIdToDelete = null;
 
     beforeEach(function() {

test/acceptance/ported/torque_png.js

@@ -3,21 +3,7 @@ require('../../support/test_helper');
 var assert = require('../../support/assert');
 var testClient = require('./support/test_client');
 
-var PortedServerOptions = require('./support/ported_server_options');
-var BaseController = require('../../../lib/cartodb/controllers/base');
-
 describe('torque png renderer', function() {
-
-    var req2paramsFn;
-    before(function() {
-        req2paramsFn = BaseController.prototype.req2params;
-        BaseController.prototype.req2params = PortedServerOptions.req2params;
-    });
-
-    after(function() {
-        BaseController.prototype.req2params = req2paramsFn;
-    });
-
     var IMAGE_TOLERANCE_PER_MIL = 20;
 
     var torquePngPointsMapConfig =  {

test/acceptance/ported/torque_zero_zero.js

@@ -3,21 +3,7 @@ require('../../support/test_helper');
 var assert = require('../../support/assert');
 var testClient = require('./support/test_client');
 
-var PortedServerOptions = require('./support/ported_server_options');
-var BaseController = require('../../../lib/cartodb/controllers/base');
-
 describe('torque tiles at 0,0 point', function() {
-
-    var req2paramsFn;
-    before(function() {
-        req2paramsFn = BaseController.prototype.req2params;
-        BaseController.prototype.req2params = PortedServerOptions.req2params;
-    });
-
-    after(function() {
-        BaseController.prototype.req2params = req2paramsFn;
-    });
-
 /*
     Tiles are represented as in:
 

test/acceptance/ported/wrap.js

@@ -3,21 +3,7 @@ require('../../support/test_helper');
 var assert = require('../../support/assert');
 var testClient = require('./support/test_client');
 
-var PortedServerOptions = require('./support/ported_server_options');
-var BaseController = require('../../../lib/cartodb/controllers/base');
-
 describe('wrap x coordinate', function() {
-
-    var req2paramsFn;
-    before(function() {
-        req2paramsFn = BaseController.prototype.req2params;
-        BaseController.prototype.req2params = PortedServerOptions.req2params;
-    });
-
-    after(function() {
-        BaseController.prototype.req2params = req2paramsFn;
-    });
-
     describe('renders correct tile', function() {
         var IMG_TOLERANCE_PER_MIL = 20;