Merge pull request #1127 from CartoDB/folders

Standardize folder structure and filenames

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

@@ -6,7 +6,7 @@ var path = require('path');
 var fs = require('fs');
 var _ = require('underscore');
 var semver = require('semver');
-const setICUEnvVariable = require('./lib/cartodb/utils/icu_data_env_setter');
+const setICUEnvVariable = require('./lib/utils/icu-data-env-setter');
 
 // jshint undef:false
 var log = console.log.bind(console);
@@ -24,11 +24,11 @@ if (!semver.satisfies(nodejsVersion, engines.node)) {
 setICUEnvVariable();
 
 var argv = require('yargs')
-    .usage('Usage: $0 <environment> [options]')
+    .usage('Usage: node $0 <environment> [options]')
     .help('h')
     .example(
-        '$0 production -c /etc/sql-api/config.js',
-        'start server in production environment with /etc/sql-api/config.js as config file'
+        'node $0 production -c /etc/windshaft-cartodb/config.js',
+        'start server in production environment with /etc/windshaft-cartodb/config.js as config file'
     )
     .alias('h', 'help')
     .alias('c', 'config')
@@ -105,8 +105,8 @@ 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/cartodb/server');
-var serverOptions = require('./lib/cartodb/server_options');
+var cartodbWindshaft = require('./lib/server');
+var serverOptions = require('./lib/server-options');
 
 var server = cartodbWindshaft(serverOptions);
 

lib/api/api-router.js

@@ -7,12 +7,12 @@ const cartodbRedis = require('cartodb-redis');
 
 const windshaft = require('windshaft');
 
-const PgConnection = require('../backends/pg_connection');
+const PgConnection = require('../backends/pg-connection');
 const AnalysisBackend = require('../backends/analysis');
 const AnalysisStatusBackend = require('../backends/analysis-status');
 const DataviewBackend = require('../backends/dataview');
-const TemplateMaps = require('../backends/template_maps.js');
-const PgQueryRunner = require('../backends/pg_query_runner');
+const TemplateMaps = require('../backends/template-maps');
+const PgQueryRunner = require('../backends/pg-query-runner');
 const StatsBackend = require('../backends/stats');
 const AuthBackend = require('../backends/auth');
 
@@ -23,12 +23,12 @@ const TablesExtentBackend = require('../backends/tables-extent');
 
 const ClusterBackend = require('../backends/cluster');
 
-const LayergroupAffectedTablesCache = require('../cache/layergroup_affected_tables');
-const SurrogateKeysCache = require('../cache/surrogate_keys_cache');
-const VarnishHttpCacheBackend = require('../cache/backend/varnish_http');
+const LayergroupAffectedTablesCache = require('../cache/layergroup-affected-tables');
+const SurrogateKeysCache = require('../cache/surrogate-keys-cache');
+const VarnishHttpCacheBackend = require('../cache/backend/varnish-http');
 const FastlyCacheBackend = require('../cache/backend/fastly');
-const NamedMapProviderCache = require('../cache/named_map_provider_cache');
-const NamedMapsCacheEntry = require('../cache/model/named_maps_entry');
+const NamedMapProviderCache = require('../cache/named-map-provider-cache');
+const NamedMapsCacheEntry = require('../cache/model/named-maps-entry');
 const NamedMapProviderReporter = require('../stats/reporter/named-map-provider');
 
 const SqlWrapMapConfigAdapter = require('../models/mapconfig/adapter/sql-wrap-mapconfig-adapter');
@@ -282,7 +282,7 @@ function createSurrogateKeysCacheBackends(serverOptions) {
     return cacheBackends;
 }
 
-const timeoutErrorTilePath = __dirname + '/../../../assets/render-timeout-fallback.png';
+const timeoutErrorTilePath = __dirname + '/../../assets/render-timeout-fallback.png';
 const timeoutErrorTile = require('fs').readFileSync(timeoutErrorTilePath, {encoding: null});
 
 function createRendererFactory ({ redisPool, serverOptions, environmentOptions }) {

lib/api/middlewares/stats.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Profiler = require('../../stats/profiler_proxy');
+const Profiler = require('../../stats/profiler-proxy');
 const debug = require('debug')('windshaft:cartodb:stats');
 const onHeaders = require('on-headers');
 

lib/api/middlewares/surrogate-key-header.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const NamedMapsCacheEntry = require('../../cache/model/named_maps_entry');
+const NamedMapsCacheEntry = require('../../cache/model/named-maps-entry');
 const NamedMapMapConfigProvider = require('../../models/mapconfig/provider/named-map-provider');
 
 module.exports = function setSurrogateKeyHeader ({ surrogateKeysCache }) {

lib/api/middlewares/user.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const CdbRequest = require('../../models/cdb_request');
+const CdbRequest = require('../../models/cdb-request');
 
 module.exports = function user () {
     const cdbRequest = new CdbRequest();

lib/api/middlewares/vector-error.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const fs = require('fs');
-const timeoutErrorVectorTile = fs.readFileSync(__dirname + '/../../../../assets/render-timeout-fallback.mvt');
+const timeoutErrorVectorTile = fs.readFileSync(__dirname + '/../../../assets/render-timeout-fallback.mvt');
 
 module.exports = function vectorError() {
     return function vectorErrorMiddleware(err, req, res, next) {

lib/api/template/admin-template-controller.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { templateName } = require('../../backends/template_maps');
+const { templateName } = require('../../backends/template-maps');
 const credentials = require('../middlewares/credentials');
 const rateLimit = require('../middlewares/rate-limit');
 const { RATE_LIMIT_ENDPOINTS_GROUPS } = rateLimit;

lib/backends/dataview.js

@@ -6,7 +6,7 @@ var BBoxFilter = require('../models/filter/bbox');
 var DataviewFactory = require('../models/dataview/factory');
 var DataviewFactoryWithOverviews = require('../models/dataview/overviews/factory');
 const dbParamsFromReqParams = require('../utils/database-params');
-var OverviewsQueryRewriter = require('../utils/overviews_query_rewriter');
+var OverviewsQueryRewriter = require('../utils/overviews-query-rewriter');
 var overviewsQueryRewriter = new OverviewsQueryRewriter({
     zoom_level: 'CDB_ZoomFromScale(!scale_denominator!)'
 });

lib/cache/named-map-provider-cache.js

@@ -3,7 +3,7 @@
 const LruCache = require('lru-cache');
 
 const NamedMapMapConfigProvider = require('../models/mapconfig/provider/named-map-provider');
-const { templateName } = require('../backends/template_maps');
+const { templateName } = require('../backends/template-maps');
 
 const TEN_MINUTES_IN_MILLISECONDS = 1000 * 60 * 10;
 const ACTIONS = ['update', 'delete'];

lib/models/dataview/factory.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const dataviews = require('./');
+const dataviews = require('.');
 
 module.exports = class DataviewFactory {
     static get dataviews() {

lib/models/dataview/overviews/factory.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var parentFactory = require('../factory');
-var dataviews = require('./');
+var dataviews = require('.');
 
 function OverviewsDataviewFactory(queryRewriter, queryRewriteData, options) {
     this.queryRewriter = queryRewriter;