Release 3.0.0

Support Node v6 LTS and upgrade to Mapnik v3.x

.travis.yml

@@ -2,6 +2,8 @@ dist: trusty
 addons:
   postgresql: "9.5"
   apt:
+    sources:
+      - ubuntu-toolchain-r-test
     packages:
       - postgresql-9.5-postgis-2.3
       - postgresql-plpython-9.5
@@ -10,6 +12,7 @@ addons:
       - libjpeg8-dev
       - libgif-dev
       - libpango1.0-dev
+      - g++-4.9
 
 before_install:
   - createdb template_postgis
@@ -17,8 +20,8 @@ before_install:
   - psql -c "CREATE EXTENSION postgis" template_postgis
 
 env:
-  - NPROCS=1 JOBS=1 PGUSER=postgres
+  - NPROCS=1 JOBS=1 PGUSER=postgres CXX=g++-4.9
 
 language: node_js
 node_js:
-  - "0.10"
+  - "6"

INSTALL.md

@@ -4,11 +4,11 @@
 Make sure that you have the requirements needed. These are
 
 - Core
-  - Node.js >=0.8
-  - npm >=1.2.1 <2.0.0
+  - Node.js >=6.9.x
+  - yarn >=0.21.3
   - PostgreSQL >8.3.x, PostGIS >1.5.x
   - Redis >2.4.0 (http://www.redis.io)
-  - Mapnik 2.0.1, 2.0.2, 2.1.0, 2.2.0, 2.3.0. See [Installing Mapnik](https://github.com/CartoDB/Windshaft#installing-mapnik).
+  - Mapnik >3.x. See [Installing Mapnik](https://github.com/CartoDB/Windshaft#installing-mapnik).
   - Windshaft: check [Windshaft dependencies and installation notes](https://github.com/CartoDB/Windshaft#dependencies)
   - libcairo2-dev, libpango1.0-dev, libjpeg8-dev and libgif-dev for server side canvas support
 
@@ -43,11 +43,11 @@ psql -d template_postgis -c 'CREATE EXTENSION postgis;'
 To fetch and build all node-based dependencies, run:
 
 ```
-npm install
+yarn
 ```
 
-Note that the ```npm install``` step will populate the node_modules/
+Note that the ```yarn``` step will populate the node_modules/
 directory with modules, some of which being compiled on demand. If you
 happen to have startup errors you may need to force rebuilding those
 modules. At any time just wipe out the node_modules/ directory and run
-```npm install``` again.
+```yarn``` again.

Makefile

@@ -10,7 +10,7 @@ clean:
 	rm -rf node_modules/
 
 shrinkwrap: clean
-	-rm npm-shrinkwrap.json
+	rm npm-shrinkwrap.json
 	npm install --no-shrinkwrap --production
 	npm prune
 	npm shrinkwrap

NEWS.md

@@ -1,41 +1,17 @@
 # Changelog
 
-## 2.91.2
-Released 2017-04-24
+## 3.0.0
+Released 2017-03-21
 
 Announcements:
- - Upgrades grainstore to [1.6.3](https://github.com/CartoDB/grainstore/releases/tag/1.6.3).
-
-
-## 2.91.1
-Released 2017-04-24
-
-Announcements:
- - Upgrades camshaft to [0.54.1](https://github.com/CartoDB/camshaft/releases/tag/0.54.1).
-
-
-## 2.91.0
-Released 2017-04-11
-
-Announcements:
- - Upgrades camshaft to [0.54.0](https://github.com/CartoDB/camshaft/releases/tag/0.54.0).
-
-## 2.90.2
-Released 2017-04-11
-
-Announcements:
- - Upgrades camshaft to [0.53.1](https://github.com/CartoDB/camshaft/releases/tag/0.53.1)
-
-
-## 2.90.0
-Released 2017-04-10
-
-Bug fixes:
- - Fix invalidation of cache for maps with analyses #661.
-
-Announcements:
- - Upgrades camshaft to [0.53.0](https://github.com/CartoDB/camshaft/releases/tag/0.53.0)
+ - Supports Node v6.9.x
+ - Drops support for Node v0.10.x
+ - Upgrades windshaft to 3.0.0
+ - Upgrades cartodb-query-tables to 0.2.0
+ - Upgrades cartodb-redis to 0.13.2
+ - Upgrades redis-mpool to 0.4.1
 
+**Note**: Due to this [issue](https://github.com/npm/npm/issues/15713), Windshaft-cartodb must be installed with `yarn` instead of `npm` providing just a `yarn.lock` to get consistent installs across machines.
 
 ## 2.89.0
 Released 2017-03-17

README.md

@@ -32,14 +32,14 @@ Upgrading
 Checkout your commit/branch. If you need to reinstall dependencies (you can check [NEWS](NEWS.md)) do the following:
 
 ```
-rm -rf node_modules; npm install
+rm -rf node_modules; yarn
 ```
 
 Run
 ---
 
 ```
-node app.js <env> 
+node app.js <env>
 ```
 
 Where <env> is the name of a configuration file under config/environments/.
@@ -71,12 +71,12 @@ See [CONTRIBUTING.md](CONTRIBUTING.md).
 ### Developing with a custom windshaft version
 
 If you plan or want to use a custom / not released yet version of windshaft (or any other dependency) the best option is
-to use `npm link`. You can read more about it at [npm-link: Symlink a package folder](https://docs.npmjs.com/cli/link).
+to use `yarn link`. You can read more about it at [yarn-link: Symlink a package folder](https://yarnpkg.com/en/docs/cli/link).
 
 **Quick start**:
 
 ```shell
-~/windshaft-directory $ npm install
-~/windshaft-directory $ npm link
-~/windshaft-cartodb-directory $ npm link windshaft
+~/windshaft-directory $ yarn
+~/windshaft-directory $ yarn link
+~/windshaft-cartodb-directory $ yarn link windshaft
 ```

app.js

@@ -110,6 +110,7 @@ var listener = server.listen(serverOptions.bind.port, serverOptions.bind.host, b
 var version = require("./package").version;
 
 listener.on('listening', function() {
+    log("Using Node.js %s", process.version);
     log('Using configuration file "%s"', configurationFile);
     log(
         "Windshaft tileserver %s started on %s:%s PID=%d (%s)",

lib/cartodb/controllers/base.js

@@ -36,7 +36,7 @@ function BaseController(authApi, pgConnection) {
 
 module.exports = BaseController;
 
-// jshint maxcomplexity:10
+// jshint maxcomplexity:9
 /**
  * Whitelist input and get database name & default geometry type from
  * subdomain/user metadata held in CartoDB Redis
@@ -77,11 +77,7 @@ BaseController.prototype.req2params = function(req, callback){
         return;
     }
 
-    var allowedQueryParams = REQUEST_QUERY_PARAMS_WHITELIST;
-    if (Array.isArray(req.context.allowedQueryParams)) {
-        allowedQueryParams = allowedQueryParams.concat(req.context.allowedQueryParams);
-    }
-    req.query = _.pick(req.query, allowedQueryParams);
+    req.query = _.pick(req.query, REQUEST_QUERY_PARAMS_WHITELIST);
     req.params = _.extend({}, req.params); // shuffle things as request is a strange array/object
 
     var user = req.context.user;

lib/cartodb/controllers/layergroup.js

@@ -6,7 +6,6 @@ var BaseController = require('./base');
 
 var cors = require('../middleware/cors');
 var userMiddleware = require('../middleware/user');
-var allowQueryParams = require('../middleware/allow-query-params');
 
 var DataviewBackend = require('../backends/dataview');
 var AnalysisStatusBackend = require('../backends/analysis-status');
@@ -68,13 +67,11 @@ LayergroupController.prototype.register = function(app) {
         this.attributes.bind(this));
 
     app.get(app.base_url_mapconfig +
-        '/static/center/:token/:z/:lat/:lng/:width/:height.:format',
-        cors(), userMiddleware, allowQueryParams(['layer']),
+        '/static/center/:token/:z/:lat/:lng/:width/:height.:format', cors(), userMiddleware,
         this.center.bind(this));
 
     app.get(app.base_url_mapconfig +
-        '/static/bbox/:token/:west,:south,:east,:north/:width/:height.:format',
-        cors(), userMiddleware, allowQueryParams(['layer']),
+        '/static/bbox/:token/:west,:south,:east,:north/:width/:height.:format', cors(), userMiddleware,
         this.bbox.bind(this));
 
     // Undocumented/non-supported API endpoint methods.
@@ -391,15 +388,13 @@ LayergroupController.prototype.getAffectedTables = function(user, dbName, layerg
                 function getSQL(err, mapConfig) {
                     assert.ifError(err);
 
-                    var queries = [];
-                    mapConfig.getLayers().forEach(function(layer) {
-                        queries.push(layer.options.sql);
-                        if (layer.options.affected_tables) {
-                            layer.options.affected_tables.map(function(table) {
-                                queries.push('SELECT * FROM ' + table + ' LIMIT 0');
-                            });
-                        }
-                    });
+                    var queries = mapConfig.getLayers()
+                        .map(function(lyr) {
+                            return lyr.options.sql;
+                        })
+                        .filter(function(sql) {
+                            return !!sql;
+                        });
 
                     return queries.length ? queries.join(';') : null;
                 },

lib/cartodb/controllers/map.js

@@ -1,11 +1,11 @@
 var _ = require('underscore');
+var dot = require('dot');
+dot.templateSettings.strip = false;
 var assert = require('assert');
 var step = require('step');
 var windshaft = require('windshaft');
 var QueryTables = require('cartodb-query-tables');
 
-var ResourceLocator = require('../models/resource-locator');
-
 var util = require('util');
 var BaseController = require('./base');
 
@@ -46,7 +46,20 @@ function MapController(authApi, pgConnection, templateMaps, mapBackend, metadata
     this.layergroupAffectedTables = layergroupAffectedTables;
 
     this.mapConfigAdapter = mapConfigAdapter;
-    this.resourceLocator = new ResourceLocator(global.environment);
+
+    this.resourcesUrlTemplates = null;
+    if (global.environment.resources_url_templates) {
+        var templates = global.environment.resources_url_templates;
+
+        if (templates.http) {
+            this.resourcesUrlTemplates = this.resourcesUrlTemplates || {};
+            this.resourcesUrlTemplates.http = dot.template(templates.http + '/{{=it.resource}}');
+        }
+        if (templates.https) {
+            this.resourcesUrlTemplates = this.resourcesUrlTemplates || {};
+            this.resourcesUrlTemplates.https = dot.template(templates.https + '/{{=it.resource}}');
+        }
+    }
 }
 
 util.inherits(MapController, BaseController);
@@ -312,15 +325,9 @@ MapController.prototype.afterLayergroupCreate = function(req, res, mapconfig, la
         done();
     });
 
-    var sql = [];
-    mapconfig.getLayers().forEach(function(layer) {
-        sql.push(layer.options.sql);
-        if (layer.options.affected_tables) {
-            layer.options.affected_tables.map(function(table) {
-                sql.push('SELECT * FROM ' + table + ' LIMIT 0');
-            });
-        }
-    });
+    var sql = mapconfig.getLayers().map(function(layer) {
+        return layer.options.sql;
+    }).join(';');
 
     var dbName = req.params.dbname;
     var layergroupId = layergroup.layergroupid;
@@ -331,7 +338,7 @@ MapController.prototype.afterLayergroupCreate = function(req, res, mapconfig, la
         },
         function getAffectedTablesAndLastUpdatedTime(err, connection) {
             assert.ifError(err);
-            QueryTables.getAffectedTablesFromQuery(connection, sql.join(';'), this);
+            QueryTables.getAffectedTablesFromQuery(connection, sql, this);
         },
         function handleAffectedTablesAndLastUpdatedTime(err, result) {
             if (req.profiler) {
@@ -392,7 +399,7 @@ MapController.prototype.addAnalysesMetadata = function(username, layergroup, ana
                     var nodeResource = layergroup.layergroupid + '/analysis/node/' + node.id();
                     var nodeRepr = {
                         status: node.getStatus(),
-                        url: this.resourceLocator.getUrls(username, nodeResource)
+                        url: this.getUrls(username, nodeResource)
                     };
                     if (includeQuery) {
                         nodeRepr.query = node.getQuery();
@@ -422,7 +429,7 @@ MapController.prototype.addDataviewsUrls = function(username, layergroup, mapCon
     Object.keys(dataviews).forEach(function(dataviewName) {
         var resource = layergroup.layergroupid + '/dataview/' + dataviewName;
         layergroup.metadata.dataviews[dataviewName] = {
-            url: this.resourceLocator.getUrls(username, resource)
+            url: this.getUrls(username, resource)
         };
     }.bind(this));
 };
@@ -437,7 +444,7 @@ MapController.prototype.addWidgetsUrl = function(username, layergroup, mapConfig
                     var resource = layergroup.layergroupid + '/' + layerIndex + '/widget/' + widgetName;
                     layer.widgets[widgetName] = {
                         type: mapConfigLayer.options.widgets[widgetName].type,
-                        url: this.resourceLocator.getUrls(username, resource)
+                        url: this.getUrls(username, resource)
                     };
                 }.bind(this));
             }
@@ -445,3 +452,46 @@ MapController.prototype.addWidgetsUrl = function(username, layergroup, mapConfig
         }.bind(this));
     }
 };
+
+MapController.prototype.getUrls = function(username, resource) {
+    if (this.resourcesUrlTemplates) {
+        return this.getUrlsFromTemplate(username, resource);
+    }
+    var cdnUrl = global.environment.serverMetadata && global.environment.serverMetadata.cdn_url;
+    if (cdnUrl) {
+        return {
+            http: 'http://' + cdnUrl.http + '/' + username + '/api/v1/map/' + resource,
+            https: 'https://' + cdnUrl.https + '/' + username + '/api/v1/map/' + resource
+        };
+    } else {
+        var port = global.environment.port;
+        return {
+            http: 'http://' + username + '.' + 'localhost.lan:' + port +  '/api/v1/map/' + resource
+        };
+    }
+};
+
+MapController.prototype.getUrlsFromTemplate = function(username, resource) {
+    var urls = {};
+    var cdnUrl = global.environment.serverMetadata && global.environment.serverMetadata.cdn_url || {};
+
+    if (this.resourcesUrlTemplates.http) {
+        urls.http = this.resourcesUrlTemplates.http({
+            cdn_url: cdnUrl.http,
+            user: username,
+            port: global.environment.port,
+            resource: resource
+        });
+    }
+
+    if (this.resourcesUrlTemplates.https) {
+        urls.https = this.resourcesUrlTemplates.https({
+            cdn_url: cdnUrl.https,
+            user: username,
+            port: global.environment.port,
+            resource: resource
+        });
+    }
+
+    return urls;
+};

lib/cartodb/controllers/named_maps.js

@@ -8,7 +8,6 @@ var BaseController = require('./base');
 
 var cors = require('../middleware/cors');
 var userMiddleware = require('../middleware/user');
-var allowQueryParams = require('../middleware/allow-query-params');
 
 function NamedMapsController(authApi, pgConnection, namedMapProviderCache, tileBackend, previewBackend,
                              surrogateKeysCache, tablesExtentApi, metadataBackend) {
@@ -32,7 +31,7 @@ NamedMapsController.prototype.register = function(app) {
         this.tile.bind(this));
 
     app.get(app.base_url_mapconfig +
-        '/static/named/:template_id/:width/:height.:format', cors(), userMiddleware, allowQueryParams(['layer']),
+        '/static/named/:template_id/:width/:height.:format', cors(), userMiddleware,
         this.staticMap.bind(this));
 };
 

lib/cartodb/middleware/allow-query-params.js

@@ -1,9 +0,0 @@
-module.exports = function allowQueryParams(params) {
-    if (!Array.isArray(params)) {
-        throw new Error('allowQueryParams must receive an Array of params');
-    }
-    return function allowQueryParamsMiddleware(req, res, next) {
-        req.context.allowedQueryParams = params;
-        next();
-    };
-};

lib/cartodb/models/mapconfig/adapter/analysis-mapconfig-adapter.js

@@ -115,7 +115,6 @@ AnalysisMapConfigAdapter.prototype.getMapConfig = function(user, requestMapConfi
                     }
                     layer.options.sql = analysisSql;
                     layer.options.columns = getDataviewsColumns(getLayerDataviews(layer, dataviews));
-                    layer.options.affected_tables = getAllAffectedTablesFromSourceNodes(layerNode);
                 } else {
                     missingNodesErrors.push(
                         new Error('Missing analysis node.id="' + layerSourceId +'" for layer='+layerIndex)
@@ -331,13 +330,4 @@ function AnalysisError(message) {
     this.message = message;
 }
 
-function getAllAffectedTablesFromSourceNodes(node) {
-    var affectedTables = node.getAllInputNodes(function (node) {
-        return node.getType() === 'source';
-    }).reduce(function(list, node) {
-        return list.concat(node.getAffectedTables());
-    },[]);
-    return affectedTables;
-}
-
 require('util').inherits(AnalysisError, Error);

lib/cartodb/models/resource-locator.js

@@ -1,119 +0,0 @@
-var dot = require('dot');
-dot.templateSettings.strip = false;
-
-function ResourceLocator(environment) {
-    this.environment = environment;
-
-    this.resourcesUrlTemplates = null;
-    if (this.environment.resources_url_templates) {
-        var templates = environment.resources_url_templates;
-
-        if (templates.http) {
-            this.resourcesUrlTemplates = this.resourcesUrlTemplates || {};
-            this.resourcesUrlTemplates.http = dot.template(templates.http + '/{{=it.resource}}');
-        }
-        if (templates.https) {
-            this.resourcesUrlTemplates = this.resourcesUrlTemplates || {};
-            this.resourcesUrlTemplates.https = dot.template(templates.https + '/{{=it.resource}}');
-        }
-    }
-}
-
-module.exports = ResourceLocator;
-
-ResourceLocator.prototype.getUrls = function(username, resource) {
-    if (this.resourcesUrlTemplates) {
-        return this.getUrlsFromTemplate(username, resource);
-    }
-    var cdnDomain = getCdnDomain(this.environment.serverMetadata, resource);
-    if (cdnDomain) {
-        return {
-            http: 'http://' + cdnDomain.http + '/' + username + '/api/v1/map/' + resource,
-            https: 'https://' + cdnDomain.https + '/' + username + '/api/v1/map/' + resource
-        };
-    } else {
-        var port = this.environment.port;
-        return {
-            http: 'http://' + username + '.' + 'localhost.lan:' + port +  '/api/v1/map/' + resource
-        };
-    }
-};
-
-
-ResourceLocator.prototype.getUrlsFromTemplate = function(username, resource) {
-    var urls = {};
-    var cdnDomain = getCdnDomain(this.environment.serverMetadata, resource) || {};
-
-    if (this.resourcesUrlTemplates.http) {
-        urls.http = this.resourcesUrlTemplates.http({
-            cdn_url: cdnDomain.http,
-            user: username,
-            port: this.environment.port,
-            resource: resource
-        });
-    }
-
-    if (this.resourcesUrlTemplates.https) {
-        urls.https = this.resourcesUrlTemplates.https({
-            cdn_url: cdnDomain.https,
-            user: username,
-            port: this.environment.port,
-            resource: resource
-        });
-    }
-
-    return urls;
-};
-
-function getCdnDomain(serverMetadata, resource) {
-    if (serverMetadata && serverMetadata.cdn_url) {
-        var cdnUrl = serverMetadata.cdn_url;
-        var http = cdnUrl.http;
-        var https = cdnUrl.https;
-        if (cdnUrl.templates) {
-            var templates = cdnUrl.templates;
-            var httpUrlTemplate = templates.http.url;
-            var httpsUrlTemplate = templates.https.url;
-            http = httpUrlTemplate
-                .replace(/^(http[s]*:\/\/)/, '')
-                .replace('{s}', subdomain(templates.http.subdomains, resource));
-            https = httpsUrlTemplate
-                .replace(/^(http[s]*:\/\/)/, '')
-                .replace('{s}', subdomain(templates.https.subdomains, resource));
-        }
-        return {
-            http: http,
-            https: https,
-        };
-    }
-    return null;
-}
-
-// ref https://jsperf.com/js-crc32
-function crcTable() {
-    var c;
-    var table = [];
-    for (var n = 0; n < 256; n++) {
-      c = n;
-      for (var k = 0; k < 8; k++) {
-        c = ((c & 1) ? (0xEDB88320 ^ (c >>> 1)) : (c >>> 1));
-      }
-      table[n] = c;
-    }
-    return table;
-}
-var CRC_TABLE = crcTable();
-
-function crc32(str) {
-    var crc = 0 ^ (-1);
-    for (var i = 0; i < str.length; i++) {
-      crc = (crc >>> 8) ^ CRC_TABLE[(crc ^ str.charCodeAt(i)) & 0xFF];
-    }
-    return (crc ^ (-1)) >>> 0;
-}
-
-function subdomain(subdomains, resource) {
-    var index = crc32(resource) % subdomains.length;
-    return subdomains[index];
-}
-module.exports.subdomain = subdomain;

package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "windshaft-cartodb",
-  "version": "2.91.2",
+  "version": "3.0.0",
   "description": "A map tile server for CartoDB",
   "keywords": [
     "cartodb"
@@ -20,10 +20,10 @@
   ],
   "dependencies": {
     "body-parser": "~1.14.0",
-    "camshaft": "0.54.1",
+    "camshaft": "0.50.3",
     "cartodb-psql": "~0.7.1",
-    "cartodb-query-tables": "~0.1.0",
-    "cartodb-redis": "0.13.1",
+    "cartodb-query-tables": "0.2.0",
+    "cartodb-redis": "0.13.2",
     "debug": "~2.2.0",
     "dot": "~1.0.2",
     "express": "~4.13.3",
@@ -33,22 +33,21 @@
     "lzma": "~2.3.2",
     "node-statsd": "~0.0.7",
     "queue-async": "~1.0.7",
-    "redis-mpool": "~0.4.0",
+    "redis-mpool": "0.4.1",
     "request": "~2.79.0",
     "step": "~0.0.6",
     "step-profiler": "~0.3.0",
     "turbo-carto": "0.19.0",
     "underscore": "~1.6.0",
-    "windshaft": "cartodb/windshaft#v2.x",
-    "yargs": "~5.0.0",
-    "zipfile": "cartodb/node-zipfile#0.5.11-cdb1"
+    "windshaft": "3.0.0",
+    "yargs": "~5.0.0"
   },
   "devDependencies": {
     "istanbul": "~0.4.3",
     "jshint": "~2.6.0",
     "mocha": "~1.21.4",
     "nock": "~2.11.0",
-    "redis": "~0.8.6",
+    "redis": "~0.12.1",
     "semver": "~1.1.4",
     "strftime": "~0.8.2"
   },
@@ -57,7 +56,7 @@
     "test": "make test-all"
   },
   "engines": {
-    "node": ">=0.8 <0.11",
-    "npm": ">=2.14.16"
+    "node": ">=6.9",
+    "npm": ">=3.10"
   }
 }

test/acceptance/cache/cache_headers.js

@@ -1,393 +0,0 @@
-var testHelper = require('../../support/test_helper');
-
-var assert = require('../../support/assert');
-var qs = require('querystring');
-
-var CartodbWindshaft = require('../../../lib/cartodb/server');
-var serverOptions = require('../../../lib/cartodb/server_options');
-var server = new CartodbWindshaft(serverOptions);
-server.setMaxListeners(0);
-
-var LayergroupToken = require('../../support/layergroup-token');
-
-describe('get requests with cache headers', function() {
-
-    var keysToDelete;
-    beforeEach(function() {
-        keysToDelete = {};
-    });
-
-    afterEach(function(done) {
-        testHelper.deleteRedisKeys(keysToDelete, done);
-    });
-
-    var statusOkResponse = {
-        status: 200
-    };
-
-    var mapConfigs = [
-        {
-            "description": "cache headers should be present",
-            "cache_headers": {
-                "x_cache_channel": {
-                    "db_name": "test_windshaft_cartodb_user_1_db",
-                    "tables": ["public.test_table"]
-                },
-                "surrogate_keys": "t:77pJnX"
-            },
-            "data":
-                {
-                    version: '1.5.0',
-                    layers: [
-                        {
-                            options: {
-                                source: {
-                                    id: "2570e105-7b37-40d2-bdf4-1af889598745"
-                                },
-                                sql: 'select * from test_table limit 2',
-                                cartocss: '#layer { marker-fill:red; }',
-                                cartocss_version: '2.3.0',
-                                attributes: {
-                                    id:'cartodb_id',
-                                    columns: [
-                                        'name',
-                                        'address'
-                                    ]
-                                }
-                            }
-                        }
-                    ],
-                    analyses: [
-                        {
-                            "id": "2570e105-7b37-40d2-bdf4-1af889598745",
-                            "type": "source",
-                            "params": {
-                                "query": "select * from test_table limit 2"
-                            }
-                        }
-                    ]
-                },
-        },
-        {
-            "description": "cache headers should be present and be composed with source table name",
-            "cache_headers": {
-                "x_cache_channel": {
-                    "db_name": "test_windshaft_cartodb_user_1_db",
-                    "tables": ["public.analysis_2f13a3dbd7_9eb239903a1afd8a69130d1ece0fc8b38de8592d",
-                               "public.test_table"]
-                },
-                "surrogate_keys": "t:77pJnX t:iL4eth"
-            },
-            "data":
-            {
-                version: '1.5.0',
-                layers: [
-                    {
-                        options: {
-                            source: {
-                                id: "2570e105-7b37-40d2-bdf4-1af889598745"
-                            },
-                            sql: 'select * from test_table limit 2',
-                            cartocss: '#layer { marker-fill:red; }',
-                            cartocss_version: '2.3.0',
-                            attributes: {
-                                id:'cartodb_id',
-                                columns: [
-                                    'name',
-                                    'address'
-                                ]
-                            }
-                        }
-                    }
-                ],
-                analyses: [
-                    {
-                        "id": "2570e105-7b37-40d2-bdf4-1af889598745",
-                        "type": "buffer",
-                        "params": {
-                            "source": {
-                                "type": "source",
-                                "params": {
-                                    "query": "select * from test_table limit 2"
-                                }
-                            },
-                            "radius": 50000
-                        }
-                    }
-                ]
-            }
-        }];
-
-    var layergroupRequest = function(mapConfig) {
-        return {
-            url: '/api/v1/map?api_key=1234&config=' + encodeURIComponent(JSON.stringify(mapConfig)),
-            method: 'GET',
-            headers: {
-                host: 'localhost'
-            }
-        };
-    };
-
-    function getRequest(url, addApiKey, callbackName) {
-        var params = {};
-        if (!!addApiKey) {
-            params.api_key = '1234';
-        }
-        if (!!callbackName) {
-            params.callback = callbackName;
-        }
-
-        return {
-            url: url + '?' + qs.stringify(params),
-            method: 'GET',
-            headers: {
-                host: 'localhost',
-                'Content-Type': 'application/json'
-            }
-        };
-    }
-
-    function validateCacheHeaders(done, expectedCacheHeaders) {
-        return function(res, err) {
-            if (err) {
-                return done(err);
-            }
-
-            assert.ok(res.headers['x-cache-channel']);
-            assert.ok(res.headers['surrogate-key']);
-            if (expectedCacheHeaders) {
-                validateXChannelHeaders(res.headers, expectedCacheHeaders);
-                assert.equal(res.headers['surrogate-key'], expectedCacheHeaders.surrogate_keys);
-            }
-
-            done();
-        };
-    }
-
-    function validateXChannelHeaders(headers, expectedCacheHeaders) {
-        var dbName = headers['x-cache-channel'].split(':')[0];
-        var tables = headers['x-cache-channel'].split(':')[1].split(',').sort();
-        assert.equal(dbName, expectedCacheHeaders.x_cache_channel.db_name);
-        assert.deepEqual(tables, expectedCacheHeaders.x_cache_channel.tables.sort());
-    }
-
-    function noCacheHeaders(done) {
-        return function(res, err) {
-            if (err) {
-                return done(err);
-            }
-
-            assert.ok(
-                !res.headers['x-cache-channel'],
-                'did not expect x-cache-channel header, got: `' + res.headers['x-cache-channel'] + '`'
-            );
-            assert.ok(
-                !res.headers['surrogate-key'],
-                'did not expect surrogate-key header, got: `' + res.headers['surrogate-key'] + '`'
-            );
-            done();
-        };
-    }
-
-    function withLayergroupId(mapConfig, callback) {
-        assert.response(
-            server,
-            layergroupRequest(mapConfig),
-            statusOkResponse,
-            function(res, err) {
-                if (err) {
-                    return callback(err);
-                }
-                var layergroupId = JSON.parse(res.body).layergroupid;
-                keysToDelete['map_cfg|' + LayergroupToken.parse(layergroupId).token] = 0;
-                keysToDelete['user:localhost:mapviews:global'] = 5;
-                callback(null, layergroupId, res);
-            }
-        );
-    }
-
-    mapConfigs.forEach(function(mapConfigData) {
-        describe(mapConfigData.description, function() {
-            var mapConfig = mapConfigData.data;
-            var expectedCacheHeaders = mapConfigData.cache_headers;
-            it('/api/v1/map Map instantiation', function(done) {
-                var testFn = validateCacheHeaders(done, expectedCacheHeaders);
-                withLayergroupId(mapConfig, function(err, layergroupId, res) {
-                    testFn(res);
-                });
-            });
-
-            it ('/api/v1/map/:token/:z/:x/:y@:scale_factor?x.:format Mapnik retina tiles', function(done) {
-                withLayergroupId(mapConfig, function(err, layergroupId) {
-                    assert.response(
-                        server,
-                        getRequest('/api/v1/map/' + layergroupId + '/0/0/0@2x.png', true),
-                        validateCacheHeaders(done, expectedCacheHeaders)
-                    );
-                });
-            });
-
-            it ('/api/v1/map/:token/:z/:x/:y@:scale_factor?x.:format Mapnik tiles', function(done) {
-                withLayergroupId(mapConfig, function(err, layergroupId) {
-                    assert.response(
-                        server,
-                        getRequest('/api/v1/map/' + layergroupId + '/0/0/0.png', true),
-                        validateCacheHeaders(done, expectedCacheHeaders)
-                    );
-                });
-            });
-
-            it ('/api/v1/map/:token/:layer/:z/:x/:y.(:format) Per :layer rendering', function(done) {
-                withLayergroupId(mapConfig, function(err, layergroupId) {
-                    assert.response(
-                        server,
-                        getRequest('/api/v1/map/' + layergroupId + '/0/0/0/0.png', true),
-                        validateCacheHeaders(done, expectedCacheHeaders)
-                    );
-                });
-            });
-
-            it ('/api/v1/map/:token/:layer/attributes/:fid endpoint for info windows', function(done) {
-                withLayergroupId(mapConfig, function(err, layergroupId) {
-                    assert.response(
-                        server,
-                        getRequest('/api/v1/map/' + layergroupId + '/0/attributes/1', true),
-                        validateCacheHeaders(done, expectedCacheHeaders)
-                    );
-                });
-            });
-
-            it ('/api/v1/map/static/center/:token/:z/:lat/:lng/:width/:height.:format static maps', function(done) {
-                withLayergroupId(mapConfig, function(err, layergroupId) {
-                    assert.response(
-                        server,
-                        getRequest('/api/v1/map/static/center/' + layergroupId + '/0/0/0/400/300.png', true),
-                        validateCacheHeaders(done, expectedCacheHeaders)
-                    );
-                });
-            });
-
-            it ('/api/v1/map/static/bbox/:token/:bbox/:width/:height.:format static maps', function(done) {
-                withLayergroupId(mapConfig, function(err, layergroupId) {
-                    assert.response(
-                        server,
-                        getRequest('/api/v1/map/static/bbox/' + layergroupId + '/-45,-45,45,45/400/300.png', true),
-                        validateCacheHeaders(done, expectedCacheHeaders)
-                    );
-                });
-            });
-        });
-    });
-
-    describe('cache headers should NOT be present', function() {
-
-        it('/', function(done) {
-            assert.response(
-                server,
-                getRequest('/'),
-                statusOkResponse,
-                noCacheHeaders(done)
-            );
-        });
-
-        it('/version', function(done) {
-            assert.response(
-                server,
-                getRequest('/version'),
-                statusOkResponse,
-                noCacheHeaders(done)
-            );
-        });
-
-        it('/health', function(done) {
-            assert.response(
-                server,
-                getRequest('/health'),
-                statusOkResponse,
-                noCacheHeaders(done)
-            );
-        });
-
-        it('/api/v1/map/named list named maps', function(done) {
-            assert.response(
-                server,
-                getRequest('/api/v1/map/named', true),
-                statusOkResponse,
-                noCacheHeaders(done)
-            );
-        });
-
-        describe('with named maps', function() {
-
-            var templateName = 'x_cache';
-
-            beforeEach(function(done) {
-                var template =  {
-                    version: '0.0.1',
-                    name: templateName,
-                    auth: {
-                        method: 'open'
-                    },
-                    layergroup:  mapConfigs[0].data
-                };
-
-                var namedMapRequest = {
-                    url: '/api/v1/map/named?api_key=1234',
-                    method: 'POST',
-                    headers: {
-                        host: 'localhost',
-                        'Content-Type': 'application/json'
-                    },
-                    data: JSON.stringify(template)
-                };
-
-                assert.response(
-                    server,
-                    namedMapRequest,
-                    statusOkResponse,
-                    function(res, err) {
-                        done(err);
-                    }
-                );
-            });
-
-            afterEach(function(done) {
-                assert.response(
-                    server,
-                    {
-                        url: '/api/v1/map/named/' + templateName + '?api_key=1234',
-                        method: 'DELETE',
-                        headers: {
-                            host: 'localhost'
-                        }
-                    },
-                    {
-                        status: 204
-                    },
-                    function(res, err) {
-                        done(err);
-                    }
-                );
-            });
-
-
-            it('/api/v1/map/named/:template_id Named map retrieval', function(done) {
-                assert.response(
-                    server,
-                    getRequest('/api/v1/map/named/' + templateName, true),
-                    statusOkResponse,
-                    noCacheHeaders(done)
-                );
-            });
-
-            it('/api/v1/map/named/:template_id/jsonp Named map retrieval', function(done) {
-                assert.response(
-                    server,
-                    getRequest('/api/v1/map/named/' + templateName, true, 'cb'),
-                    statusOkResponse,
-                    noCacheHeaders(done)
-                );
-            });
-        });
-    });
-});

test/acceptance/multilayer.js

@@ -5,6 +5,9 @@ var step        = require('step');
 var strftime    = require('strftime');
 var redis_stats_db = 5;
 
+var mapnik = require('windshaft').mapnik;
+var semver = require('semver');
+
 var helper = require(__dirname + '/../support/test_helper');
 var LayergroupToken = require('../support/layergroup-token');
 
@@ -973,70 +976,72 @@ describe(suiteName, function() {
     });
 
     // See https://github.com/CartoDB/Windshaft-cartodb/issues/93
-    it("accepts unused directives", function(done) {
-      var layergroup =  {
-        version: '1.0.0',
-        layers: [
-           { options: {
-               sql: "select 'SRID=3857;POINT(0 0)'::geometry as the_geom_webmercator",
-               cartocss: '#layer { point-transform:"scale(20)"; }',
-               cartocss_version: '2.0.1'
-             } }
-        ]
-      };
-      var expected_token; // = "e34dd7e235138a062f8ba7ad051aa3a7";
-      step(
-        function do_post()
-        {
-          var next = this;
-          assert.response(server, {
-              url: layergroup_url,
-              method: 'POST',
-              headers: {host: 'localhost', 'Content-Type': 'application/json' },
-              data: JSON.stringify(layergroup)
-          }, {}, function(res) {
-              assert.equal(res.statusCode, 200, res.body);
-              var parsedBody = JSON.parse(res.body);
-              if ( expected_token ) {
-                assert.equal(parsedBody.layergroupid, expected_token + ':' + expected_last_updated_epoch);
-                assert.equal(res.headers['x-layergroup-id'], parsedBody.layergroupid);
-              }
-              else {
-                var token_components = parsedBody.layergroupid.split(':');
-                expected_token = token_components[0];
-                expected_last_updated_epoch = token_components[1];
-              }
-              next(null, res);
-          });
-        },
-        function do_get_tile(err)
-        {
-            assert.ifError(err);
-          var next = this;
-          assert.response(server, {
-              url: layergroup_url + "/" + expected_token + ':cb0/0/0/0.png',
-              method: 'GET',
-              headers: {host: 'localhost' },
-              encoding: 'binary'
-          }, {}, function(res) {
-              assert.equal(res.statusCode, 200, res.body);
-              assert.equal(res.headers['content-type'], "image/png");
-              assert.imageBufferIsSimilarToFile(res.body, windshaft_fixtures + '/test_default_mapnik_point.png',
-                  IMAGE_EQUALS_TOLERANCE_PER_MIL, function(err/*, similarity*/) {
-                      next(err);
+    if (semver.satisfies(mapnik.versions.mapnik, '2.3.x')) {
+        it("accepts unused directives", function(done) {
+          var layergroup =  {
+            version: '1.0.0',
+            layers: [
+               { options: {
+                   sql: "select 'SRID=3857;POINT(0 0)'::geometry as the_geom_webmercator",
+                   cartocss: '#layer { point-transform:"scale(20)"; }',
+                   cartocss_version: '2.0.1'
+                 } }
+            ]
+          };
+          var expected_token; // = "e34dd7e235138a062f8ba7ad051aa3a7";
+          step(
+            function do_post()
+            {
+              var next = this;
+              assert.response(server, {
+                  url: layergroup_url,
+                  method: 'POST',
+                  headers: {host: 'localhost', 'Content-Type': 'application/json' },
+                  data: JSON.stringify(layergroup)
+              }, {}, function(res) {
+                  assert.equal(res.statusCode, 200, res.body);
+                  var parsedBody = JSON.parse(res.body);
+                  if ( expected_token ) {
+                    assert.equal(parsedBody.layergroupid, expected_token + ':' + expected_last_updated_epoch);
+                    assert.equal(res.headers['x-layergroup-id'], parsedBody.layergroupid);
                   }
-              );
-          });
-        },
-        function finish(err) {
-            keysToDelete['user:localhost:mapviews:global'] = 5;
-            keysToDelete['map_cfg|' + expected_token] = 0;
-
-            done(err);
-        }
-      );
-    });
+                  else {
+                    var token_components = parsedBody.layergroupid.split(':');
+                    expected_token = token_components[0];
+                    expected_last_updated_epoch = token_components[1];
+                  }
+                  next(null, res);
+              });
+            },
+            function do_get_tile(err)
+            {
+                assert.ifError(err);
+              var next = this;
+              assert.response(server, {
+                  url: layergroup_url + "/" + expected_token + ':cb0/0/0/0.png',
+                  method: 'GET',
+                  headers: {host: 'localhost' },
+                  encoding: 'binary'
+              }, {}, function(res) {
+                  assert.equal(res.statusCode, 200, res.body);
+                  assert.equal(res.headers['content-type'], "image/png");
+                  assert.imageBufferIsSimilarToFile(res.body, windshaft_fixtures + '/test_default_mapnik_point.png',
+                      IMAGE_EQUALS_TOLERANCE_PER_MIL, function(err/*, similarity*/) {
+                          next(err);
+                      }
+                  );
+              });
+            },
+            function finish(err) {
+                keysToDelete['user:localhost:mapviews:global'] = 5;
+                keysToDelete['map_cfg|' + expected_token] = 0;
 
+                done(err);
+            }
+          );
+        });
+    }
+    
     // See https://github.com/CartoDB/Windshaft-cartodb/issues/91
     // and https://github.com/CartoDB/Windshaft-cartodb/issues/38
     it("tiles for private tables can be fetched with api_key", function(done) {

test/acceptance/multilayer_server.js

@@ -228,7 +228,9 @@ describe('tests from old api translated to multilayer', function() {
                 },
                 function(res) {
                     var parsed = JSON.parse(res.body);
-                    assert.deepEqual(parsed.errors, [ 'Unexpected token W' ]);
+                    assert.ok(parsed.errors);
+                    assert.equal(parsed.errors.length, 1);
+                    assert.ok(parsed.errors[0].match(/^Unexpected token W/));
 
                     done();
                 }

test/acceptance/named_maps_static_view.js

@@ -21,7 +21,7 @@ describe('named maps static view', function() {
 
     var IMAGE_TOLERANCE = 20;
 
-    function createTemplate(view, layers) {
+    function createTemplate(view) {
         return {
             version: '0.0.1',
             name: templateName,
@@ -36,7 +36,7 @@ describe('named maps static view', function() {
             },
             view: view,
             layergroup: {
-                layers: layers || [
+                layers: [
                     {
                         type: 'mapnik',
                         options: {
@@ -198,43 +198,4 @@ describe('named maps static view', function() {
         });
     });
 
-    it('should allow to select the layers to render', function (done) {
-        var view = {
-            bounds: {
-                west: 0,
-                south: 0,
-                east: 45,
-                north: 45
-            }
-        };
-
-        var layers = [
-            {
-                type: 'mapnik',
-                options: {
-                    sql: 'select * from populated_places_simple_reduced',
-                    cartocss: '#layer { marker-fill: <%= color %>; }',
-                    cartocss_version: '2.3.0'
-                }
-            },
-            {
-                type: 'mapnik',
-                options: {
-                    sql: 'select ST_Transform(ST_MakeEnvelope(-45, -45, 45, 45, 4326), 3857) the_geom_webmercator',
-                    cartocss: '#layer { polygon-fill: <%= color %>; }',
-                    cartocss_version: '2.3.0'
-                }
-            }
-        ];
-        templateMaps.addTemplate(username, createTemplate(view, layers), function (err) {
-            if (err) {
-                return done(err);
-            }
-            getStaticMap({ layer: 0 }, function(err, img) {
-                assert.ok(!err);
-                assert.imageIsSimilarToFile(img, previewFixture('bounds'), IMAGE_TOLERANCE, done);
-            });
-        });
-    });
-
 });

test/acceptance/ported/multilayer_error_cases.js

@@ -419,7 +419,9 @@ describe('multilayer error cases', function() {
             },
             function(res) {
                 var parsedBody = JSON.parse(res.body);
-                assert.deepEqual(parsedBody, { errors: ['SyntaxError: Unexpected token {'] });
+                assert.ok(parsedBody.errors);
+                assert.equal(parsedBody.errors.length, 1);
+                assert.ok(parsedBody.errors[0].match(/^SyntaxError: Unexpected token {/));
                 done();
             }
         );

test/acceptance/ported/server_gettile.js

@@ -139,13 +139,15 @@ describe('server_gettile', function() {
             13, 4011, 3088, imageCompareFn('test_table_13_4011_3088_styled_black.png', done));
     });
 
-    // See http://github.com/CartoDB/Windshaft/issues/99
-    it("unused directives are tolerated",  function(done){
-        var style = "#test_table{point-transform: 'scale(100)';}";
-        var sql = "SELECT 1 as cartodb_id, 'SRID=4326;POINT(0 0)'::geometry as the_geom";
-        testClient.getTile(testClient.singleLayerMapConfig(sql, style), 0, 0, 0,
-            imageCompareFn('test_default_mapnik_point.png', done));
-    });
+    if ( semver.satisfies(mapnik.versions.mapnik, '2.3.x') ) {
+        // See http://github.com/CartoDB/Windshaft/issues/99
+        it("unused directives are tolerated",  function(done){
+            var style = "#test_table{point-transform: 'scale(100)';}";
+            var sql = "SELECT 1 as cartodb_id, 'SRID=4326;POINT(0 0)'::geometry as the_geom";
+            testClient.getTile(testClient.singleLayerMapConfig(sql, style), 0, 0, 0,
+                imageCompareFn('test_default_mapnik_point.png', done));
+        });
+    }
 
     // See http://github.com/CartoDB/Windshaft/issues/100
     var test_strictness = function(done) {
@@ -168,51 +170,53 @@ describe('server_gettile', function() {
       // Strictness handling changed in 2.3.x, possibly a bug: see http://github.com/mapnik/mapnik/issues/2301
       it.skip('[skipped due to http://github.com/mapnik/mapnik/issues/2301]' + test_strict_lbl,  test_strictness);
     }
-    else {
+    else  if (!semver.satisfies(mapnik.versions.mapnik, '3.0.x')) {
       it(test_strict_lbl,  test_strictness);
     }
 
-    it('high cpu regression with mapnik <2.3.x', function(done) {
-        var sql = [
-            "SELECT 'my polygon name here' AS name,",
-            "st_envelope(st_buffer(st_transform(",
-            "st_setsrid(st_makepoint(-26.6592894004,49.7990296995),4326),3857),10000000)) AS the_geom",
-            "FROM generate_series(-6,6) x",
-            "UNION ALL",
-            "SELECT 'my marker name here' AS name,",
-            "       st_transform(st_setsrid(st_makepoint(49.6042060319,-49.0522997372),4326),3857) AS the_geom",
-            "FROM generate_series(-6,6) x"
-        ].join(' ');
+    if ( semver.satisfies(mapnik.versions.mapnik, '2.3.x') ) {
 
-        var style = [
-            '#test_table {marker-fill:#ff7;',
-            '    marker-max-error:0.447492761618;',
-            '    marker-line-opacity:0.659371340628;',
-            '    marker-allow-overlap:true;',
-            '    polygon-fill:green;',
-            '    marker-spacing:0.0;',
-            '    marker-width:4.0;',
-            '    marker-height:18.0;',
-            '    marker-opacity:0.942312062822;',
-            '    line-color:green;',
-            '    line-gamma:0.945973211092;',
-            '    line-cap:square;',
-            '    polygon-opacity:0.12576055992;',
-            '    marker-type:arrow;',
-            '    polygon-gamma:0.46354913107;',
-            '    line-dasharray:33,23;',
-            '    line-join:bevel;',
-            '    marker-placement:line;',
-            '    line-width:1.0;',
-            '    marker-line-color:#ff7;',
-            '    line-opacity:0.39403752154;',
-            '    marker-line-width:3.0;',
-            '}'
-        ].join('');
+        it('high cpu regression with mapnik <2.3.x', function(done) {
+            var sql = [
+                "SELECT 'my polygon name here' AS name,",
+                "st_envelope(st_buffer(st_transform(",
+                "st_setsrid(st_makepoint(-26.6592894004,49.7990296995),4326),3857),10000000)) AS the_geom",
+                "FROM generate_series(-6,6) x",
+                "UNION ALL",
+                "SELECT 'my marker name here' AS name,",
+                "       st_transform(st_setsrid(st_makepoint(49.6042060319,-49.0522997372),4326),3857) AS the_geom",
+                "FROM generate_series(-6,6) x"
+            ].join(' ');
 
-        testClient.getTile(testClient.singleLayerMapConfig(sql, style), 13, 4011, 3088, done);
-    });
+            var style = [
+                '#test_table {marker-fill:#ff7;',
+                '    marker-max-error:0.447492761618;',
+                '    marker-line-opacity:0.659371340628;',
+                '    marker-allow-overlap:true;',
+                '    polygon-fill:green;',
+                '    marker-spacing:0.0;',
+                '    marker-width:4.0;',
+                '    marker-height:18.0;',
+                '    marker-opacity:0.942312062822;',
+                '    line-color:green;',
+                '    line-gamma:0.945973211092;',
+                '    line-cap:square;',
+                '    polygon-opacity:0.12576055992;',
+                '    marker-type:arrow;',
+                '    polygon-gamma:0.46354913107;',
+                '    line-dasharray:33,23;',
+                '    line-join:bevel;',
+                '    marker-placement:line;',
+                '    line-width:1.0;',
+                '    marker-line-color:#ff7;',
+                '    line-opacity:0.39403752154;',
+                '    marker-line-width:3.0;',
+                '}'
+            ].join('');
 
+            testClient.getTile(testClient.singleLayerMapConfig(sql, style), 13, 4011, 3088, done);
+        });
+    }
     // https://github.com/CartoDB/Windshaft-cartodb/issues/316
     it('should return errors with better formatting', function(done) {
         var mapConfig = {

test/acceptance/ported/torque.js

@@ -370,7 +370,7 @@ describe('torque', function() {
         {
           var next = this;
           assert.response(server, {
-              url: '/database/windshaft_test/layergroup?dbport=1234567',
+              url: '/database/windshaft_test/layergroup?dbport=54777',
               method: 'POST',
               headers: {'Content-Type': 'application/json' },
               data: JSON.stringify(mapconfig)

test/acceptance/templates.js

@@ -1052,9 +1052,8 @@ describe('template_api', function() {
             'Unexpected error for authorized instance: ' + res.statusCode + ' -- ' + res.body);
           assert.equal(res.headers['content-type'], "application/json; charset=utf-8");
           var cc = res.headers['x-cache-channel'];
-          var expectedCC = 'test_windshaft_cartodb_user_1_db:public.test_table_private_1';
           assert.ok(cc);
-          assert.equal(cc, expectedCC);
+          assert.ok(cc.match, /ciao/, cc);
           // hack simulating restart...
           server.layergroupAffectedTablesCache.cache.reset(); // need to clean channel cache
           var get_request = {
@@ -1073,9 +1072,8 @@ describe('template_api', function() {
             'Unexpected error for authorized instance: ' + res.statusCode + ' -- ' + res.body);
           assert.equal(res.headers['content-type'], "application/json; charset=utf-8");
           var cc = res.headers['x-cache-channel'];
-          var expectedCC = 'test_windshaft_cartodb_user_1_db:public.test_table_private_1';
           assert.ok(cc, "Missing X-Cache-Channel on fetch-after-restart");
-          assert.equal(cc, expectedCC);
+          assert.ok(cc.match, /ciao/, cc);
           return null;
         },
         function deleteTemplate(err)

test/acceptance/x_cache_channel.js

@@ -0,0 +1,307 @@
+var testHelper = require('../support/test_helper');
+
+var assert = require('../support/assert');
+var qs = require('querystring');
+
+var CartodbWindshaft = require('../../lib/cartodb/server');
+var serverOptions = require('../../lib/cartodb/server_options');
+var server = new CartodbWindshaft(serverOptions);
+server.setMaxListeners(0);
+
+var LayergroupToken = require('../support/layergroup-token');
+
+describe('get requests x-cache-channel', function() {
+
+    var keysToDelete;
+    beforeEach(function() {
+        keysToDelete = {};
+    });
+
+    afterEach(function(done) {
+        testHelper.deleteRedisKeys(keysToDelete, done);
+    });
+
+    var statusOkResponse = {
+        status: 200
+    };
+
+    var mapConfig = {
+        version: '1.3.0',
+        layers: [
+            {
+                options: {
+                    sql: 'select * from test_table limit 2',
+                    cartocss: '#layer { marker-fill:red; }',
+                    cartocss_version: '2.3.0',
+                    attributes: {
+                        id:'cartodb_id',
+                        columns: [
+                            'name',
+                            'address'
+                        ]
+                    }
+                }
+            }
+        ]
+    };
+
+    var layergroupRequest = {
+        url: '/api/v1/map?config=' + encodeURIComponent(JSON.stringify(mapConfig)),
+        method: 'GET',
+        headers: {
+            host: 'localhost'
+        }
+    };
+
+    function getRequest(url, addApiKey, callbackName) {
+        var params = {};
+        if (!!addApiKey) {
+            params.api_key = '1234';
+        }
+        if (!!callbackName) {
+            params.callback = callbackName;
+        }
+
+        return {
+            url: url + '?' + qs.stringify(params),
+            method: 'GET',
+            headers: {
+                host: 'localhost',
+                'Content-Type': 'application/json'
+            }
+        };
+    }
+
+    function validateXCacheChannel(done, expectedCacheChannel) {
+        return function(res, err) {
+            if (err) {
+                return done(err);
+            }
+
+            assert.ok(res.headers['x-cache-channel']);
+            if (expectedCacheChannel) {
+                assert.equal(res.headers['x-cache-channel'], expectedCacheChannel);
+            }
+
+            done();
+        };
+    }
+
+    function noXCacheChannelHeader(done) {
+        return function(res, err) {
+            if (err) {
+                return done(err);
+            }
+
+            assert.ok(
+                !res.headers['x-cache-channel'],
+                'did not expect x-cache-channel header, got: `' + res.headers['x-cache-channel'] + '`'
+            );
+            done();
+        };
+    }
+
+    function withLayergroupId(callback) {
+        assert.response(
+            server,
+            layergroupRequest,
+            statusOkResponse,
+            function(res, err) {
+                if (err) {
+                    return callback(err);
+                }
+                var layergroupId = JSON.parse(res.body).layergroupid;
+                keysToDelete['map_cfg|' + LayergroupToken.parse(layergroupId).token] = 0;
+                keysToDelete['user:localhost:mapviews:global'] = 5;
+                callback(null, layergroupId, res);
+            }
+        );
+    }
+
+    describe('header should be present', function() {
+
+        it('/api/v1/map Map instantiation', function(done) {
+            var testFn = validateXCacheChannel(done, 'test_windshaft_cartodb_user_1_db:public.test_table');
+            withLayergroupId(function(err, layergroupId, res) {
+                testFn(res);
+            });
+        });
+
+        it ('/api/v1/map/:token/:z/:x/:y@:scale_factor?x.:format Mapnik retina tiles', function(done) {
+            withLayergroupId(function(err, layergroupId) {
+                assert.response(
+                    server,
+                    getRequest('/api/v1/map/' + layergroupId + '/0/0/0@2x.png'),
+                    validateXCacheChannel(done, 'test_windshaft_cartodb_user_1_db:public.test_table')
+                );
+            });
+        });
+
+        it ('/api/v1/map/:token/:z/:x/:y@:scale_factor?x.:format Mapnik tiles', function(done) {
+            withLayergroupId(function(err, layergroupId) {
+                assert.response(
+                    server,
+                    getRequest('/api/v1/map/' + layergroupId + '/0/0/0.png'),
+                    validateXCacheChannel(done, 'test_windshaft_cartodb_user_1_db:public.test_table')
+                );
+            });
+        });
+
+        it ('/api/v1/map/:token/:layer/:z/:x/:y.(:format) Per :layer rendering', function(done) {
+            withLayergroupId(function(err, layergroupId) {
+                assert.response(
+                    server,
+                    getRequest('/api/v1/map/' + layergroupId + '/0/0/0/0.png'),
+                    validateXCacheChannel(done, 'test_windshaft_cartodb_user_1_db:public.test_table')
+                );
+            });
+        });
+
+        it ('/api/v1/map/:token/:layer/attributes/:fid endpoint for info windows', function(done) {
+            withLayergroupId(function(err, layergroupId) {
+                assert.response(
+                    server,
+                    getRequest('/api/v1/map/' + layergroupId + '/0/attributes/1'),
+                    validateXCacheChannel(done, 'test_windshaft_cartodb_user_1_db:public.test_table')
+                );
+            });
+        });
+
+        it ('/api/v1/map/static/center/:token/:z/:lat/:lng/:width/:height.:format static maps', function(done) {
+            withLayergroupId(function(err, layergroupId) {
+                assert.response(
+                    server,
+                    getRequest('/api/v1/map/static/center/' + layergroupId + '/0/0/0/400/300.png'),
+                    validateXCacheChannel(done, 'test_windshaft_cartodb_user_1_db:public.test_table')
+                );
+            });
+        });
+
+        it ('/api/v1/map/static/bbox/:token/:bbox/:width/:height.:format static maps', function(done) {
+            withLayergroupId(function(err, layergroupId) {
+                assert.response(
+                    server,
+                    getRequest('/api/v1/map/static/bbox/' + layergroupId + '/-45,-45,45,45/400/300.png'),
+                    validateXCacheChannel(done, 'test_windshaft_cartodb_user_1_db:public.test_table')
+                );
+            });
+        });
+
+    });
+
+    describe('header should NOT be present', function() {
+
+        it('/', function(done) {
+            assert.response(
+                server,
+                getRequest('/'),
+                statusOkResponse,
+                noXCacheChannelHeader(done)
+            );
+        });
+
+        it('/version', function(done) {
+            assert.response(
+                server,
+                getRequest('/version'),
+                statusOkResponse,
+                noXCacheChannelHeader(done)
+            );
+        });
+
+        it('/health', function(done) {
+            assert.response(
+                server,
+                getRequest('/health'),
+                statusOkResponse,
+                noXCacheChannelHeader(done)
+            );
+        });
+
+        it('/api/v1/map/named list named maps', function(done) {
+            assert.response(
+                server,
+                getRequest('/api/v1/map/named', true),
+                statusOkResponse,
+                noXCacheChannelHeader(done)
+            );
+        });
+
+        describe('with named maps', function() {
+
+            var templateName = 'x_cache';
+
+            beforeEach(function(done) {
+                var template =  {
+                    version: '0.0.1',
+                    name: templateName,
+                    auth: {
+                        method: 'open'
+                    },
+                    layergroup:  mapConfig
+                };
+
+                var namedMapRequest = {
+                    url: '/api/v1/map/named?api_key=1234',
+                    method: 'POST',
+                    headers: {
+                        host: 'localhost',
+                        'Content-Type': 'application/json'
+                    },
+                    data: JSON.stringify(template)
+                };
+
+                assert.response(
+                    server,
+                    namedMapRequest,
+                    statusOkResponse,
+                    function(res, err) {
+                        done(err);
+                    }
+                );
+            });
+
+            afterEach(function(done) {
+                assert.response(
+                    server,
+                    {
+                        url: '/api/v1/map/named/' + templateName + '?api_key=1234',
+                        method: 'DELETE',
+                        headers: {
+                            host: 'localhost'
+                        }
+                    },
+                    {
+                        status: 204
+                    },
+                    function(res, err) {
+                        done(err);
+                    }
+                );
+            });
+
+
+            it('/api/v1/map/named/:template_id Named map retrieval', function(done) {
+                assert.response(
+                    server,
+                    getRequest('/api/v1/map/named/' + templateName, true),
+                    statusOkResponse,
+                    noXCacheChannelHeader(done)
+                );
+            });
+
+            it('/api/v1/map/named/:template_id/jsonp Named map retrieval', function(done) {
+                assert.response(
+                    server,
+                    getRequest('/api/v1/map/named/' + templateName, true, 'cb'),
+                    statusOkResponse,
+                    noXCacheChannelHeader(done)
+                );
+            });
+
+        });
+
+    });
+
+
+});

test/support/prepare_db.sh

@@ -75,7 +75,7 @@ if test x"$PREPARE_PGSQL" = xyes; then
   dropdb "${TEST_DB}"
   createdb -Ttemplate_postgis -EUTF8 "${TEST_DB}" || die "Could not create test database"
 
-  LOCAL_SQL_SCRIPTS='analysis_catalog windshaft.test gadm4 ported/populated_places_simple_reduced cdb_analysis_check cdb_invalidate_varnish'
+  LOCAL_SQL_SCRIPTS='analysis_catalog windshaft.test gadm4 ported/populated_places_simple_reduced cdb_analysis_check'
   REMOTE_SQL_SCRIPTS='CDB_QueryStatements CDB_QueryTables CDB_CartodbfyTable CDB_TableMetadata CDB_ForeignTable CDB_UserTables CDB_ColumnNames CDB_ZoomFromScale CDB_OverviewsSupport CDB_Overviews CDB_QuantileBins CDB_JenksBins CDB_HeadsTailsBins CDB_EqualIntervalBins CDB_Hexagon CDB_XYZ'
 
   CURL_ARGS=""

test/support/sql/cdb_invalidate_varnish.sql

@@ -1,6 +0,0 @@
-CREATE OR REPLACE FUNCTION CDB_Invalidate_Varnish(table_name TEXT)
-RETURNS void AS
-$$
-BEGIN
-END;
-$$ LANGUAGE PLPGSQL;

test/unit/cartodb/model/resource-locator.test.js

@@ -1,132 +0,0 @@
-require('../../../support/test_helper');
-
-var assert = require('../../../support/assert');
-var ResourceLocator = require('../../../../lib/cartodb/models/resource-locator');
-
-describe('ResourceLocator.getUrls', function() {
-    var USERNAME = 'username';
-    var RESOURCE = 'wadus';
-    var HTTP_SUBDOMAINS = ['1', '2', '3', '4'];
-    var HTTPS_SUBDOMAINS = ['a', 'b', 'c', 'd'];
-
-    it('should return default urls when no serverMetadata is in environment', function() {
-        var resourceLocator = new ResourceLocator({});
-        var urls = resourceLocator.getUrls(USERNAME, RESOURCE);
-        assert.ok(urls);
-    });
-
-    var BASIC_ENVIRONMENT = {
-        serverMetadata: {
-            cdn_url: {
-                http: 'cdn.carto.com',
-                https: 'cdn.ssl.carto.com'
-            }
-        }
-    };
-    it('should return default urls when basic http and https domains are provided', function() {
-        var resourceLocator = new ResourceLocator(BASIC_ENVIRONMENT);
-        var urls = resourceLocator.getUrls(USERNAME, RESOURCE);
-        assert.ok(urls);
-
-        assert.equal(urls.http, ['http://cdn.carto.com', USERNAME, 'api/v1/map', RESOURCE].join('/'));
-        assert.equal(urls.https, ['https://cdn.ssl.carto.com', USERNAME, 'api/v1/map', RESOURCE].join('/'));
-    });
-
-    var RESOURCE_TEMPLATES_ENVIRONMENT = {
-        serverMetadata: {
-            cdn_url: {
-                http: 'cdn.carto.com',
-                https: 'cdn.ssl.carto.com'
-            }
-        },
-        resources_url_templates: {
-            http: 'http://{{=it.user}}.localhost.lan/api/v1/map',
-            https: 'https://{{=it.user}}.ssl.localhost.lan/api/v1/map'
-        }
-    };
-    it('resources_url_templates should take precedence over http and https domains', function() {
-        var resourceLocator = new ResourceLocator(RESOURCE_TEMPLATES_ENVIRONMENT);
-        var urls = resourceLocator.getUrls(USERNAME, RESOURCE);
-        assert.ok(urls);
-
-        assert.equal(urls.http, ['http://' + USERNAME + '.localhost.lan', 'api/v1/map', RESOURCE].join('/'));
-        assert.equal(urls.https, ['https://' + USERNAME + '.ssl.localhost.lan', 'api/v1/map', RESOURCE].join('/'));
-    });
-
-    var CDN_TEMPLATES_ENVIRONMENT = {
-        serverMetadata: {
-            cdn_url: {
-                http: 'cdn.carto.com',
-                https: 'cdn.ssl.carto.com',
-                templates: {
-                    http: {
-                        url: "http://{s}.cdn.carto.com",
-                        subdomains: HTTP_SUBDOMAINS
-                    },
-                    https: {
-                        url: "https://cdn_{s}.ssl.cdn.carto.com",
-                        subdomains: HTTPS_SUBDOMAINS
-                    }
-                }
-            }
-        }
-    };
-    it('cdn_url templates should take precedence over http and https domains', function() {
-        var resourceLocator = new ResourceLocator(CDN_TEMPLATES_ENVIRONMENT);
-        var urls = resourceLocator.getUrls(USERNAME, RESOURCE);
-        assert.ok(urls);
-
-        var httpSubdomain = ResourceLocator.subdomain(HTTP_SUBDOMAINS, RESOURCE);
-        var httpsSubdomain = ResourceLocator.subdomain(HTTPS_SUBDOMAINS, RESOURCE);
-
-        assert.equal(
-            urls.http,
-            ['http://' + httpSubdomain + '.cdn.carto.com', USERNAME, 'api/v1/map', RESOURCE].join('/')
-        );
-        assert.equal(
-            urls.https,
-            ['https://cdn_' + httpsSubdomain + '.ssl.cdn.carto.com', USERNAME, 'api/v1/map', RESOURCE].join('/')
-        );
-    });
-
-    var CDN_URL_AND_RESOURCE_TEMPLATES_ENVIRONMENT = {
-        serverMetadata: {
-            cdn_url: {
-                http: 'cdn.carto.com',
-                https: 'cdn.ssl.carto.com',
-                templates: {
-                    http: {
-                        url: "http://{s}.cdn.carto.com",
-                        subdomains: HTTP_SUBDOMAINS
-                    },
-                    https: {
-                        url: "https://cdn_{s}.ssl.cdn.carto.com",
-                        subdomains: HTTPS_SUBDOMAINS
-                    }
-                }
-            }
-        },
-        resources_url_templates: {
-            http: 'http://{{=it.cdn_url}}/u/{{=it.user}}/api/v1/map',
-            https: 'https://{{=it.cdn_url}}/u/{{=it.user}}/api/v1/map'
-        }
-    };
-    it('should mix cdn_url templates and resources_url_templates', function() {
-        var resourceLocator = new ResourceLocator(CDN_URL_AND_RESOURCE_TEMPLATES_ENVIRONMENT);
-        var urls = resourceLocator.getUrls(USERNAME, RESOURCE);
-        assert.ok(urls);
-
-        var httpSubdomain = ResourceLocator.subdomain(HTTP_SUBDOMAINS, RESOURCE);
-        var httpsSubdomain = ResourceLocator.subdomain(HTTPS_SUBDOMAINS, RESOURCE);
-
-        assert.equal(
-            urls.http,
-            ['http://' + httpSubdomain + '.cdn.carto.com', 'u', USERNAME, 'api/v1/map', RESOURCE].join('/')
-        );
-        assert.equal(
-            urls.https,
-            ['https://cdn_' + httpsSubdomain + '.ssl.cdn.carto.com', 'u', USERNAME, 'api/v1/map', RESOURCE].join('/')
-        );
-    });
-
-});

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

@@ -19,7 +19,7 @@ describe('windshaft', function() {
 
     it('can spawn a new server on the global listen port', function(done){
         var ws = cartodbServer(serverOptions);
-        var server = ws.listen(global.environment.windshaft_port, function() {
+        var server = ws.listen(global.environment.port, function() {
             assert.ok(ws);
             server.close(done); /* allow proper tear down */
         });