From c6f9152efecc92b116dc07cba77da47effee1f50 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Mon, 29 Jun 2015 16:38:13 +0200 Subject: [PATCH] Moves template maps to backends directory --- lib/cartodb/{ => backends}/template_maps.js | 0 lib/cartodb/controllers/named_maps.js | 2 +- lib/cartodb/controllers/named_static_maps.js | 2 +- lib/cartodb/server_options.js | 2 +- test/acceptance/named_layers.js | 2 +- test/acceptance/named_static_maps.js | 2 +- test/integration/mapconfig_named_layers_datasource.js | 2 +- test/integration/mapconfig_named_layers_expanded.js | 2 +- test/unit/cartodb/template_maps.test.js | 2 +- test/unit/cartodb/template_maps_auth.test.js | 2 +- test/unit/cartodb/template_maps_defaults.test.js | 2 +- test/unit/cartodb/valid_template_maps.test.js | 2 +- 12 files changed, 11 insertions(+), 11 deletions(-) rename lib/cartodb/{ => backends}/template_maps.js (100%) diff --git a/lib/cartodb/template_maps.js b/lib/cartodb/backends/template_maps.js similarity index 100% rename from lib/cartodb/template_maps.js rename to lib/cartodb/backends/template_maps.js diff --git a/lib/cartodb/controllers/named_maps.js b/lib/cartodb/controllers/named_maps.js index 9afaf530..df702233 100644 --- a/lib/cartodb/controllers/named_maps.js +++ b/lib/cartodb/controllers/named_maps.js @@ -1,7 +1,7 @@ var step = require('step'); var assert = require('assert'); var _ = require('underscore'); -var templateName = require('../template_maps').templateName; +var templateName = require('../backends/template_maps').templateName; var CdbRequest = require('../models/cdb_request'); var NamedMapsCacheEntry = require('../cache/model/named_maps_entry'); diff --git a/lib/cartodb/controllers/named_static_maps.js b/lib/cartodb/controllers/named_static_maps.js index 9f604a08..da23b863 100644 --- a/lib/cartodb/controllers/named_static_maps.js +++ b/lib/cartodb/controllers/named_static_maps.js @@ -1,6 +1,6 @@ var step = require('step'); var assert = require('assert'); -var templateName = require('../template_maps').templateName; +var templateName = require('../backends/template_maps').templateName; var CdbRequest = require('../models/cdb_request'); var NamedMapsCacheEntry = require('../cache/model/named_maps_entry'); var _ = require('underscore'); diff --git a/lib/cartodb/server_options.js b/lib/cartodb/server_options.js index 4b2c595d..bf9210c3 100644 --- a/lib/cartodb/server_options.js +++ b/lib/cartodb/server_options.js @@ -7,7 +7,7 @@ var RedisPool = require('redis-mpool'); var QueryTablesApi = require('./api/query_tables_api'); var PgQueryRunner = require('./backends/pg_query_runner'); var PgConnection = require('./backends/pg_connection'); -var TemplateMaps = require('./template_maps.js'); +var TemplateMaps = require('./backends/template_maps.js'); var MapConfigNamedLayersAdapter = require('./models/mapconfig_named_layers_adapter'); var CdbRequest = require('./models/cdb_request'); diff --git a/test/acceptance/named_layers.js b/test/acceptance/named_layers.js index 72425784..d485be29 100644 --- a/test/acceptance/named_layers.js +++ b/test/acceptance/named_layers.js @@ -6,7 +6,7 @@ var serverOptions = require(__dirname + '/../../lib/cartodb/server_options')(); var server = new CartodbWindshaft(serverOptions); var RedisPool = require('redis-mpool'); -var TemplateMaps = require('../../lib/cartodb/template_maps.js'); +var TemplateMaps = require('../../lib/cartodb/backends/template_maps.js'); var step = require('step'); diff --git a/test/acceptance/named_static_maps.js b/test/acceptance/named_static_maps.js index f25d411d..838eade2 100644 --- a/test/acceptance/named_static_maps.js +++ b/test/acceptance/named_static_maps.js @@ -6,7 +6,7 @@ var assert = require('../support/assert'); var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/cartodb_windshaft'); var serverOptions = require(__dirname + '/../../lib/cartodb/server_options')(); var server = new CartodbWindshaft(serverOptions); -var TemplateMaps = require('../../lib/cartodb/template_maps.js'); +var TemplateMaps = require('../../lib/cartodb/backends/template_maps.js'); var NamedMapsCacheEntry = require('../../lib/cartodb/cache/model/named_maps_entry'); describe('named static maps', function() { diff --git a/test/integration/mapconfig_named_layers_datasource.js b/test/integration/mapconfig_named_layers_datasource.js index ed478461..8959062d 100644 --- a/test/integration/mapconfig_named_layers_datasource.js +++ b/test/integration/mapconfig_named_layers_datasource.js @@ -2,7 +2,7 @@ require('../support/test_helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); -var TemplateMaps = require('../../lib/cartodb/template_maps.js'); +var TemplateMaps = require('../../lib/cartodb/backends/template_maps.js'); var PgConnection = require(__dirname + '/../../lib/cartodb/backends/pg_connection'); var MapConfigNamedLayersAdapter = require('../../lib/cartodb/models/mapconfig_named_layers_adapter'); diff --git a/test/integration/mapconfig_named_layers_expanded.js b/test/integration/mapconfig_named_layers_expanded.js index d9b5a874..53ad37bd 100644 --- a/test/integration/mapconfig_named_layers_expanded.js +++ b/test/integration/mapconfig_named_layers_expanded.js @@ -2,7 +2,7 @@ require('../support/test_helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); -var TemplateMaps = require('../../lib/cartodb/template_maps.js'); +var TemplateMaps = require('../../lib/cartodb/backends/template_maps.js'); var PgConnection = require(__dirname + '/../../lib/cartodb/backends/pg_connection'); var MapConfigNamedLayersAdapter = require('../../lib/cartodb/models/mapconfig_named_layers_adapter'); diff --git a/test/unit/cartodb/template_maps.test.js b/test/unit/cartodb/template_maps.test.js index da378767..f2203715 100644 --- a/test/unit/cartodb/template_maps.test.js +++ b/test/unit/cartodb/template_maps.test.js @@ -2,7 +2,7 @@ require('../../support/test_helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); -var TemplateMaps = require('../../../lib/cartodb/template_maps.js'); +var TemplateMaps = require('../../../lib/cartodb/backends/template_maps.js'); var step = require('step'); var _ = require('underscore'); diff --git a/test/unit/cartodb/template_maps_auth.test.js b/test/unit/cartodb/template_maps_auth.test.js index 76258695..5cf145ae 100644 --- a/test/unit/cartodb/template_maps_auth.test.js +++ b/test/unit/cartodb/template_maps_auth.test.js @@ -3,7 +3,7 @@ require('../../support/test_helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); -var TemplateMaps = require('../../../lib/cartodb/template_maps'); +var TemplateMaps = require('../../../lib/cartodb/backends/template_maps'); describe('template_maps_auth', function() { diff --git a/test/unit/cartodb/template_maps_defaults.test.js b/test/unit/cartodb/template_maps_defaults.test.js index bbc70062..bd61641c 100644 --- a/test/unit/cartodb/template_maps_defaults.test.js +++ b/test/unit/cartodb/template_maps_defaults.test.js @@ -2,7 +2,7 @@ require('../../support/test_helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); -var TemplateMaps = require('../../../lib/cartodb/template_maps.js'); +var TemplateMaps = require('../../../lib/cartodb/backends/template_maps.js'); var _ = require('underscore'); describe('template_maps', function() { diff --git a/test/unit/cartodb/valid_template_maps.test.js b/test/unit/cartodb/valid_template_maps.test.js index ac66e4e3..7c3327d5 100644 --- a/test/unit/cartodb/valid_template_maps.test.js +++ b/test/unit/cartodb/valid_template_maps.test.js @@ -2,7 +2,7 @@ require('../../support/test_helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); -var TemplateMaps = require('../../../lib/cartodb/template_maps.js'); +var TemplateMaps = require('../../../lib/cartodb/backends/template_maps.js'); var _ = require('underscore'); describe('template_maps', function() {