Rename server_options -> server-options

README.md

@@ -24,7 +24,7 @@ Create the config/environments/<env>.js files (there are .example files
 to start from). You can optionally use the ./configure script for this,
 see ```./configure --help``` to see available options.
 
-Look at lib/cartodb/server_options.js for more on config
+Look at lib/cartodb/server-options.js for more on config
 
 Upgrading
 ---------

app.js

@@ -106,7 +106,7 @@ global.logger = global.log4js.getLogger();
 // Include cartodb_windshaft only _after_ the "global" variable is set
 // See https://github.com/Vizzuality/Windshaft-cartodb/issues/28
 var cartodbWindshaft = require('./lib/server');
-var serverOptions = require('./lib/server_options');
+var serverOptions = require('./lib/server-options');
 
 var server = cartodbWindshaft(serverOptions);
 

test/acceptance/aggregation.js

@@ -4,7 +4,7 @@ require('../support/test_helper');
 
 const assert = require('../support/assert');
 const TestClient = require('../support/test-client');
-const serverOptions = require('../../lib/server_options');
+const serverOptions = require('../../lib/server-options');
 
 const WebMercatorHelper = require('cartodb-query-tables').utils.webMercatorHelper;
 const webmercator = new WebMercatorHelper();

test/acceptance/analysis/named-maps.js

@@ -5,7 +5,7 @@ var assert = require('../../support/assert');
 var helper = require('../../support/test_helper');
 
 var CartodbWindshaft = require('../../../lib/server');
-var serverOptions = require('../../../lib/server_options');
+var serverOptions = require('../../../lib/server-options');
 var TestClient = require('../../support/test-client');
 
 var LayergroupToken = require('../../../lib/models/layergroup-token');

test/acceptance/auth/authorization-basic-use-cases.js

@@ -3,7 +3,7 @@
 const assert = require('../../support/assert');
 const testHelper = require('../../support/test_helper');
 const CartodbWindshaft = require('../../../lib/server');
-const serverOptions = require('../../../lib/server_options');
+const serverOptions = require('../../../lib/server-options');
 var LayergroupToken = require('../../../lib/models/layergroup-token');
 
 function singleLayergroupConfig(sql, cartocss) {

test/acceptance/buffer-size-format.js

@@ -5,7 +5,7 @@ require('../support/test_helper');
 var fs = require('fs');
 var assert = require('../support/assert');
 var TestClient = require('../support/test-client');
-var serverOptions = require('../../lib/server_options');
+var serverOptions = require('../../lib/server-options');
 var mapnik = require('windshaft').mapnik;
 var IMAGE_TOLERANCE_PER_MIL = 5;
 

test/acceptance/cache/cache_headers.js

@@ -6,7 +6,7 @@ var assert = require('../../support/assert');
 var qs = require('querystring');
 
 var CartodbWindshaft = require('../../../lib/server');
-var serverOptions = require('../../../lib/server_options');
+var serverOptions = require('../../../lib/server-options');
 
 var LayergroupToken = require('../../../lib/models/layergroup-token');
 

test/acceptance/cache/surrogate_keys_invalidation.js

@@ -12,7 +12,7 @@ var nock = require('nock');
 
 describe('templates surrogate keys', function() {
 
-    var serverOptions = require('../../../lib/server_options');
+    var serverOptions = require('../../../lib/server-options');
 
     // Enable Varnish purge for tests
     var varnishHost = serverOptions.varnish_host;

test/acceptance/custom-middlewares.js

@@ -3,7 +3,7 @@
 const helper = require('../support/test_helper');
 const assert = require('../support/assert');
 const createServer = require('../../lib/server');
-const serverOptions = require('../../lib/server_options');
+const serverOptions = require('../../lib/server-options');
 
 describe('custom middlewares', function () {
     const RESPONSE_OK = {

test/acceptance/date-wrapping.spec.js

@@ -4,7 +4,7 @@
 const assert = require('assert');
 const TestClient = require('../support/test-client');
 const mapConfigFactory = require('../fixtures/test_mapconfigFactory');
-const serverOptions = require('../../lib/server_options');
+const serverOptions = require('../../lib/server-options');
 
 const usePgMvtRenderer = serverOptions.renderer.mvt.usePostGIS;
 const describe_mvt = !usePgMvtRenderer ? describe : describe.skip;

test/acceptance/dynamic-styling-named-maps.js

@@ -5,7 +5,7 @@ var step = require('step');
 var LayergroupToken = require('../../lib/models/layergroup-token');
 var testHelper = require(__dirname + '/../support/test_helper');
 var CartodbWindshaft = require(__dirname + '/../../lib/server');
-var serverOptions = require(__dirname + '/../../lib/server_options');
+var serverOptions = require(__dirname + '/../../lib/server-options');
 
 describe('dynamic styling for named maps', function() {
     var server;

test/acceptance/errors-with-context.js

@@ -2,7 +2,7 @@
 
 var assert = require('../support/assert');
 var CartodbWindshaft = require(__dirname + '/../../lib/server');
-var serverOptions = require(__dirname + '/../../lib/server_options');
+var serverOptions = require(__dirname + '/../../lib/server-options');
 
 describe('error with context', function () {
     var server;

test/acceptance/health_check.js

@@ -6,7 +6,7 @@ var fs = require('fs');
 
 var assert = require('../support/assert');
 var CartodbWindshaft = require('../../lib/server');
-var serverOptions = require('../../lib/server_options');
+var serverOptions = require('../../lib/server-options');
 
 describe('health checks', function () {
 

test/acceptance/layergroup-metadata.js

@@ -4,7 +4,7 @@ require('../support/test_helper');
 
 const assert = require('../support/assert');
 const TestClient = require('../support/test-client');
-const serverOptions = require('../../lib/server_options');
+const serverOptions = require('../../lib/server-options');
 
 describe('layergroup metadata', function () {
     const originalUsePostGIS = serverOptions.renderer.mvt.usePostGIS;

test/acceptance/multilayer.js

@@ -19,7 +19,7 @@ var IMAGE_EQUALS_TOLERANCE_PER_MIL = 20;
 var IMAGE_EQUALS_HIGHER_TOLERANCE_PER_MIL = 25;
 
 var CartodbWindshaft = require('../../lib/server');
-var serverOptions = require('../../lib/server_options');
+var serverOptions = require('../../lib/server-options');
 
 var QueryTables = require('cartodb-query-tables').queryTables;
 

test/acceptance/multilayer_server.js

@@ -11,7 +11,7 @@ var LayergroupToken = require('../../lib/models/layergroup-token');
 var PgQueryRunner = require('../../lib/backends/pg-query-runner');
 var QueryTables = require('cartodb-query-tables').queryTables;
 var CartodbWindshaft = require('../../lib/server');
-var serverOptions = require('../../lib/server_options');
+var serverOptions = require('../../lib/server-options');
 
 describe('tests from old api translated to multilayer', function() {
     var server;

test/acceptance/mvt-regressions.js

@@ -4,7 +4,7 @@ require('../support/test_helper');
 
 const assert = require('../support/assert');
 const TestClient = require('../support/test-client');
-const serverOptions = require('../../lib/server_options');
+const serverOptions = require('../../lib/server-options');
 
 const suites = [
     {

test/acceptance/mvt.js

@@ -4,7 +4,7 @@ require('../support/test_helper');
 
 var assert = require('../support/assert');
 var TestClient = require('../support/test-client');
-var serverOptions = require('../../lib/server_options');
+var serverOptions = require('../../lib/server-options');
 
 function createMapConfig(sql = TestClient.SQL.ONE_POINT) {
     return {

test/acceptance/named-map-cache-regressions.js

@@ -5,7 +5,7 @@ require('../support/test_helper');
 const request = require('request');
 const assert = require('assert');
 const Server = require('../../lib/server');
-const serverOptions = require('../../lib/server_options');
+const serverOptions = require('../../lib/server-options');
 const { mapnik } = require('windshaft');
 const helper = require('../support/test_helper');
 

test/acceptance/named_layers.js

@@ -4,7 +4,7 @@ var test_helper = require('../support/test_helper');
 
 var assert = require('../support/assert');
 var CartodbWindshaft = require(__dirname + '/../../lib/server');
-var serverOptions = require(__dirname + '/../../lib/server_options');
+var serverOptions = require(__dirname + '/../../lib/server-options');
 
 var LayergroupToken = require('../../lib/models/layergroup-token');
 

test/acceptance/named_layers_visibility.js

@@ -5,7 +5,7 @@ var test_helper = require('../support/test_helper');
 
 var assert = require('../support/assert');
 var CartodbWindshaft = require(__dirname + '/../../lib/server');
-var serverOptions = require(__dirname + '/../../lib/server_options');
+var serverOptions = require(__dirname + '/../../lib/server-options');
 
 var RedisPool = require('redis-mpool');
 var TemplateMaps = require('../../lib/backends/template_maps.js');

test/acceptance/named_maps_authentication.js

@@ -7,7 +7,7 @@ var querystring = require('querystring');
 var assert = require('../support/assert');
 var mapnik = require('windshaft').mapnik;
 var CartodbWindshaft = require(__dirname + '/../../lib/server');
-var serverOptions = require(__dirname + '/../../lib/server_options');
+var serverOptions = require(__dirname + '/../../lib/server-options');
 var TemplateMaps = require('../../lib/backends/template_maps.js');
 var NamedMapsCacheEntry = require('../../lib/cache/model/named-maps-entry');
 

test/acceptance/named_maps_cache.js

@@ -6,7 +6,7 @@ const helper = require('../support/test_helper');
 var assert = require('../support/assert');
 var mapnik = require('windshaft').mapnik;
 var CartodbWindshaft = require('../../lib/server');
-var serverOptions = require('../../lib/server_options');
+var serverOptions = require('../../lib/server-options');
 
 describe('named maps provider cache', function() {
     var server;

test/acceptance/named_maps_static_view.js

@@ -7,7 +7,7 @@ var RedisPool = require('redis-mpool');
 var assert = require('../support/assert');
 var mapnik = require('windshaft').mapnik;
 var CartodbWindshaft = require('../../lib/server');
-var serverOptions = require('../../lib/server_options');
+var serverOptions = require('../../lib/server-options');
 var TemplateMaps = require('../../lib/backends/template_maps.js');
 
 describe('named maps static view', function() {

test/acceptance/named_maps_stats.js

@@ -7,7 +7,7 @@ var querystring = require('querystring');
 var assert = require('../support/assert');
 var mapnik = require('windshaft').mapnik;
 var CartodbWindshaft = require(__dirname + '/../../lib/server');
-var serverOptions = require(__dirname + '/../../lib/server_options');
+var serverOptions = require(__dirname + '/../../lib/server-options');
 var TemplateMaps = require('../../lib/backends/template_maps.js');
 var NamedMapsCacheEntry = require('../../lib/cache/model/named-maps-entry');
 

test/acceptance/overviews_metadata.js

@@ -4,7 +4,7 @@ var test_helper = require('../support/test_helper');
 
 var assert = require('../support/assert');
 var CartodbWindshaft = require(__dirname + '/../../lib/server');
-var serverOptions = require(__dirname + '/../../lib/server_options');
+var serverOptions = require(__dirname + '/../../lib/server-options');
 
 var LayergroupToken = require('../../lib/models/layergroup-token');
 

test/acceptance/overviews_metadata_named_maps.js

@@ -4,7 +4,7 @@ var test_helper = require('../support/test_helper');
 
 var assert = require('../support/assert');
 var CartodbWindshaft = require(__dirname + '/../../lib/server');
-var serverOptions = require(__dirname + '/../../lib/server_options');
+var serverOptions = require(__dirname + '/../../lib/server-options');
 
 var LayergroupToken = require('../../lib/models/layergroup-token');
 

test/acceptance/ported/support/ported_server_options.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var _ = require('underscore');
-var serverOptions = require('../../../../lib/server_options');
+var serverOptions = require('../../../../lib/server-options');
 var mapnik = require('windshaft').mapnik;
 var OverviewsQueryRewriter = require('../../../../lib/utils/overviews-query-rewriter');
 var overviewsQueryRewriter = new OverviewsQueryRewriter({

test/acceptance/rate-limit.test.js

@@ -9,7 +9,7 @@ const cartodbRedis = require('cartodb-redis');
 const TestClient = require('../support/test-client');
 const UserLimitsBackend = require('../../lib/backends/user-limits');
 const rateLimitMiddleware = require('../../lib/api/middlewares/rate-limit');
-const serverOptions = require('../../lib/server_options');
+const serverOptions = require('../../lib/server-options');
 const { RATE_LIMIT_ENDPOINTS_GROUPS } = rateLimitMiddleware;
 
 let userLimitsApi;

test/acceptance/regressions.js

@@ -6,7 +6,7 @@ const helper = require('../support/test_helper');
 var TestClient = require('../support/test-client');
 const LayergroupToken = require('../../lib/models/layergroup-token');
 const CartodbWindshaft = require(__dirname + '/../../lib/server');
-const serverOptions = require(__dirname + '/../../lib/server_options');
+const serverOptions = require(__dirname + '/../../lib/server-options');
 
 describe('regressions', function() {
 

test/acceptance/server.js

@@ -7,7 +7,7 @@ var querystring = require('querystring');
 var step        = require('step');
 
 var CartodbWindshaft = require('../../lib/server');
-var serverOptions = require('../../lib/server_options');
+var serverOptions = require('../../lib/server-options');
 
 
 describe('server', function() {

test/acceptance/stats/mapnik_stats_layergroup.js

@@ -4,7 +4,7 @@ require('../../support/test_helper');
 
 var assert = require('../../support/assert');
 var TestClient = require('../../support/test-client');
-const serverOptions = require('../../../lib/server_options');
+const serverOptions = require('../../../lib/server-options');
 
 const suites = [
     {

test/acceptance/templates.js

@@ -21,7 +21,7 @@ var http = require('http');
 var helper = require(__dirname + '/../support/test_helper');
 
 var CartodbWindshaft = require(__dirname + '/../../lib/server');
-var serverOptions = require(__dirname + '/../../lib/server_options');
+var serverOptions = require(__dirname + '/../../lib/server-options');
 
 var LayergroupToken = require('../../lib/models/layergroup-token');
 

test/acceptance/tilejson.js

@@ -4,7 +4,7 @@ require('../support/test_helper');
 
 const assert = require('../support/assert');
 const TestClient = require('../support/test-client');
-const serverOptions = require('../../lib/server_options');
+const serverOptions = require('../../lib/server-options');
 
 const originalUsePostGIS = serverOptions.renderer.mvt.usePostGIS;
 

test/acceptance/turbo-carto/named-maps.js

@@ -5,7 +5,7 @@ var step = require('step');
 var LayergroupToken = require('../../../lib/models/layergroup-token');
 var testHelper = require('../../support/test_helper');
 var CartodbWindshaft = require('../../../lib/server');
-var serverOptions = require('../../../lib/server_options');
+var serverOptions = require('../../../lib/server-options');
 var mapnik = require('windshaft').mapnik;
 var IMAGE_TOLERANCE_PER_MIL = 10;
 

test/acceptance/user-database-timeout-limit.js

@@ -4,7 +4,7 @@ require('../support/test_helper');
 
 const assert = require('../support/assert');
 const TestClient = require('../support/test-client');
-const serverOptions = require('../../lib/server_options');
+const serverOptions = require('../../lib/server-options');
 
 const timeoutErrorTilePath = `${process.cwd()}/assets/render-timeout-fallback.png`;
 

test/acceptance/user-render-timeout-limit.js

@@ -4,7 +4,7 @@ require('../support/test_helper');
 
 const assert = require('../support/assert');
 const TestClient = require('../support/test-client');
-var serverOptions = require('../../lib/server_options');
+var serverOptions = require('../../lib/server-options');
 
 const timeoutErrorTilePath = `${process.cwd()}/assets/render-timeout-fallback.png`;
 

test/acceptance/vector-layergroup.js

@@ -4,7 +4,7 @@ require('../support/test_helper');
 
 const assert = require('../support/assert');
 const TestClient = require('../support/test-client');
-const serverOptions = require('../../lib/server_options');
+const serverOptions = require('../../lib/server-options');
 
 
 const POINTS_SQL_1 = `

test/acceptance/widgets/named-maps.js

@@ -9,7 +9,7 @@ var queue = require('queue-async');
 var helper = require('../../support/test_helper');
 
 var CartodbWindshaft = require('../../../lib/server');
-var serverOptions = require('../../../lib/server_options');
+var serverOptions = require('../../../lib/server-options');
 
 var LayergroupToken = require('../../../lib/models/layergroup-token');
 

test/support/test-client.js

@@ -13,7 +13,7 @@ var assert = require('./assert');
 var helper = require('./test_helper');
 
 var CartodbWindshaft = require('../../lib/server');
-var serverOptions = require('../../lib/server_options');
+var serverOptions = require('../../lib/server-options');
 serverOptions.analysis.batch.inlineExecution = true;
 
 const MAPNIK_SUPPORTED_FORMATS = {

test/unit/cartodb/ported/windshaft_server.test.js

@@ -4,7 +4,7 @@ require('../../../support/test_helper.js');
 
 var assert = require('assert');
 var cartodbServer = require('../../../../lib/server');
-var serverOptions = require('../../../../lib/server_options');
+var serverOptions = require('../../../../lib/server-options');
 
 
 describe('windshaft', function() {

test/unit/cartodb/prepare-context.test.js

@@ -42,7 +42,7 @@ describe('prepare-context', function() {
     });
 
 
-    it('can be found in server_options', function(){
+    it('can be found in server-options', function(){
         assert.ok(_.isFunction(authorize));
         assert.ok(_.isFunction(dbConnSetup));
         assert.ok(_.isFunction(cleanUpQueryParams));