Release 2.55.0

Skip null values for quantification methods

.travis.yml

@@ -1,10 +1,6 @@
-sudo: false
-
 addons:
-  postgresql: "9.4"
   apt:
     packages:
-      - postgresql-plpython-9.4
       - pkg-config
       - libcairo2-dev
       - libjpeg8-dev
@@ -12,6 +8,17 @@ addons:
 
 before_install:
   - npm install -g npm@2
+  - lsb_release -a
+  - sudo mv /etc/apt/sources.list.d/pgdg-source.list* /tmp
+  - sudo apt-get -qq purge postgis* postgresql*
+  - sudo rm -Rf /var/lib/postgresql /etc/postgresql
+  - sudo apt-add-repository --yes ppa:cartodb/postgresql-9.5
+  - sudo apt-add-repository --yes ppa:cartodb/gis
+  - sudo apt-get update
+  - sudo apt-get install -q postgresql-9.5-postgis-2.2
+  - sudo apt-get install -q postgresql-plpython-9.5
+  - echo -e "local\tall\tall\ttrust\nhost\tall\tall\t127.0.0.1/32\ttrust\nhost\tall\tall\t::1/128\ttrust" |sudo tee /etc/postgresql/9.5/main/pg_hba.conf
+  - sudo service postgresql restart
   - createdb template_postgis
   - createuser publicuser
   - psql -c "CREATE EXTENSION postgis" template_postgis

NEWS.md

@@ -1,5 +1,174 @@
 # Changelog
 
+## 2.55.0
+
+Released 2016-07-04
+
+Enhancements:
+ - Skip null values for quantification methods generating null values.
+
+Announcements:
+ - Uses new configuration for camshaft: analysis node has an associated user/owner.
+ - Upgrades camshaft to [0.26.0](https://github.com/CartoDB/camshaft/releases/tag/0.26.0).
+
+
+## 2.54.0
+
+Released 2016-06-30
+
+Improvements:
+ - Errors with context: replaced `turbo-carto` error type by `layer` type.
+
+Announcements:
+ - Upgrades camshaft to [0.23.0](https://github.com/CartoDB/camshaft/releases/tag/0.23.0)
+
+
+## 2.53.5
+
+Released 2016-06-29
+
+Bug fixes:
+ - Uses node list so identical nodes are not de-duplicated and can be used with different ids #528.
+
+
+## 2.53.4
+
+Released 2016-06-28
+
+Announcements:
+ - Upgrades camshaft to [0.22.4](https://github.com/CartoDB/camshaft/releases/tag/0.22.4)
+
+
+## 2.53.3
+
+Released 2016-06-28
+
+Announcements:
+ - Upgrades camshaft to [0.22.3](https://github.com/CartoDB/camshaft/releases/tag/0.22.3)
+
+
+## 2.53.2
+
+Released 2016-06-28
+
+Announcements:
+ - Upgrades camshaft to [0.22.2](https://github.com/CartoDB/camshaft/releases/tag/0.22.2)
+
+
+## 2.53.1
+
+Released 2016-06-28
+
+Announcements:
+ - Upgrades camshaft to [0.22.1](https://github.com/CartoDB/camshaft/releases/tag/0.22.1)
+
+
+## 2.53.0
+
+Released 2016-06-24
+
+Announcements:
+ - Upgrades camshaft to [0.22.0](https://github.com/CartoDB/camshaft/releases/tag/0.22.0)
+
+
+## 2.52.0
+
+Released 2016-06-23
+
+Announcements:
+ - Upgrades camshaft to [0.21.0](https://github.com/CartoDB/camshaft/releases/tag/0.21.0)
+
+
+## 2.51.0
+
+Released 2016-06-21
+
+Enhancements:
+ - Split turbo-carto adapter substitutions tokens query.
+ - Now errors with context have the same schema. #519
+ - Responses with error now return the layer-id to give more info to the user.
+
+Announcements:
+ - Upgrades camshaft to [0.20.0](https://github.com/CartoDB/camshaft/releases/tag/0.20.0)
+
+
+## 2.50.0
+
+Released 2016-06-21
+
+Bug fixes:
+ - Pixel size query for turbo-carto adapter using radians and degrees instead of meters.
+
+New features:
+ - Add support for min, max, and avg operations in aggregation dataview #513.
+
+Announcements:
+ - Upgrades camshaft to [0.19.0](https://github.com/CartoDB/camshaft/releases/tag/0.19.0)
+
+
+## 2.49.1
+
+Released 2016-06-20
+
+Announcements:
+ - Upgrades turbo-carto to [0.12.1](https://github.com/CartoDB/turbo-carto/releases/tag/0.12.1).
+
+Bug fixes:
+ - Use an empty array as default value for falsy ramps #512.
+ - Use the_geom for intermediate dataviews #511.
+ - Pick last update time for layergroupid from analyses results #510.
+
+
+## 2.49.0
+
+Released 2016-06-15
+
+Announcements:
+ - Upgrades camshaft to [0.17.1](https://github.com/CartoDB/camshaft/releases/tag/0.17.1)
+
+
+## 2.48.0
+
+Released 2016-06-14
+
+Announcements:
+ - Upgrades camshaft to [0.15.1](https://github.com/CartoDB/camshaft/releases/tag/0.15.1)
+ - Responses with more context info if analysis or turbo-carto fails during map creation.
+
+## 2.47.1
+
+Released 2016-06-13
+
+Announcements:
+ - Upgrades camshaft to [0.14.1](https://github.com/CartoDB/camshaft/releases/tag/0.14.1)
+
+
+## 2.47.0
+
+Released 2016-06-10
+
+Announcements:
+ - Upgrades camshaft to [0.14.0](https://github.com/CartoDB/camshaft/releases/tag/0.14.0)
+
+
+## 2.46.0
+
+Released 2016-06-09
+
+Improvements:
+ - Support for substitution tokens in geojson tiles
+ - Warn on application start about non-matching dependencies
+
+Announcements:
+ - Upgrades windshaft to [2.3.0](https://github.com/CartoDB/camshaft/releases/tag/2.3.0)
+ - Upgrades camshaft to [0.13.0](https://github.com/CartoDB/camshaft/releases/tag/0.13.0)
+ - Upgrades turbo-carto to [0.11.0](https://github.com/CartoDB/turbo-carto/releases/tag/0.11.0)
+
+Bug fixes:
+ - Column provided for geojson renderer should not be null #476
+ - Dataviews/widgets adapter working with non sql, non source, and non widgets layers
+
+
 ## 2.45.0
 
 Released 2016-06-02

lib/cartodb/backends/dataview.js

@@ -16,6 +16,9 @@ var overviewsQueryRewriter = new OverviewsQueryRewriter({
     zoom_level: 'CDB_ZoomFromScale(!scale_denominator!)'
 });
 
+var dot = require('dot');
+dot.templateSettings.strip = false;
+
 function DataviewBackend(analysisBackend) {
     this.analysisBackend = analysisBackend;
 }
@@ -53,6 +56,7 @@ DataviewBackend.prototype.getDataview = function (mapConfigProvider, user, param
             assert.ifError(err);
 
             var analysisConfiguration = {
+                user: user,
                 db: {
                     host: params.dbhost,
                     port: params.dbport,
@@ -82,7 +86,7 @@ DataviewBackend.prototype.getDataview = function (mapConfigProvider, user, param
                     sourceId2Node[rootNode.params.id] = rootNode;
                 }
 
-                analysis.getSortedNodes().forEach(function(node) {
+                analysis.getNodes().forEach(function(node) {
                     if (node.params && node.params.id) {
                         sourceId2Node[node.params.id] = node;
                     }
@@ -105,15 +109,7 @@ DataviewBackend.prototype.getDataview = function (mapConfigProvider, user, param
             var ownFilter = +params.own_filter;
             ownFilter = !!ownFilter;
 
-            var query;
-
-            if (ownFilter) {
-                query = node.getQuery();
-            } else {
-                var applyFilters = {};
-                applyFilters[dataviewName] = false;
-                query = node.getQuery(applyFilters);
-            }
+            var query = layerQuery(node, dataviewName, ownFilter);
 
             var sourceId =  dataviewDefinition.source.id; // node.id
             var layer = _.find(
@@ -137,14 +133,14 @@ DataviewBackend.prototype.getDataview = function (mapConfigProvider, user, param
             }
 
             if (params.bbox) {
-                var bboxFilter = new BBoxFilter({column: 'the_geom', srid: 4326}, {bbox: params.bbox});
+                var bboxFilter = new BBoxFilter({column: 'the_geom_webmercator', srid: 3857}, {bbox: params.bbox});
                 query = bboxFilter.sql(query);
                 if ( queryRewriteData ) {
                     var bbox_filter_definition = {
                         type: 'bbox',
                         options: {
-                            column: 'the_geom',
-                            srid: 4326,
+                            column: 'the_geom_webmercator',
+                            srid: 3857
                         },
                         params: {
                             bbox: params.bbox
@@ -206,6 +202,7 @@ DataviewBackend.prototype.search = function (mapConfigProvider, user, params, ca
             assert.ifError(err);
 
             var analysisConfiguration = {
+                user: user,
                 db: {
                     host: params.dbhost,
                     port: params.dbport,
@@ -237,7 +234,7 @@ DataviewBackend.prototype.search = function (mapConfigProvider, user, params, ca
                     sourceId2Node[rootNode.params.id] = rootNode;
                 }
 
-                analysis.getSortedNodes().forEach(function(node) {
+                analysis.getNodes().forEach(function(node) {
                     if (node.params && node.params.id) {
                         sourceId2Node[node.params.id] = node;
                     }
@@ -260,14 +257,7 @@ DataviewBackend.prototype.search = function (mapConfigProvider, user, params, ca
             var ownFilter = +params.own_filter;
             ownFilter = !!ownFilter;
 
-            var query;
-            if (ownFilter) {
-                query = node.getQuery();
-            } else {
-                var applyFilters = {};
-                applyFilters[dataviewName] = false;
-                query = node.getQuery(applyFilters);
-            }
+            var query = layerQuery(node, dataviewName, ownFilter);
 
             if (params.bbox) {
                 var bboxFilter = new BBoxFilter({column: 'the_geom', srid: 4326}, {bbox: params.bbox});
@@ -321,3 +311,31 @@ function dbParamsFromReqParams(params) {
     }
     return dbParams;
 }
+
+var SKIP_COLUMNS = {
+    'the_geom': true,
+    'the_geom_webmercator': true
+};
+
+function skipColumns(columnNames) {
+    return columnNames
+        .filter(function(columnName) { return !SKIP_COLUMNS[columnName]; });
+}
+
+var layerQueryTemplate = dot.template([
+    'SELECT {{=it._columns}}',
+    'FROM ({{=it._query}}) _cdb_analysis_query'
+].join('\n'));
+
+function layerQuery(node, dataviewName, ownFilter) {
+    var applyFilters = {};
+    if (!ownFilter) {
+        applyFilters[dataviewName] = false;
+    }
+
+    if (node.type === 'source') {
+        return node.getQuery(applyFilters);
+    }
+    var _columns = ['ST_Transform(the_geom, 3857) the_geom_webmercator'].concat(skipColumns(node.getColumns()));
+    return layerQueryTemplate({ _query: node.getQuery(applyFilters), _columns: _columns.join(', ') });
+}

lib/cartodb/backends/turbo-carto-postgres-datasource.js

@@ -54,9 +54,8 @@ var method2strategy = {
     category: STRATEGY.EXACT
 };
 
-function PostgresDatasource (pgQueryRunner, username, query) {
-    this.pgQueryRunner = pgQueryRunner;
-    this.username = username;
+function PostgresDatasource (psql, query) {
+    this.psql = psql;
     this.query = query;
 }
 
@@ -75,13 +74,20 @@ PostgresDatasource.prototype.getRamp = function (column, buckets, method, callba
 
     var query = template({ _column: column, _sql: this.query, _buckets: buckets });
 
-    this.pgQueryRunner.run(this.username, query, function (err, result) {
+    this.psql.query(query, function (err, resultSet) {
         if (err) {
             return callback(err);
         }
 
+        resultSet = resultSet || {};
+        var result = resultSet.rows || [];
+
         var strategy = method2strategy[methodName];
-        var ramp = result[0][methodName];
+        var ramp = result[0][methodName] || [];
+        // Skip null values from ramp
+        // Generated turbo-carto won't be correct, but better to keep it working than failing
+        // TODO fix cartodb-postgres extension quantification functions
+        ramp = ramp.filter(function(value) { return value !== null; });
         if (strategy !== STRATEGY.EXACT) {
             ramp = ramp.sort(function(a, b) {
                 return a - b;
@@ -89,7 +95,7 @@ PostgresDatasource.prototype.getRamp = function (column, buckets, method, callba
         }
 
         return callback(null, { ramp: ramp, strategy: strategy });
-    });
+    }, true); // use read-only transaction
 };
 
 module.exports = PostgresDatasource;

lib/cartodb/controllers/base.js

@@ -214,15 +214,15 @@ BaseController.prototype.sendError = function(req, res, err, label) {
         statusCode = 200;
     }
 
-    var errorResponseBody = { errors: allErrors.map(errorMessage) };
+    var errorResponseBody = {
+        errors: allErrors.map(errorMessage),
+        errors_with_context: allErrors.map(errorMessageWithContext)
+    };
 
     this.send(req, res, errorResponseBody, statusCode);
 };
 
-function errorMessage(err) {
-    // See https://github.com/Vizzuality/Windshaft-cartodb/issues/68
-    var message = (_.isString(err) ? err : err.message) || 'Unknown error';
-
+function stripConnectionInfo(message) {
     // Strip connection info, if any
     return message
         // See https://github.com/CartoDB/Windshaft/issues/173
@@ -230,6 +230,32 @@ function errorMessage(err) {
         // See https://travis-ci.org/CartoDB/Windshaft/jobs/20703062#L1644
         .replace(/is the server.*encountered/im, 'encountered');
 }
+
+function errorMessage(err) {
+    // See https://github.com/Vizzuality/Windshaft-cartodb/issues/68
+    var message = (_.isString(err) ? err : err.message) || 'Unknown error';
+
+    return stripConnectionInfo(message);
+}
+
+function errorMessageWithContext(err) {
+    // See https://github.com/Vizzuality/Windshaft-cartodb/issues/68
+    var message = (_.isString(err) ? err : err.message) || 'Unknown error';
+
+    var error = {
+        type: err.type || 'unknown',
+        message: stripConnectionInfo(message),
+    };
+
+    for (var prop in err) {
+        // type & message are properties from Error's prototype and will be skipped
+        if (err.hasOwnProperty(prop)) {
+            error[prop] = err[prop];
+        }
+    }
+
+    return error;
+}
 module.exports.errorMessage = errorMessage;
 
 function findStatusCode(err) {

lib/cartodb/controllers/map.js

@@ -135,6 +135,7 @@ MapController.prototype.create = function(req, res, prepareConfigFn) {
         function prepareAdapterMapConfig(err, requestMapConfig) {
             assert.ifError(err);
             context.analysisConfiguration = {
+                user: req.context.user,
                 db: {
                     host: req.params.dbhost,
                     port: req.params.dbport,
@@ -161,7 +162,7 @@ MapController.prototype.create = function(req, res, prepareConfigFn) {
         },
         function afterLayergroupCreate(err, layergroup) {
             assert.ifError(err);
-            self.afterLayergroupCreate(req, res, mapConfig, layergroup, this);
+            self.afterLayergroupCreate(req, res, mapConfig, layergroup, context.analysesResults, this);
         },
         function finish(err, layergroup) {
             if (err) {
@@ -219,7 +220,7 @@ MapController.prototype.instantiateTemplate = function(req, res, prepareParamsFn
         },
         function afterLayergroupCreate(err, layergroup) {
             assert.ifError(err);
-            self.afterLayergroupCreate(req, res, mapConfig, layergroup, this);
+            self.afterLayergroupCreate(req, res, mapConfig, layergroup, mapConfigProvider.analysesResults, this);
         },
         function finishTemplateInstantiation(err, layergroup) {
             if (err) {
@@ -240,7 +241,7 @@ MapController.prototype.instantiateTemplate = function(req, res, prepareParamsFn
     );
 };
 
-MapController.prototype.afterLayergroupCreate = function(req, res, mapconfig, layergroup, callback) {
+MapController.prototype.afterLayergroupCreate = function(req, res, mapconfig, layergroup, analysesResults, callback) {
     var self = this;
 
     var username = req.context.user;
@@ -299,9 +300,12 @@ MapController.prototype.afterLayergroupCreate = function(req, res, mapconfig, la
             // feed affected tables cache so it can be reused from, for instance, layergroup controller
             self.layergroupAffectedTables.set(dbName, layergroupId, result);
 
+            var lastUpdateTime = result.getLastUpdatedAt();
+            lastUpdateTime = getLastUpdatedTime(analysesResults, lastUpdateTime) || lastUpdateTime;
+
             // last update for layergroup cache buster
-            layergroup.layergroupid = layergroup.layergroupid + ':' + result.getLastUpdatedAt();
-            layergroup.last_updated = new Date(result.getLastUpdatedAt()).toISOString();
+            layergroup.layergroupid = layergroup.layergroupid + ':' + lastUpdateTime;
+            layergroup.last_updated = new Date(lastUpdateTime).toISOString();
 
             if (req.method === 'GET') {
                 var ttl = global.environment.varnish.layergroupTtl || 86400;
@@ -321,6 +325,19 @@ MapController.prototype.afterLayergroupCreate = function(req, res, mapconfig, la
     );
 };
 
+function getLastUpdatedTime(analysesResults, lastUpdateTime) {
+    if (!Array.isArray(analysesResults)) {
+        return lastUpdateTime;
+    }
+    return analysesResults.reduce(function(lastUpdateTime, analysis) {
+        return analysis.getSortedNodes().reduce(function(lastNodeUpdatedAtTime, node) {
+            var nodeUpdatedAtDate = node.getUpdatedAt();
+            var nodeUpdatedTimeAt = (nodeUpdatedAtDate && nodeUpdatedAtDate.getTime()) || 0;
+            return nodeUpdatedTimeAt > lastNodeUpdatedAtTime ? nodeUpdatedTimeAt : lastNodeUpdatedAtTime;
+        }, lastUpdateTime);
+    }, lastUpdateTime);
+}
+
 function addAnalysesMetadata(username, layergroup, analysesResults, includeQuery) {
     includeQuery = includeQuery || false;
     analysesResults = analysesResults || [];

lib/cartodb/controllers/server_info.js

@@ -1,21 +1,13 @@
-var windshaft = require('windshaft');
 var HealthCheck = require('../monitoring/health_check');
 
 var WELCOME_MSG = "This is the CartoDB Maps API, " +
     "see the documentation at http://docs.cartodb.com/cartodb-platform/maps-api.html";
 
 
-var versions = {
-    windshaft: windshaft.version,
-    grainstore: windshaft.grainstore.version(),
-    node_mapnik: windshaft.mapnik.version,
-    mapnik: windshaft.mapnik.versions.mapnik,
-    windshaft_cartodb: require('../../../package.json').version
-};
-
-function ServerInfoController() {
+function ServerInfoController(versions) {
     this.healthConfig = global.environment.health || {};
     this.healthCheck = new HealthCheck(global.environment.disabled_file);
+    this.versions = versions || {};
 }
 
 module.exports = ServerInfoController;
@@ -31,7 +23,7 @@ ServerInfoController.prototype.welcome = function(req, res) {
 };
 
 ServerInfoController.prototype.version = function(req, res) {
-    res.status(200).send(versions);
+    res.status(200).send(this.versions);
 };
 
 ServerInfoController.prototype.health = function(req, res) {

lib/cartodb/models/dataview/aggregation.js

@@ -54,7 +54,10 @@ var CATEGORIES_LIMIT = 6;
 
 var VALID_OPERATIONS = {
     count: [],
-    sum: ['aggregationColumn']
+    sum: ['aggregationColumn'],
+    avg: ['aggregationColumn'],
+    min: ['aggregationColumn'],
+    max: ['aggregationColumn']
 };
 
 var TYPE = 'aggregation';
@@ -198,6 +201,7 @@ Aggregation.prototype.format = function(result) {
     }
 
     return {
+        aggregation: this.aggregation,
         count: count,
         nulls: nulls,
         min: minValue,

lib/cartodb/models/dataview/histogram.js

@@ -174,8 +174,8 @@ Histogram.prototype.sql = function(psql, override, callback) {
         basicsQuery = overrideBasicsQueryTpl({
             _query: _query,
             _column: _column,
-            _start: override.start,
-            _end: override.end
+            _start: getBinStart(override),
+            _end: getBinEnd(override)
         });
 
         binsQuery = [
@@ -248,7 +248,7 @@ Histogram.prototype.format = function(result, override) {
         width = firstRow.bin_width || width;
         avg = firstRow.avg_val;
         nulls = firstRow.nulls_count;
-        binsStart = override.hasOwnProperty('start') ? override.start : firstRow.min;
+        binsStart = override.hasOwnProperty('start') ? getBinStart(override) : firstRow.min;
 
         buckets = result.rows.map(function(row) {
             return _.omit(row, 'bins_number', 'bin_width', 'nulls_count', 'avg_val');
@@ -266,9 +266,19 @@ Histogram.prototype.format = function(result, override) {
 };
 
 function getBinStart(override) {
+    if (override.hasOwnProperty('start') && override.hasOwnProperty('end')) {
+        return Math.min(override.start, override.end);
+    }
     return override.start || 0;
 }
 
+function getBinEnd(override) {
+    if (override.hasOwnProperty('start') && override.hasOwnProperty('end')) {
+        return Math.max(override.start, override.end);
+    }
+    return override.end || 0;
+}
+
 function getBinsCount(override) {
     return override.bins || 0;
 }

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

@@ -59,7 +59,19 @@ AnalysisMapConfigAdapter.prototype.getMapConfig = function(user, requestMapConfi
     requestMapConfig = appendFiltersToNodes(requestMapConfig, dataviewsFiltersBySourceId);
 
     function createAnalysis(analysisDefinition, done) {
-        self.analysisBackend.create(analysisConfiguration, analysisDefinition, done);
+        self.analysisBackend.create(analysisConfiguration, analysisDefinition, function (err, analysis) {
+            if (err) {
+                var error = new Error(err.message);
+                error.type = 'analysis';
+                error.analysis = {
+                    id: analysisDefinition.id,
+                    type: analysisDefinition.type
+                };
+                return done(error);
+            }
+
+            done(null, analysis);
+        });
     }
 
     var analysesQueue = queue(requestMapConfig.analyses.length);
@@ -78,7 +90,7 @@ AnalysisMapConfigAdapter.prototype.getMapConfig = function(user, requestMapConfi
                 sourceId2Query[rootNode.params.id] = rootNode;
             }
 
-            analysis.getSortedNodes().forEach(function(node) {
+            analysis.getNodes().forEach(function(node) {
                 if (node.params && node.params.id) {
                     sourceId2Query[node.params.id] = node;
                 }
@@ -101,10 +113,7 @@ AnalysisMapConfigAdapter.prototype.getMapConfig = function(user, requestMapConfi
                         analysisSql = sqlQueryWrap.replace(/<%=\s*sql\s*%>/g, analysisSql);
                     }
                     layer.options.sql = analysisSql;
-                    var layerDataviews = getLayerDataviews(layer, dataviews);
-                    layer.options.columns = layerDataviews.reduce(function(columns, dataview) {
-                        return columns.concat(getDataviewColumns(dataview));
-                    }, []);
+                    layer.options.columns = getDataviewsColumns(getLayerDataviews(layer, dataviews));
                 } else {
                     missingNodesErrors.push(
                         new Error('Missing analysis node.id="' + layerSourceId +'" for layer='+layerIndex)
@@ -114,10 +123,12 @@ AnalysisMapConfigAdapter.prototype.getMapConfig = function(user, requestMapConfi
             return layer;
         });
 
+
         debug('mapconfig output', JSON.stringify(requestMapConfig, null, 4));
 
-        if (missingNodesErrors.length > 0) {
-            return callback(missingNodesErrors);
+        var missingDataviewsNodesErrors = getMissingDataviewsSourceIds(dataviews, sourceId2Node);
+        if (missingNodesErrors.length > 0 || missingDataviewsNodesErrors.length > 0) {
+            return callback(missingNodesErrors.concat(missingDataviewsNodesErrors));
         }
 
         context.analysesResults = analysesResults;
@@ -166,8 +177,9 @@ function appendFiltersToNodes(requestMapConfig, dataviewsFiltersBySourceId) {
 }
 
 function shouldAdaptLayers(requestMapConfig) {
-    return Array.isArray(requestMapConfig.layers) &&
-        Array.isArray(requestMapConfig.analyses) && requestMapConfig.analyses.length > 0;
+    return Array.isArray(requestMapConfig.layers) && requestMapConfig.layers.some(getLayerSourceId) ||
+        (Array.isArray(requestMapConfig.analyses) && requestMapConfig.analyses.length > 0) ||
+        requestMapConfig.dataviews;
 }
 
 var DATAVIEW_TYPE_2_FILTER_TYPE = {
@@ -208,11 +220,22 @@ function getLayerDataviews(layer, dataviews) {
     return layerDataviews;
 }
 
+function getDataviewsColumns(dataviews) {
+    return Object.keys(dataviews.reduce(function(columnsDict, dataview) {
+        getDataviewColumns(dataview).forEach(function(columnName) {
+            if (!!columnName) {
+                columnsDict[columnName] = true;
+            }
+        });
+        return columnsDict;
+    }, {}));
+}
+
 function getDataviewColumns(dataview) {
     var columns = [];
     var options = dataview.options;
     ['column', 'aggregationColumn'].forEach(function(opt) {
-        if (options.hasOwnProperty(opt)) {
+        if (options.hasOwnProperty(opt) && !!options[opt]) {
             columns.push(options[opt]);
         }
     });
@@ -224,6 +247,15 @@ function getDataviewsList(dataviews) {
 }
 
 function getDataviewsErrors(dataviews) {
+    var dataviewType = typeof dataviews;
+    if (dataviewType !== 'object') {
+        return [new Error('"dataviews" must be a valid JSON object: "' + dataviewType + '" type found')];
+    }
+
+    if (Array.isArray(dataviews)) {
+        return [new Error('"dataviews" must be a valid JSON object: "array" type found')];
+    }
+
     var errors = [];
 
     Object.keys(dataviews).forEach(function(dataviewName) {
@@ -239,3 +271,26 @@ function getDataviewsErrors(dataviews) {
 
     return errors;
 }
+
+function getMissingDataviewsSourceIds(dataviews, sourceId2Node) {
+    var missingDataviewsSourceIds = [];
+    Object.keys(dataviews).forEach(function(dataviewName) {
+        var dataview = dataviews[dataviewName];
+        var dataviewSourceId = getDataviewSourceId(dataview);
+        if (!sourceId2Node.hasOwnProperty(dataviewSourceId)) {
+            missingDataviewsSourceIds.push(new AnalysisError('Node with `source.id="' + dataviewSourceId +'"`' +
+                ' not found in analyses for dataview "' + dataviewName + '"'));
+        }
+    });
+
+    return missingDataviewsSourceIds;
+}
+
+function AnalysisError(message) {
+    Error.captureStackTrace(this, this.constructor);
+    this.name = this.constructor.name;
+    this.type = 'analysis';
+    this.message = message;
+}
+
+require('util').inherits(AnalysisError, Error);

lib/cartodb/models/mapconfig/adapter/dataviews-widgets-adapter.js

@@ -15,6 +15,15 @@ DataviewsWidgetsMapConfigAdapter.prototype.getMapConfig = function(user, request
 
     requestMapConfig.layers.forEach(function(layer, index) {
         var layerSourceId = getLayerSourceId(layer);
+
+        if (!layer.options.widgets) {
+            return;
+        }
+
+        if (!layerSourceId && !layer.options.sql) {
+            return;
+        }
+
         var dataviewSourceId = layerSourceId || 'cdb-layer-source-' + index;
         // Append a new analysis if layer has no source id but sql.
         if (!layerSourceId) {
@@ -29,7 +38,7 @@ DataviewsWidgetsMapConfigAdapter.prototype.getMapConfig = function(user, request
             );
         }
         var source = { id: dataviewSourceId };
-        var layerWidgets = layer.options.widgets;
+        var layerWidgets = layer.options.widgets || {};
         Object.keys(layerWidgets).forEach(function(widgetId) {
             var dataview = layerWidgets[widgetId];
             requestMapConfig.dataviews[widgetId] = {
@@ -67,7 +76,6 @@ DataviewsWidgetsMapConfigAdapter.prototype.getMapConfig = function(user, request
 };
 
 function shouldAdapt(requestMapConfig) {
-//    return false;
     return Array.isArray(requestMapConfig.layers) && requestMapConfig.layers.some(function hasWidgets(layer) {
         return layer.options && layer.options.widgets && Object.keys(layer.options.widgets).length > 0;
     });

lib/cartodb/models/mapconfig/adapter/turbo-carto-adapter.js

@@ -3,10 +3,15 @@
 var dot = require('dot');
 dot.templateSettings.strip = false;
 var queue = require('queue-async');
-var SubstitutionTokens = require('../../../utils/substitution-tokens');
+var PSQL = require('cartodb-psql');
+var turboCarto = require('turbo-carto');
 
-function TurboCartoAdapter(turboCartoParser) {
-    this.turboCartoParser = turboCartoParser;
+var SubstitutionTokens = require('../../../utils/substitution-tokens');
+var PostgresDatasource = require('../../../backends/turbo-carto-postgres-datasource');
+
+var MapConfig = require('windshaft').model.MapConfig;
+
+function TurboCartoAdapter() {
 }
 
 module.exports = TurboCartoAdapter;
@@ -22,8 +27,9 @@ TurboCartoAdapter.prototype.getMapConfig = function (user, requestMapConfig, par
 
     var parseCartoQueue = queue(layers.length);
 
-    layers.forEach(function(layer) {
-        parseCartoQueue.defer(self._parseCartoCss.bind(self), user, layer);
+    layers.forEach(function(layer, index) {
+        var layerId = MapConfig.getLayerId(requestMapConfig, index);
+        parseCartoQueue.defer(self._parseCartoCss.bind(self), user, params, layer, index, layerId);
     });
 
     parseCartoQueue.awaitAll(function (err, layers) {
@@ -37,25 +43,89 @@ TurboCartoAdapter.prototype.getMapConfig = function (user, requestMapConfig, par
     });
 };
 
-var bboxTemplate = dot.template('(select ST_SetSRID(st_extent(the_geom_webmercator), 3857) from ({{=it._sql}}) __c)');
-var zoomTemplate = dot.template([
-    'GREATEST(',
-    'ceil(log(40075017000 / 256 / GREATEST(',
-    '  st_xmax({{=it._bbox}}) - st_xmin({{=it._bbox}}),',
-    '  st_ymax({{=it._bbox}}) - st_ymin({{=it._bbox}})',
-    '))/log(2)),',
-    '0',
-    ')'
+var tokensQueryTpl = dot.template([
+    'WITH input_query AS (',
+    '  {{=it._sql}}',
+    '),',
+    'bbox_query AS (',
+    '  SELECT ST_SetSRID(ST_Extent(the_geom_webmercator), 3857) as bbox from input_query',
+    '),',
+    'zoom_query as (',
+    '  SELECT GREATEST(',
+    '  ceil(log(40075017000 / 256 / GREATEST(ST_XMax(bbox) - ST_XMin(bbox), ST_YMax(bbox) - ST_YMin(bbox)))/log(2)),',
+    '  0) as zoom',
+    '  FROM bbox_query',
+    '),',
+    'pixel_size_query as (',
+    '  SELECT 40075017 * cos(radians(ST_Y(ST_Transform(ST_Centroid(bbox), 4326)))) / 2 ^ ((zoom) + 8) as pixel_size',
+    '  FROM bbox_query, zoom_query',
+    '),',
+    'scale_denominator_query as (',
+    '  SELECT (pixel_size / 0.00028)::numeric as scale_denominator',
+    '  FROM pixel_size_query',
+    ')',
+    'select ST_AsText(bbox) bbox, pixel_size, scale_denominator, zoom',
+    'from bbox_query, pixel_size_query, scale_denominator_query, zoom_query'
 ].join('\n'));
-var pixelSizeTemplate = dot.template('40075017 * cos(ST_Y(ST_Centroid({{=it._bbox}}))) / 2 ^ (({{=it._zoom}}) + 8)');
-var scaleDenominatorTemplate = dot.template('({{=it._pixelSize}} / 0.00028)::numeric');
 
-
-TurboCartoAdapter.prototype._parseCartoCss = function (username, layer, callback) {
+TurboCartoAdapter.prototype._parseCartoCss = function (username, params, layer, layerIndex, layerId, callback) {
     if (!shouldParseLayerCartocss(layer)) {
         return callback(null, layer);
     }
 
+    var pg = new PSQL(dbParamsFromReqParams(params));
+    function processCallback(err, cartocss) {
+        // Only return turbo-carto errors
+        if (err && err.name === 'TurboCartoError') {
+            var error = new Error('turbo-carto: ' + err.message);
+            error.http_status = 400;
+            error.type = 'layer';
+            error.subtype = 'turbo-carto';
+            error.layer = {
+                id: layerId,
+                index: layerIndex,
+                type: layer.type,
+                context: err.context
+            };
+
+            return callback(error);
+        }
+
+        // Try to continue in the rest of the cases
+        if (cartocss) {
+            layer.options.cartocss = cartocss;
+        }
+        return callback(null, layer);
+    }
+
+    var layerSql = layer.options.sql;
+    var layerRawSql = layer.options.sql_raw;
+    if (SubstitutionTokens.hasTokens(layerSql) && layerRawSql) {
+        var self = this;
+        var tokensQuery = tokensQueryTpl({_sql: layerRawSql});
+        return pg.query(tokensQuery, function(err, resultSet) {
+            if (err) {
+                var error = new Error('turbo-carto: ' + err.message);
+                error.type = 'turbo-carto';
+                return callback(error);
+            }
+
+            resultSet = resultSet || {};
+            var rows = resultSet.rows || [];
+            var result = rows[0] || {};
+
+            var tokens = {
+                bbox: 'ST_SetSRID(ST_GeomFromText(\'' + result.bbox + '\'), 3857)',
+                scale_denominator: result.scale_denominator,
+                pixel_width: result.pixel_size,
+                pixel_height: result.pixel_size
+            };
+
+            var sql = SubstitutionTokens.replace(layerSql, tokens);
+            self.process(pg, layer.options.cartocss, sql, processCallback);
+        }, true); // use read-only transaction
+    }
+
     var tokens = {
         bbox: 'ST_MakeEnvelope(-20037508.34,-20037508.34,20037508.34,20037508.34,3857)',
         scale_denominator: '500000001',
@@ -63,40 +133,35 @@ TurboCartoAdapter.prototype._parseCartoCss = function (username, layer, callback
         pixel_height: '156412'
     };
 
-    var layerSql = layer.options.sql;
-    var layerRawSql = layer.options.sql_raw;
-    if (SubstitutionTokens.hasTokens(layerSql) && layerRawSql) {
-        var bbox = bboxTemplate({ _sql: layerRawSql });
-        var zoom = zoomTemplate({ _bbox: bbox });
-        var pixelSize = pixelSizeTemplate({ _bbox: bbox, _zoom: zoom });
-        var scaleDenominator = scaleDenominatorTemplate({ _pixelSize: pixelSize });
-
-        tokens = {
-            bbox: bbox,
-            scale_denominator: scaleDenominator,
-            pixel_width: pixelSize,
-            pixel_height: pixelSize
-        };
-    }
-
     var sql = SubstitutionTokens.replace(layerSql, tokens);
+    this.process(pg, layer.options.cartocss, sql, processCallback);
+};
 
-    this.turboCartoParser.process(username, layer.options.cartocss, sql, function (err, cartocss) {
-        // Only return turbo-carto errors
-        if (err && err.name === 'TurboCartoError') {
-            err = new Error('turbo-carto: ' + err.message);
-            err.http_status = 400;
-            return callback(err);
-        }
-
-        // Try to continue in the rest of the cases
-        if (cartocss) {
-            layer.options.cartocss = cartocss;
-        }
-        return callback(null, layer);
-    });
+TurboCartoAdapter.prototype.process = function (psql, cartocss, sql, callback) {
+    var datasource = new PostgresDatasource(psql, sql);
+    turboCarto(cartocss, datasource, callback);
 };
 
 function shouldParseLayerCartocss(layer) {
     return layer && layer.options && layer.options.cartocss && layer.options.sql;
 }
+
+function dbParamsFromReqParams(params) {
+    var dbParams = {};
+    if ( params.dbuser ) {
+        dbParams.user = params.dbuser;
+    }
+    if ( params.dbpassword ) {
+        dbParams.pass = params.dbpassword;
+    }
+    if ( params.dbhost ) {
+        dbParams.host = params.dbhost;
+    }
+    if ( params.dbport ) {
+        dbParams.port = params.dbport;
+    }
+    if ( params.dbname ) {
+        dbParams.dbname = params.dbname;
+    }
+    return dbParams;
+}

lib/cartodb/models/mapconfig/provider/named-map-provider.js

@@ -95,6 +95,7 @@ NamedMapMapConfigProvider.prototype.getMapConfig = function(callback) {
         function prepareAdapterMapConfig(err, requestMapConfig) {
             assert.ifError(err);
             context.analysisConfiguration = {
+                user: self.owner,
                 db: {
                     host: rendererParams.dbhost,
                     port: rendererParams.dbport,

lib/cartodb/server.js

@@ -3,7 +3,6 @@ var bodyParser = require('body-parser');
 var RedisPool = require('redis-mpool');
 var cartodbRedis = require('cartodb-redis');
 var _ = require('underscore');
-var debug = require('debug')('windshaft:cartodb');
 
 var controller = require('./controllers');
 
@@ -34,8 +33,6 @@ var AnalysisBackend = require('./backends/analysis');
 var timeoutErrorTilePath = __dirname + '/../../assets/render-timeout-fallback.png';
 var timeoutErrorTile = require('fs').readFileSync(timeoutErrorTilePath, {encoding: null});
 
-var TurboCartoParser = require('./utils/style/turbo-carto-parser');
-
 var SqlWrapMapConfigAdapter = require('./models/mapconfig/adapter/sql-wrap-mapconfig-adapter');
 var MapConfigNamedLayersAdapter = require('./models/mapconfig/adapter/mapconfig-named-layers-adapter');
 var AnalysisMapConfigAdapter = require('./models/mapconfig/adapter/analysis-mapconfig-adapter');
@@ -155,15 +152,13 @@ module.exports = function(serverOptions) {
     var layergroupAffectedTablesCache = new LayergroupAffectedTablesCache();
     app.layergroupAffectedTablesCache = layergroupAffectedTablesCache;
 
-    var turboCartoParser = new TurboCartoParser(pgQueryRunner);
-
     var mapConfigAdapter = new MapConfigAdapter(
         new MapConfigNamedLayersAdapter(templateMaps, pgConnection),
         new SqlWrapMapConfigAdapter(),
         new DataviewsWidgetsAdapter(),
         new AnalysisMapConfigAdapter(analysisBackend),
         new MapConfigOverviewsAdapter(overviewsMetadataApi, filterStatsApi),
-        new TurboCartoAdapter(turboCartoParser)
+        new TurboCartoAdapter()
     );
 
     var namedMapProviderCache = new NamedMapProviderCache(
@@ -183,6 +178,8 @@ module.exports = function(serverOptions) {
     var TablesExtentApi = require('./api/tables_extent_api');
     var tablesExtentApi = new TablesExtentApi(pgQueryRunner);
 
+    var versions = getAndValidateVersions(serverOptions);
+
     /*******************************************************************************************************************
      * Routing
      ******************************************************************************************************************/
@@ -225,7 +222,7 @@ module.exports = function(serverOptions) {
 
     new controller.NamedMapsAdmin(authApi, pgConnection, templateMaps).register(app);
 
-    new controller.ServerInfo().register(app);
+    new controller.ServerInfo(versions).register(app);
 
     /*******************************************************************************************************************
      * END Routing
@@ -238,12 +235,45 @@ function validateOptions(opts) {
     if (!_.isString(opts.base_url) || !_.isString(opts.base_url_mapconfig) || !_.isString(opts.base_url_templated)) {
         throw new Error("Must initialise server with: 'base_url'/'base_url_mapconfig'/'base_url_templated' URLs");
     }
+}
 
-    // Be nice and warn if configured mapnik version is != instaled mapnik version
-    if (mapnik.versions.mapnik !== opts.grainstore.mapnik_version) {
-        debug('WARNING: detected mapnik version (' + mapnik.versions.mapnik + ')' +
-            ' != configured mapnik version (' + opts.grainstore.mapnik_version + ')');
+function getAndValidateVersions(options) {
+    // jshint undef:false
+    var warn = console.warn.bind(console);
+    // jshint undef:true
+
+    var packageDefinition = require('../../package.json');
+
+    var declaredDependencies = packageDefinition.dependencies || {};
+    var installedDependenciesVersions = {
+        camshaft: require('camshaft').version,
+        grainstore: windshaft.grainstore.version(),
+        mapnik: windshaft.mapnik.versions.mapnik,
+        node_mapnik: windshaft.mapnik.version,
+        'turbo-carto': require('turbo-carto').version,
+        windshaft: windshaft.version,
+        windshaft_cartodb: packageDefinition.version
+    };
+
+    var dependenciesToValidate = ['camshaft', 'turbo-carto', 'windshaft'];
+    dependenciesToValidate.forEach(function(depName) {
+        var declaredDependencyVersion = declaredDependencies[depName];
+        var installedDependencyVersion = installedDependenciesVersions[depName];
+        if (declaredDependencyVersion !== installedDependencyVersion) {
+            warn(
+                'Dependency="%s" installed version="%s" does not match declared version="%s". Check your installation.',
+                depName, installedDependencyVersion, declaredDependencyVersion
+            );
+        }
+    });
+
+    // Be nice and warn if configured mapnik version is != installed mapnik version
+    if (mapnik.versions.mapnik !== options.grainstore.mapnik_version) {
+        warn('WARNING: detected mapnik version (' + mapnik.versions.mapnik + ')' +
+            ' != configured mapnik version (' + options.grainstore.mapnik_version + ')');
     }
+
+    return installedDependenciesVersions;
 }
 
 function bootstrapFonts(opts) {

lib/cartodb/utils/style/turbo-carto-parser.js

@@ -1,15 +0,0 @@
-'use strict';
-
-var turboCarto = require('turbo-carto');
-var PostgresDatasource = require('./postgres-datasource');
-
-function TurboCartoParser (pgQueryRunner) {
-    this.pgQueryRunner = pgQueryRunner;
-}
-
-module.exports = TurboCartoParser;
-
-TurboCartoParser.prototype.process = function (username, cartocss, sql, callback) {
-    var datasource = new PostgresDatasource(this.pgQueryRunner, username, sql);
-    turboCarto(cartocss, datasource, callback);
-};

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "2.45.0",
+  "version": "2.55.0",
   "dependencies": {
     "body-parser": {
       "version": "1.14.2",
@@ -62,14 +62,14 @@
           "resolved": "https://registry.npmjs.org/qs/-/qs-5.2.0.tgz"
         },
         "raw-body": {
-          "version": "2.1.6",
+          "version": "2.1.7",
           "from": "raw-body@>=2.1.5 <2.2.0",
-          "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.1.6.tgz",
+          "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz",
           "dependencies": {
             "bytes": {
-              "version": "2.3.0",
-              "from": "bytes@2.3.0",
-              "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.3.0.tgz"
+              "version": "2.4.0",
+              "from": "bytes@2.4.0",
+              "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz"
             },
             "unpipe": {
               "version": "1.0.0",
@@ -90,7 +90,7 @@
             },
             "mime-types": {
               "version": "2.1.11",
-              "from": "mime-types@>=2.1.11 <2.2.0",
+              "from": "mime-types@>=2.1.2 <2.2.0",
               "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz",
               "dependencies": {
                 "mime-db": {
@@ -105,9 +105,9 @@
       }
     },
     "camshaft": {
-      "version": "0.12.1",
-      "from": "camshaft@0.12.1",
-      "resolved": "https://registry.npmjs.org/camshaft/-/camshaft-0.12.1.tgz",
+      "version": "0.26.0",
+      "from": "camshaft@0.26.0",
+      "resolved": "https://registry.npmjs.org/camshaft/-/camshaft-0.26.0.tgz",
       "dependencies": {
         "async": {
           "version": "1.5.2",
@@ -354,9 +354,9 @@
                   "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"
                 },
                 "jsprim": {
-                  "version": "1.2.2",
+                  "version": "1.3.0",
                   "from": "jsprim@>=1.2.2 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.2.2.tgz",
+                  "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.3.0.tgz",
                   "dependencies": {
                     "extsprintf": {
                       "version": "1.0.2",
@@ -584,7 +584,7 @@
           "dependencies": {
             "mime-types": {
               "version": "2.1.11",
-              "from": "mime-types@>=2.1.6 <2.2.0",
+              "from": "mime-types@>=2.1.11 <2.2.0",
               "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz",
               "dependencies": {
                 "mime-db": {
@@ -648,7 +648,7 @@
           "dependencies": {
             "unpipe": {
               "version": "1.0.0",
-              "from": "unpipe@1.0.0",
+              "from": "unpipe@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"
             }
           }
@@ -814,7 +814,7 @@
             },
             "mime-types": {
               "version": "2.1.11",
-              "from": "mime-types@>=2.1.6 <2.2.0",
+              "from": "mime-types@>=2.1.11 <2.2.0",
               "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz",
               "dependencies": {
                 "mime-db": {
@@ -1017,7 +1017,7 @@
           "dependencies": {
             "async": {
               "version": "1.5.2",
-              "from": "async@>=1.5.2 <2.0.0",
+              "from": "async@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz"
             }
           }
@@ -1029,7 +1029,7 @@
         },
         "mime-types": {
           "version": "2.1.11",
-          "from": "mime-types@>=2.1.11 <2.2.0",
+          "from": "mime-types@>=2.1.2 <2.2.0",
           "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz",
           "dependencies": {
             "mime-db": {
@@ -1257,9 +1257,9 @@
       "resolved": "https://registry.npmjs.org/step-profiler/-/step-profiler-0.3.0.tgz"
     },
     "turbo-carto": {
-      "version": "0.10.1",
-      "from": "turbo-carto@0.10.1",
-      "resolved": "https://registry.npmjs.org/turbo-carto/-/turbo-carto-0.10.1.tgz",
+      "version": "0.12.1",
+      "from": "turbo-carto@0.12.1",
+      "resolved": "https://registry.npmjs.org/turbo-carto/-/turbo-carto-0.12.1.tgz",
       "dependencies": {
         "colorbrewer": {
           "version": "1.0.0",
@@ -1318,9 +1318,9 @@
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
     },
     "windshaft": {
-      "version": "2.0.1",
-      "from": "windshaft@2.0.1",
-      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-2.0.1.tgz",
+      "version": "2.4.0",
+      "from": "windshaft@2.4.0",
+      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-2.4.0.tgz",
       "dependencies": {
         "abaculus": {
           "version": "1.1.0-cdb5",
@@ -1369,9 +1369,9 @@
           }
         },
         "grainstore": {
-          "version": "1.1.1",
-          "from": "grainstore@1.1.1",
-          "resolved": "https://registry.npmjs.org/grainstore/-/grainstore-1.1.1.tgz",
+          "version": "1.2.0",
+          "from": "grainstore@1.2.0",
+          "resolved": "https://registry.npmjs.org/grainstore/-/grainstore-1.2.0.tgz",
           "dependencies": {
             "carto": {
               "version": "0.9.5-cdb2",
@@ -3026,11 +3026,6 @@
                       "from": "block-stream@*",
                       "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz"
                     },
-                    "boom": {
-                      "version": "2.10.1",
-                      "from": "boom@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
-                    },
                     "brace-expansion": {
                       "version": "1.1.4",
                       "from": "brace-expansion@>=1.0.0 <2.0.0",
@@ -3046,16 +3041,16 @@
                       "from": "chalk@>=1.1.1 <2.0.0",
                       "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"
                     },
+                    "boom": {
+                      "version": "2.10.1",
+                      "from": "boom@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
+                    },
                     "combined-stream": {
                       "version": "1.0.5",
                       "from": "combined-stream@>=1.0.5 <1.1.0",
                       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"
                     },
-                    "commander": {
-                      "version": "2.9.0",
-                      "from": "commander@>=2.9.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"
-                    },
                     "concat-map": {
                       "version": "0.0.1",
                       "from": "concat-map@0.0.1",
@@ -3071,6 +3066,11 @@
                       "from": "cryptiles@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
                     },
+                    "commander": {
+                      "version": "2.9.0",
+                      "from": "commander@>=2.9.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"
+                    },
                     "debug": {
                       "version": "2.2.0",
                       "from": "debug@>=2.2.0 <2.3.0",
@@ -3086,16 +3086,16 @@
                       "from": "delayed-stream@>=1.0.0 <1.1.0",
                       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
                     },
-                    "delegates": {
-                      "version": "1.0.0",
-                      "from": "delegates@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"
-                    },
                     "ecc-jsbn": {
                       "version": "0.1.1",
                       "from": "ecc-jsbn@>=0.1.1 <0.2.0",
                       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"
                     },
+                    "delegates": {
+                      "version": "1.0.0",
+                      "from": "delegates@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"
+                    },
                     "escape-string-regexp": {
                       "version": "1.0.5",
                       "from": "escape-string-regexp@>=1.0.2 <2.0.0",
@@ -3151,6 +3151,11 @@
                       "from": "glob@>=7.0.0 <8.0.0",
                       "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.3.tgz"
                     },
+                    "graceful-fs": {
+                      "version": "4.1.4",
+                      "from": "graceful-fs@>=4.1.2 <5.0.0",
+                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.4.tgz"
+                    },
                     "graceful-readlink": {
                       "version": "1.0.1",
                       "from": "graceful-readlink@>=1.0.0",
@@ -3161,11 +3166,6 @@
                       "from": "har-validator@>=2.0.6 <2.1.0",
                       "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz"
                     },
-                    "graceful-fs": {
-                      "version": "4.1.4",
-                      "from": "graceful-fs@>=4.1.2 <5.0.0",
-                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.4.tgz"
-                    },
                     "has-ansi": {
                       "version": "2.0.0",
                       "from": "has-ansi@>=2.0.0 <3.0.0",
@@ -3186,16 +3186,16 @@
                       "from": "hoek@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
                     },
-                    "inflight": {
-                      "version": "1.0.4",
-                      "from": "inflight@>=1.0.4 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz"
-                    },
                     "http-signature": {
                       "version": "1.1.1",
                       "from": "http-signature@>=1.1.0 <1.2.0",
                       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"
                     },
+                    "inflight": {
+                      "version": "1.0.4",
+                      "from": "inflight@>=1.0.4 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz"
+                    },
                     "inherits": {
                       "version": "2.0.1",
                       "from": "inherits@>=2.0.1 <2.1.0",
@@ -3216,16 +3216,16 @@
                       "from": "is-property@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
                     },
-                    "is-typedarray": {
-                      "version": "1.0.0",
-                      "from": "is-typedarray@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"
-                    },
                     "isarray": {
                       "version": "1.0.0",
                       "from": "isarray@>=1.0.0 <1.1.0",
                       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
                     },
+                    "is-typedarray": {
+                      "version": "1.0.0",
+                      "from": "is-typedarray@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"
+                    },
                     "isstream": {
                       "version": "0.1.2",
                       "from": "isstream@>=0.1.2 <0.2.0",
@@ -3236,16 +3236,16 @@
                       "from": "jodid25519@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"
                     },
-                    "jsbn": {
-                      "version": "0.1.0",
-                      "from": "jsbn@>=0.1.0 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"
-                    },
                     "json-schema": {
                       "version": "0.2.2",
                       "from": "json-schema@0.2.2",
                       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"
                     },
+                    "jsbn": {
+                      "version": "0.1.0",
+                      "from": "jsbn@>=0.1.0 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"
+                    },
                     "json-stringify-safe": {
                       "version": "5.0.1",
                       "from": "json-stringify-safe@>=5.0.1 <5.1.0",
@@ -3456,15 +3456,27 @@
                       "from": "verror@1.3.6",
                       "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"
                     },
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    },
                     "xtend": {
                       "version": "4.0.1",
                       "from": "xtend@>=4.0.0 <5.0.0",
                       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
                     },
-                    "wrappy": {
-                      "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    "dashdash": {
+                      "version": "1.13.1",
+                      "from": "dashdash@>=1.12.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.13.1.tgz",
+                      "dependencies": {
+                        "assert-plus": {
+                          "version": "1.0.0",
+                          "from": "assert-plus@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
+                        }
+                      }
                     },
                     "bl": {
                       "version": "1.1.2",
@@ -3490,10 +3502,10 @@
                         }
                       }
                     },
-                    "dashdash": {
-                      "version": "1.13.1",
-                      "from": "dashdash@>=1.12.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.13.1.tgz",
+                    "sshpk": {
+                      "version": "1.8.3",
+                      "from": "sshpk@>=1.7.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.8.3.tgz",
                       "dependencies": {
                         "assert-plus": {
                           "version": "1.0.0",
@@ -3514,18 +3526,6 @@
                         }
                       }
                     },
-                    "sshpk": {
-                      "version": "1.8.3",
-                      "from": "sshpk@>=1.7.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.8.3.tgz",
-                      "dependencies": {
-                        "assert-plus": {
-                          "version": "1.0.0",
-                          "from": "assert-plus@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
-                        }
-                      }
-                    },
                     "tar-pack": {
                       "version": "3.1.3",
                       "from": "tar-pack@>=3.1.0 <3.2.0",

package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "windshaft-cartodb",
-  "version": "2.45.0",
+  "version": "2.55.0",
   "description": "A map tile server for CartoDB",
   "keywords": [
     "cartodb"
@@ -20,7 +20,7 @@
   ],
   "dependencies": {
     "body-parser": "~1.14.0",
-    "camshaft": "0.12.1",
+    "camshaft": "0.26.0",
     "cartodb-psql": "~0.6.1",
     "cartodb-query-tables": "~0.1.0",
     "cartodb-redis": "~0.13.0",
@@ -37,9 +37,9 @@
     "request": "~2.62.0",
     "step": "~0.0.6",
     "step-profiler": "~0.3.0",
-    "turbo-carto": "0.10.1",
+    "turbo-carto": "0.12.1",
     "underscore": "~1.6.0",
-    "windshaft": "2.0.1"
+    "windshaft": "2.4.0"
   },
   "devDependencies": {
     "istanbul": "~0.4.3",

test/acceptance/analysis/error-cases.js

@@ -20,6 +20,13 @@ describe('analysis-layers error cases', function() {
         }
     };
 
+    var AUTH_ERROR_RESPONSE = {
+        status: 403,
+        headers: {
+            'Content-Type': 'application/json; charset=utf-8'
+        }
+    };
+
     it('should handle missing analysis nodes for layers', function(done) {
         var mapConfig = createMapConfig(
             [
@@ -64,4 +71,198 @@ describe('analysis-layers error cases', function() {
             testClient.drain(done);
         });
     });
+
+    it('should handle missing analyses when layers point to nonexistent one', function(done) {
+        var mapConfig = createMapConfig(
+            [
+                {
+                    "type": "http",
+                    "options": {
+                        "urlTemplate": "http://{s}.basemaps.cartocdn.com/light_only_labels/{z}/{x}/{y}.png",
+                        "subdomains": "abcd"
+                    }
+                },
+                {
+                    "type": "cartodb",
+                    "options": {
+                        "source": {
+                            "id": "ID-FOR-NONEXISTENT-ANALYSIS"
+                        },
+                        "cartocss": '#polygons { polygon-fill: red; }',
+                        "cartocss_version": "2.3.0"
+                    }
+                }
+            ]
+        );
+
+        var testClient = new TestClient(mapConfig, 1234);
+
+        testClient.getLayergroup(ERROR_RESPONSE, function(err, layergroupResult) {
+            assert.ok(!err, err);
+
+            assert.equal(layergroupResult.errors.length, 1);
+            assert.equal(
+                layergroupResult.errors[0],
+                'Missing analysis node.id="ID-FOR-NONEXISTENT-ANALYSIS" for layer=1'
+            );
+
+            testClient.drain(done);
+        });
+    });
+
+    it('should handle missing analyses when dataviews point to nonexistent one', function(done) {
+        var mapConfig = createMapConfig(
+            [
+                {
+                    "type": "http",
+                    "options": {
+                        "urlTemplate": "http://{s}.basemaps.cartocdn.com/light_only_labels/{z}/{x}/{y}.png",
+                        "subdomains": "abcd"
+                    }
+                },
+                {
+                    "type": "cartodb",
+                    "options": {
+                        "sql": "select * from populated_places_simple_reduced",
+                        "cartocss": '#polygons { polygon-fill: red; }',
+                        "cartocss_version": "2.3.0"
+                    }
+                }
+            ],
+            {
+                pop_max_histogram: {
+                    source: {
+                        id: 'ID-FOR-NONEXISTENT-ANALYSIS'
+                    },
+                    type: 'histogram',
+                    options: {
+                        column: 'pop_max'
+                    }
+                }
+            }
+        );
+
+        var testClient = new TestClient(mapConfig, 1234);
+
+        testClient.getLayergroup(ERROR_RESPONSE, function(err, layergroupResult) {
+            assert.ok(!err, err);
+
+            assert.equal(layergroupResult.errors.length, 1);
+            assert.equal(layergroupResult.errors[0], 'Node with `source.id="ID-FOR-NONEXISTENT-ANALYSIS"`' +
+                ' not found in analyses for dataview "pop_max_histogram"');
+
+            testClient.drain(done);
+        });
+    });
+
+    it('camshaft: should return error missing analysis nodes for layers with some context', function(done) {
+        var mapConfig = createMapConfig(
+            [
+                {
+                    "type": "cartodb",
+                    "options": {
+                        "source": {
+                            "id": "HEAD"
+                        },
+                        "cartocss": '#polygons { polygon-fill: red; }',
+                        "cartocss_version": "2.3.0"
+                    }
+                }
+            ],
+            {},
+            [
+                {
+                    "id": "HEAD",
+                    "type": "buffer",
+                    "params": {
+                        "source": {
+                            "id": "HEAD",
+                            "type": "source",
+                            "params": {
+                                "query": "select * from populated_places_simple_reduced"
+                            }
+                        },
+                        "radius": 50000
+                    }
+                }
+            ]
+        );
+
+        var testClient = new TestClient(mapConfig, 11111);
+
+        testClient.getLayergroup(AUTH_ERROR_RESPONSE, function(err, layergroupResult) {
+            assert.ok(!err, err);
+
+            assert.equal(layergroupResult.errors.length, 1);
+            assert.equal(
+                layergroupResult.errors[0],
+                'Analysis requires authentication with API key: permission denied.'
+            );
+
+            assert.equal(layergroupResult.errors_with_context[0].type, 'analysis');
+            assert.equal(
+                layergroupResult.errors_with_context[0].message,
+                'Analysis requires authentication with API key: permission denied.'
+            );
+            assert.equal(layergroupResult.errors_with_context[0].analysis.id, 'HEAD');
+            assert.equal(layergroupResult.errors_with_context[0].analysis.type, 'buffer');
+
+            testClient.drain(done);
+        });
+    });
+
+
+    it('camshaft: should return error: Missing required param "radius"; with context', function(done) {
+        var mapConfig = createMapConfig(
+            [
+                {
+                    "type": "cartodb",
+                    "options": {
+                        "source": {
+                            "id": "HEAD"
+                        },
+                        "cartocss": '#polygons { polygon-fill: red; }',
+                        "cartocss_version": "2.3.0"
+                    }
+                }
+            ],
+            {},
+            [
+                {
+                    "id": "HEAD",
+                    "type": "buffer",
+                    "params": {
+                        "source": {
+                            "id": "HEAD",
+                            "type": "source",
+                            "params": {
+                                "query": "select * from populated_places_simple_reduced"
+                            }
+                        }
+                    }
+                }
+            ]
+        );
+
+        var testClient = new TestClient(mapConfig, 1234);
+
+        testClient.getLayergroup(ERROR_RESPONSE, function(err, layergroupResult) {
+            assert.ok(!err, err);
+
+            assert.equal(layergroupResult.errors.length, 1);
+            assert.equal(
+                layergroupResult.errors[0],
+                'Missing required param "radius"'
+            );
+
+            assert.equal(layergroupResult.errors_with_context[0].type, 'analysis');
+            assert.equal(layergroupResult.errors_with_context[0].message, 'Missing required param "radius"');
+            assert.equal(layergroupResult.errors_with_context[0].analysis.id, 'HEAD');
+            assert.equal(layergroupResult.errors_with_context[0].analysis.type, 'buffer');
+
+            testClient.drain(done);
+        });
+    });
+
+
 });

test/acceptance/analysis/regressions.js

@@ -0,0 +1,112 @@
+require('../../support/test_helper');
+
+var assert = require('../../support/assert');
+var TestClient = require('../../support/test-client');
+
+describe('analysis-layers regressions', function() {
+    it('should return a complete list of nodes from analysis', function(done) {
+        var mapConfig = {
+            "version": "1.5.0",
+            "layers": [
+                {
+                    "type": "cartodb",
+                    "options": {
+                        "cartocss": TestClient.CARTOCSS.POINTS,
+                        "cartocss_version": "2.1.1",
+                        "interactivity": [],
+                        "source": {
+                            "id": "a4"
+                        }
+                    }
+                },
+                {
+                    "type": "cartodb",
+                    "options": {
+                        "cartocss": TestClient.CARTOCSS.POINTS,
+                        "cartocss_version": "2.1.0",
+                        "interactivity": [],
+                        "source": {
+                            "id": "b1"
+                        }
+                    }
+                }
+            ],
+            "dataviews": {
+                "74493a30-4679-4b72-a60c-b6f808b57c98": {
+                    "type": "histogram",
+                    "source": {
+                        "id": "b0"
+                    },
+                    "options": {
+                        "column": "customer_value",
+                        "bins": 10
+                    }
+                }
+            },
+            "analyses": [
+                {
+                    "id": "a4",
+                    "type": "intersection",
+                    "params": {
+                        "source": {
+                            "id": "a3",
+                            "type": "buffer",
+                            "params": {
+                                "source": {
+                                    "id": "a2",
+                                    "type": "centroid",
+                                    "params": {
+                                        "source": {
+                                            "id": "b1",
+                                            "type": "kmeans",
+                                            "params": {
+                                                "source": {
+                                                    "id": "b0",
+                                                    "type": "source",
+                                                    "params": {
+                                                        "query": "SELECT * FROM populated_places_simple_reduced"
+                                                    }
+                                                },
+                                                "clusters": 5
+                                            }
+                                        },
+                                        "category_column": "cluster_no"
+                                    }
+                                },
+                                "radius": 200000
+                            }
+                        },
+                        "target": {
+                            "id": "customer_home_locations",
+                            "type": "source",
+                            "params": {
+                                "query": "SELECT * FROM populated_places_simple_reduced"
+                            }
+                        }
+                    }
+                }
+            ]
+        };
+
+        var testClient = new TestClient(mapConfig, 1234);
+
+        testClient.getLayergroup(function(err, layergroupResult) {
+            assert.ok(!err, err);
+
+            assert.ok(layergroupResult);
+            assert.ok(layergroupResult.metadata);
+            var analyses = layergroupResult.metadata.analyses;
+            assert.ok(analyses);
+            assert.equal(analyses.length, 1);
+
+            var expectedIds = ['customer_home_locations', 'b0', 'b1', 'a2', 'a3', 'a4'];
+            assert.equal(Object.keys(analyses[0].nodes).length, expectedIds.length, Object.keys(analyses[0].nodes));
+            expectedIds.forEach(function(expectedId) {
+                analyses[0].nodes.hasOwnProperty(expectedId);
+            });
+
+            testClient.drain(done);
+        });
+    });
+
+});

test/acceptance/dataviews/aggregation.js

@@ -0,0 +1,59 @@
+require('../../support/test_helper');
+
+var assert = require('../../support/assert');
+var TestClient = require('../../support/test-client');
+
+describe('aggregations', function() {
+
+    afterEach(function(done) {
+        if (this.testClient) {
+            this.testClient.drain(done);
+        } else {
+            done();
+        }
+    });
+
+    function aggregationOperationMapConfig(operation) {
+        return {
+            version: '1.5.0',
+            layers: [
+                {
+                    type: 'mapnik',
+                    options: {
+                        sql: 'select * from populated_places_simple_reduced',
+                        cartocss: '#layer0 { marker-fill: red; marker-width: 10; }',
+                        cartocss_version: '2.0.1',
+                        widgets: {
+                            adm0name: {
+                                type: 'aggregation',
+                                options: {
+                                    column: 'adm0name',
+                                    aggregation: operation,
+                                    aggregationColumn: 'pop_max'
+                                }
+                            }
+                        }
+                    }
+                }
+            ]
+        };
+    }
+
+    var operations = ['count', 'sum', 'avg', 'max', 'min'];
+
+    operations.forEach(function(operation) {
+        it('should be able to use "' + operation + '" as aggregation operation', function(done) {
+
+            this.testClient = new TestClient(aggregationOperationMapConfig(operation));
+            this.testClient.getDataview('adm0name', { own_filter: 0 }, function (err, aggregation) {
+                assert.ok(!err, err);
+                assert.ok(aggregation);
+
+                assert.equal(aggregation.type, 'aggregation');
+                assert.equal(aggregation.aggregation, operation);
+
+                done();
+            });
+        });
+    });
+});

test/acceptance/dataviews/error-cases.js

@@ -0,0 +1,87 @@
+require('../../support/test_helper');
+
+var assert = require('../../support/assert');
+var TestClient = require('../../support/test-client');
+
+describe('histogram-dataview', function() {
+
+    afterEach(function(done) {
+        if (this.testClient) {
+            this.testClient.drain(done);
+        } else {
+            done();
+        }
+    });
+
+    var ERROR_RESPONSE = {
+        status: 400,
+        headers: {
+            'Content-Type': 'application/json; charset=utf-8'
+        }
+    };
+
+    function createMapConfig(dataviews) {
+        return {
+            version: '1.5.0',
+            layers: [
+                {
+                    "type": "cartodb",
+                    "options": {
+                        "source": {
+                            "id": "HEAD"
+                        },
+                        "cartocss": "#points { marker-width: 10; marker-fill: red; }",
+                        "cartocss_version": "2.3.0"
+                    }
+                }
+            ],
+            dataviews: dataviews,
+            analyses: [
+                {
+                    "id": "HEAD",
+                    "type": "source",
+                    "params": {
+                        "query": "select null::geometry the_geom_webmercator, x from generate_series(0,1000) x"
+                    }
+                }
+            ]
+        };
+    }
+
+    it('should fail when invalid dataviews object is provided, string case', function(done) {
+        var mapConfig = createMapConfig("wadus-string");
+        this.testClient = new TestClient(mapConfig, 1234);
+        this.testClient.getLayergroup(ERROR_RESPONSE, function(err, errObj) {
+            assert.ok(!err, err);
+
+            assert.deepEqual(errObj.errors, [ '"dataviews" must be a valid JSON object: "string" type found' ]);
+
+            done();
+        });
+    });
+
+    it('should fail when invalid dataviews object is provided, array case', function(done) {
+        var mapConfig = createMapConfig([]);
+        this.testClient = new TestClient(mapConfig, 1234);
+        this.testClient.getLayergroup(ERROR_RESPONSE, function(err, errObj) {
+            assert.ok(!err, err);
+
+            assert.deepEqual(errObj.errors, [ '"dataviews" must be a valid JSON object: "array" type found' ]);
+
+            done();
+        });
+    });
+
+    it('should work with empty but valid objects', function(done) {
+        var mapConfig = createMapConfig({});
+        this.testClient = new TestClient(mapConfig, 1234);
+        this.testClient.getLayergroup(function(err, layergroup) {
+            assert.ok(!err, err);
+
+            assert.ok(layergroup);
+            assert.ok(layergroup.layergroupid);
+
+            done();
+        });
+    });
+});

test/acceptance/dataviews/histogram.js

@@ -0,0 +1,80 @@
+require('../../support/test_helper');
+
+var assert = require('../../support/assert');
+var TestClient = require('../../support/test-client');
+
+describe('histogram-dataview', function() {
+
+    afterEach(function(done) {
+        if (this.testClient) {
+            this.testClient.drain(done);
+        } else {
+            done();
+        }
+    });
+
+    function createMapConfig(layers, dataviews, analysis) {
+        return {
+            version: '1.5.0',
+            layers: layers,
+            dataviews: dataviews || {},
+            analyses: analysis || []
+        };
+    }
+
+    var mapConfig = createMapConfig(
+        [
+            {
+                "type": "cartodb",
+                "options": {
+                    "source": {
+                        "id": "2570e105-7b37-40d2-bdf4-1af889598745"
+                    },
+                    "cartocss": "#points { marker-width: 10; marker-fill: red; }",
+                    "cartocss_version": "2.3.0"
+                }
+            }
+        ],
+        {
+            pop_max_histogram: {
+                source: {
+                    id: '2570e105-7b37-40d2-bdf4-1af889598745'
+                },
+                type: 'histogram',
+                options: {
+                    column: 'x'
+                }
+            }
+        },
+        [
+            {
+                "id": "2570e105-7b37-40d2-bdf4-1af889598745",
+                "type": "source",
+                "params": {
+                    "query": "select null::geometry the_geom_webmercator, x from generate_series(0,1000) x"
+                }
+            }
+        ]
+    );
+
+    it('should get bin_width right when max > min in filter', function(done) {
+        var params = {
+            bins: 10,
+            start: 1e3,
+            end: 0
+        };
+
+        this.testClient = new TestClient(mapConfig, 1234);
+        this.testClient.getDataview('pop_max_histogram', params, function(err, dataview) {
+            assert.ok(!err, err);
+
+            assert.equal(dataview.type, 'histogram');
+            assert.ok(dataview.bin_width > 0, 'Unexpected bin width: ' + dataview.bin_width);
+            dataview.bins.forEach(function(bin) {
+                assert.ok(bin.min <= bin.max, 'bin min < bin max: ' + JSON.stringify(bin));
+            });
+
+            done();
+        });
+    });
+});

test/acceptance/geojson-renderer.js

@@ -168,4 +168,176 @@ describe('use only needed columns', function() {
         });
     });
 
-});
+    it('should work with mapnik substitution tokens', function(done) {
+        var cartocss = [
+            "#layer {",
+            "  line-width: 2;",
+            "  line-color: #3B3B58;",
+            "  line-opacity: 1;",
+            "  polygon-opacity: 0.7;",
+            "  polygon-fill: ramp([points_count], (#E5F5F9,#99D8C9,#2CA25F))",
+            "}"
+        ].join('\n');
+
+        var sql = [
+            'WITH hgrid AS (',
+            '  SELECT CDB_HexagonGrid(',
+            '    ST_Expand(!bbox!, greatest(!pixel_width!,!pixel_height!) * 100),',
+            '    greatest(!pixel_width!,!pixel_height!) * 100',
+            '  ) as cell',
+            ')',
+            'SELECT',
+            '  hgrid.cell as the_geom_webmercator,',
+            '  count(1) as points_count,',
+            '  count(1)/power(100 * CDB_XYZ_Resolution(CDB_ZoomFromScale(!scale_denominator!)), 2) as points_density,',
+            '  1 as cartodb_id',
+            'FROM hgrid, (SELECT * FROM populated_places_simple_reduced) i',
+            'where ST_Intersects(i.the_geom_webmercator, hgrid.cell)',
+            'GROUP BY hgrid.cell'
+        ].join('\n');
+
+        var mapConfig = {
+            "version": "1.4.0",
+            "layers": [
+                {
+                    "type": 'mapnik',
+                    "options": {
+                        "cartocss_version": '2.3.0',
+                        "sql": sql,
+                        "cartocss": cartocss
+                    }
+                }
+            ]
+        };
+
+        this.testClient = new TestClient(mapConfig);
+        this.testClient.getTile(0, 0, 0, { format: 'geojson', layer: 0 }, function(err, res, geojson) {
+            assert.ok(!err, err);
+
+            assert.ok(geojson);
+            assert.equal(geojson.features.length, 5);
+
+            done();
+        });
+    });
+
+    it('should skip empty and null columns for geojson tiles', function(done) {
+
+        var mapConfig = {
+            "analyses": [
+                {
+                    "id": "a0",
+                    "params": {
+                        "query": "SELECT * FROM test_table"
+                    },
+                    "type": "source"
+                }
+            ],
+            "dataviews": {
+                "4e7b0e07-6d21-4b83-9adb-6d7e17eea6ca": {
+                    "options": {
+                        "aggregationColumn": null,
+                        "column": "cartodb_id",
+                        "operation": "avg"
+                    },
+                    "source": {
+                        "id": "a0"
+                    },
+                    "type": "formula"
+                },
+                "74f590f8-625c-4e95-922f-34ad3e9919c0": {
+                    "options": {
+                        "aggregation": "sum",
+                        "aggregationColumn": "cartodb_id",
+                        "column": "name"
+                    },
+                    "source": {
+                        "id": "a0"
+                    },
+                    "type": "aggregation"
+                },
+                "98a75757-3006-400a-b028-fb613a6c0b69": {
+                    "options": {
+                        "aggregationColumn": null,
+                        "column": "cartodb_id",
+                        "operation": "sum"
+                    },
+                    "source": {
+                        "id": "a0"
+                    },
+                    "type": "formula"
+                },
+                "ebbc97b2-87d2-4895-9e1f-2f012df3679d": {
+                    "options": {
+                        "aggregationColumn": null,
+                        "bins": "12",
+                        "column": "cartodb_id"
+                    },
+                    "source": {
+                        "id": "a0"
+                    },
+                    "type": "histogram"
+                },
+                "ebc0653f-3581-469c-8b31-c969e440a865": {
+                    "options": {
+                        "aggregationColumn": null,
+                        "column": "cartodb_id",
+                        "operation": "avg"
+                    },
+                    "source": {
+                        "id": "a0"
+                    },
+                    "type": "formula"
+                }
+            },
+            "layers": [
+                {
+                    "options": {
+                        "subdomains": "abcd",
+                        "urlTemplate": "http://{s}.basemaps.cartocdn.com/light_nolabels/{z}/{x}/{y}.png"
+                    },
+                    "type": "http"
+                },
+                {
+                    "options": {
+                        "attributes": {
+                            "columns": [
+                                "name",
+                                "address"
+                            ],
+                            "id": "cartodb_id"
+                        },
+                        "cartocss": "#layer { marker-width: 10; marker-fill: red; }",
+                        "cartocss_version": "2.3.0",
+                        "interactivity": "cartodb_id",
+                        "layer_name": "wadus",
+                        "source": {
+                            "id": "a0"
+                        }
+                    },
+                    "type": "cartodb"
+                },
+                {
+                    "options": {
+                        "subdomains": "abcd",
+                        "urlTemplate": "http://{s}.basemaps.cartocdn.com/light_only_labels/{z}/{x}/{y}.png"
+                    },
+                    "type": "http"
+                }
+            ]
+        };
+
+        this.testClient = new TestClient(mapConfig);
+        this.testClient.getTile(0, 0, 0, { format: 'geojson', layer: 0 }, function(err, res, geojson) {
+            assert.ok(!err, err);
+
+            assert.ok(geojson);
+            assert.equal(geojson.features.length, 5);
+
+            assert.deepEqual(Object.keys(geojson.features[0].properties), ['cartodb_id', 'name']);
+
+            done();
+        });
+    });
+
+});

test/acceptance/limits.js

@@ -106,7 +106,7 @@ describe('render limits', function() {
                     },
                     function(res) {
                         var parsed = JSON.parse(res.body);
-                        assert.deepEqual(parsed, { errors: [ 'Render timed out' ] });
+                        assert.deepEqual(parsed.errors, [ 'Render timed out' ]);
                         done();
                     }
                 );
@@ -171,7 +171,7 @@ describe('render limits', function() {
                             },
                             function(res) {
                                 var parsed = JSON.parse(res.body);
-                                assert.deepEqual(parsed, { errors: ['Render timed out'] });
+                                assert.deepEqual(parsed.errors, ['Render timed out']);
                                 done();
                             }
                         );

test/acceptance/multilayer_server.js

@@ -228,7 +228,7 @@ 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.deepEqual(parsed.errors, [ 'Unexpected token W' ]);
 
                     done();
                 }
@@ -334,9 +334,7 @@ describe('tests from old api translated to multilayer', function() {
                 assert.ok(!res.headers.hasOwnProperty('x-cache-channel'));
 
                 var parsed = JSON.parse(res.body);
-                assert.deepEqual(parsed, {
-                    errors: ["fake error message"]
-                });
+                assert.deepEqual(parsed.errors, ["fake error message"]);
 
                 done();
             }

test/acceptance/named_layers.js

@@ -181,7 +181,7 @@ describe('named_layers', function() {
                 }
 
                 var parsedBody = JSON.parse(response.body);
-                assert.deepEqual(parsedBody, { errors: ["Template 'nonexistent' of user 'localhost' not found"] });
+                assert.deepEqual(parsedBody.errors, ["Template 'nonexistent' of user 'localhost' not found"]);
 
                 return null;
             },
@@ -234,10 +234,7 @@ describe('named_layers', function() {
                 }
 
                 var parsedBody = JSON.parse(response.body);
-                assert.deepEqual(
-                    parsedBody,
-                    { errors: [ "Unauthorized 'auth_valid_template' template instantiation" ] }
-                );
+                assert.deepEqual(parsedBody.errors, [ "Unauthorized 'auth_valid_template' template instantiation" ]);
 
                 return null;
             },
@@ -347,7 +344,7 @@ describe('named_layers', function() {
                 }
 
                 var parsedBody = JSON.parse(response.body);
-                assert.deepEqual(parsedBody, { errors: [ 'Nested named layers are not allowed' ] });
+                assert.deepEqual(parsedBody.errors, ['Nested named layers are not allowed' ]);
 
                 return null;
             },

test/acceptance/named_maps_authentication.js

@@ -169,8 +169,8 @@ describe('named maps authentication', function() {
             getNamedTile(nonexistentName, 0, 0, 0, { status: 404 }, function(err, res) {
                 assert.ok(!err);
                 assert.deepEqual(
-                    JSON.parse(res.body),
-                    { errors: ["Template '" + nonexistentName + "' of user '" + username + "' not found"] }
+                    JSON.parse(res.body).errors,
+                    ["Template '" + nonexistentName + "' of user '" + username + "' not found"]
                 );
                 done();
             });
@@ -179,7 +179,7 @@ describe('named maps authentication', function() {
         it('should return 403 if not properly authorized', function(done) {
             getNamedTile(tokenAuthTemplateName, 0, 0, 0, { status: 403 }, function(err, res) {
                 assert.ok(!err);
-                assert.deepEqual(JSON.parse(res.body), { errors: ['Unauthorized template instantiation'] });
+                assert.deepEqual(JSON.parse(res.body).errors, ['Unauthorized template instantiation']);
                 done();
             });
         });
@@ -238,8 +238,8 @@ describe('named maps authentication', function() {
             getStaticMap(nonexistentName, { status: 404 }, function(err, res) {
                 assert.ok(!err);
                 assert.deepEqual(
-                    JSON.parse(res.body),
-                    { errors: ["Template '" + nonexistentName + "' of user '" + username + "' not found"] }
+                    JSON.parse(res.body).errors,
+                    ["Template '" + nonexistentName + "' of user '" + username + "' not found"]
                 );
                 done();
             });
@@ -248,7 +248,7 @@ describe('named maps authentication', function() {
         it('should return 403 if not properly authorized', function(done) {
             getStaticMap(tokenAuthTemplateName, { status: 403 }, function(err, res) {
                 assert.ok(!err);
-                assert.deepEqual(JSON.parse(res.body), { errors: ['Unauthorized template instantiation'] });
+                assert.deepEqual(JSON.parse(res.body).errors, ['Unauthorized template instantiation']);
                 done();
             });
         });

test/acceptance/named_maps_cache.js

@@ -124,8 +124,8 @@ describe('named maps provider cache', function() {
                         getNamedTile({ statusCode: 404 }, function(err, res) {
                             assert.ok(!err);
                             assert.deepEqual(
-                                JSON.parse(res.body),
-                                { errors: ["Template 'template_with_color' of user 'localhost' not found"] }
+                                JSON.parse(res.body).errors,
+                                ["Template 'template_with_color' of user 'localhost' not found"]
                             );
 
                             // add template again so it's clean in afterEach

test/acceptance/ported/attributes.js

@@ -231,7 +231,11 @@ describe('attributes', function() {
                 assert.equal(res.statusCode, 200, res.statusCode + ': ' + res.body);
                 assert.equal(
                     res.body,
-                    '/**/ typeof test === \'function\' && test({"errors":["Layer 0 has no exposed attributes"]});'
+                    '/**/ typeof test === \'function\' && ' +
+                    'test({"errors":["Layer 0 has no exposed attributes"],' +
+                    '"errors_with_context":[{' +
+                    '"type":"unknown","message":"Layer 0 has no exposed attributes"' +
+                    '}]});'
                 );
                 return null;
             },

test/acceptance/ported/blend_http_fallback.js

@@ -138,11 +138,9 @@ describe('blend http fallback', function() {
         testClient.getTileLayer(mapConfig, tileRequest, expectedResponse, function(err, res) {
             assert.ok(!err);
             var parsedBody = JSON.parse(res.body);
-            assert.deepEqual(parsedBody, {
-                errors: [
-                    "Unable to fetch http tile: http://127.0.0.1:8033/error404/1/0/0.png [404]"
-                ]
-            });
+            assert.deepEqual(parsedBody.errors, [
+                "Unable to fetch http tile: http://127.0.0.1:8033/error404/1/0/0.png [404]"
+            ]);
             done();
         });
     });

test/acceptance/ported/external_resources.js

@@ -119,12 +119,11 @@ describe('external resources', function() {
         var mapConfig = testClient.defaultTableMapConfig('test_table_3', style);
 
         testClient.createLayergroup(mapConfig, { statusCode: 400 }, function(err, res) {
-            assert.deepEqual(JSON.parse(res.body), {
-                errors: ["Unable to download '" + url + "' for 'style0' (server returned 404)"]
-            });
+            assert.deepEqual(JSON.parse(res.body).errors, [
+                "Unable to download '" + url + "' for 'style0' (server returned 404)"]
+            );
             done();
         });
     });
 
 });
-

test/acceptance/ported/multilayer_error_cases.js

@@ -31,7 +31,7 @@ describe('multilayer error cases', function() {
         }, {}, function(res) {
             assert.equal(res.statusCode, 400, res.body);
             var parsedBody = JSON.parse(res.body);
-            assert.deepEqual(parsedBody, {"errors":["layergroup POST data must be of type application/json"]});
+            assert.deepEqual(parsedBody.errors, ["layergroup POST data must be of type application/json"]);
             done();
         });
     });
@@ -44,7 +44,7 @@ describe('multilayer error cases', function() {
         }, {}, function(res) {
             assert.equal(res.statusCode, 400, res.body);
             var parsedBody = JSON.parse(res.body);
-            assert.deepEqual(parsedBody, {"errors":["Missing layers array from layergroup config"]});
+            assert.deepEqual(parsedBody.errors, ["Missing layers array from layergroup config"]);
             done();
         });
     });
@@ -58,7 +58,10 @@ describe('multilayer error cases', function() {
             assert.equal(res.statusCode, 200);
             assert.equal(
                 res.body,
-                '/**/ typeof test === \'function\' && test({"errors":["Missing layers array from layergroup config"]});'
+                '/**/ typeof test === \'function\' && ' +
+                'test({"errors":["Missing layers array from layergroup config"],' +
+                '"errors_with_context":[{"type":"unknown",' +
+                '"message":"Missing layers array from layergroup config"}]});'
             );
             done();
         });
@@ -83,7 +86,7 @@ describe('multilayer error cases', function() {
       }, {}, function(res) {
           assert.equal(res.statusCode, 400, res.body);
           var parsedBody = JSON.parse(res.body);
-          assert.deepEqual(parsedBody, {errors:["Missing cartocss_version for layer 0 options"]});
+          assert.deepEqual(parsedBody.errors, ["Missing cartocss_version for layer 0 options"]);
           done();
       });
     });
@@ -355,7 +358,7 @@ describe('multilayer error cases', function() {
         var mapConfig = testClient.singleLayerMapConfig('select * from test_table', null, null, 'name');
 
         testClient.getGrid(mapConfig, 1, 13, 4011, 3088, defaultErrorExpectedResponse, function(err, res) {
-            assert.deepEqual(JSON.parse(res.body), { errors: ["Layer '1' not found in layergroup"] });
+            assert.deepEqual(JSON.parse(res.body).errors, ["Layer '1' not found in layergroup"]);
             done();
         });
     });
@@ -383,7 +386,7 @@ describe('multilayer error cases', function() {
           // FIXME: should be 404
           assert.equal(res.statusCode, 400, res.statusCode + ':' + res.body);
           var parsed = JSON.parse(res.body);
-          assert.deepEqual(parsed, {"errors": ["Invalid or nonexistent map configuration token 'deadbeef'"]});
+          assert.deepEqual(parsed.errors, ["Invalid or nonexistent map configuration token 'deadbeef'"]);
           return null;
         },
         function finish(err) {

test/acceptance/ported/raster.js

@@ -148,11 +148,10 @@ describe('raster', function() {
                 assert.ok(!err);
                 checkCORSHeaders(res);
                 var parsedBody = JSON.parse(res.body);
-                assert.deepEqual(parsedBody, { errors: [ 'Mapnik raster layers do not support interactivity' ] });
+                assert.deepEqual(parsedBody.errors, [ 'Mapnik raster layers do not support interactivity' ]);
                 done();
             }
         );
     });
 
 });
-

test/acceptance/ported/regressions.js

@@ -29,7 +29,7 @@ describe('regressions', function() {
                 contentType: 'application/json; charset=utf-8'
             };
             requestTile('/0/0/0.png?testUnexpectedError=1', options, function(err, res) {
-                assert.deepEqual(JSON.parse(res.body), { "errors": ["test unexpected error"] });
+                assert.deepEqual(JSON.parse(res.body).errors, ["test unexpected error"]);
                 finish(done);
             });
         });

test/acceptance/ported/retina.js

@@ -129,7 +129,7 @@ describe('retina support', function() {
             },
             function(res, err) {
                 assert.ok(!err, 'Failed to request 0/0/0' + scaleFactor + '.png tile');
-                assert.deepEqual(JSON.parse(res.body), { errors: ["Tile with specified resolution not found"] } );
+                assert.deepEqual(JSON.parse(res.body).errors, ["Tile with specified resolution not found"]);
 
                 done();
             }

test/acceptance/ported/server.js

@@ -112,7 +112,7 @@ describe('server', function() {
             }
         };
         testClient.getGrid(mapConfig, 0, 13, 4011, 3088, expectedResponse, function(err, res) {
-            assert.deepEqual(JSON.parse(res.body), {"errors":["Tileset has no interactivity"]});
+            assert.deepEqual(JSON.parse(res.body).errors, ["Tileset has no interactivity"]);
             done();
         });
     });

test/acceptance/templates.js

@@ -1927,9 +1927,8 @@ describe('template_api', function() {
                 if (err) {
                     return done(err);
                 }
-                assert.deepEqual(JSON.parse(res.body), {
-                    errors: ["Invalid or nonexistent map configuration token '" + nonexistentToken + "'"]
-                });
+                assert.deepEqual(JSON.parse(res.body).errors,
+                    ["Invalid or nonexistent map configuration token '" + nonexistentToken + "'"]);
 
                 done();
             };

test/acceptance/turbo-cartocss/error-cases.js

@@ -106,4 +106,36 @@ describe('turbo-carto error cases', function() {
             done();
         });
     });
+
+    it('turbo-carto: should return error invalid column from datasource with some context', function(done) {
+        this.testClient = new TestClient(makeMapconfig(null, 'ramp([wadus_column], (red, green, blue))'));
+        this.testClient.getLayergroup(ERROR_RESPONSE, function(err, layergroup) {
+            assert.ok(!err, err);
+
+            assert.ok(layergroup.hasOwnProperty('errors'));
+            assert.equal(layergroup.errors_with_context.length, 1);
+            assert.equal(layergroup.errors_with_context[0].type, 'layer');
+            assert.equal(layergroup.errors_with_context[0].subtype, 'turbo-carto');
+            assert.ok(layergroup.errors_with_context[0].message.match(/^turbo-carto/));
+            assert.ok(layergroup.errors_with_context[0].message.match(/unable\sto\scompute\sramp/i));
+            assert.ok(layergroup.errors_with_context[0].message.match(/wadus_column/));
+
+            assert.equal(layergroup.errors_with_context[0].layer.id, 'layer0');
+            assert.equal(layergroup.errors_with_context[0].layer.index, 0);
+            assert.equal(layergroup.errors_with_context[0].layer.type, 'mapnik');
+
+            assert.equal(layergroup.errors_with_context[0].layer.context.selector, '#populated_places_simple_reduced');
+            assert.deepEqual(layergroup.errors_with_context[0].layer.context.source, {
+                start: {
+                    line: 10,
+                    column: 3
+                },
+                end: {
+                    line: 10,
+                    column: 56
+                }
+            });
+            done();
+        });
+    });
 });

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

@@ -22,215 +22,231 @@ describe('turbo-carto for named maps', function() {
 
     var templateId = 'turbo-carto-template-1';
 
-    var template = {
-        version: '0.0.1',
-        name: templateId,
-        auth: { method: 'open' },
-        placeholders: {
-            color: {
-                type: "css_color",
-                default: "Reds"
-            }
-        },
-        layergroup:  {
-            version: '1.0.0',
-                layers: [{
-                    options: {
-                        sql: [
-                            'SELECT test_table.*, _prices.price FROM test_table JOIN (' +
-                            '  SELECT 1 AS cartodb_id, 10.00 AS price',
-                            '  UNION',
-                            '  SELECT 2, 10.50',
-                            '  UNION',
-                            '  SELECT 3, 11.00',
-                            '  UNION',
-                            '  SELECT 4, 12.00',
-                            '  UNION',
-                            '  SELECT 5, 21.00',
-                            ') _prices ON _prices.cartodb_id = test_table.cartodb_id'
-                        ].join('\n'),
-                        cartocss: [
-                            '#layer {',
-                            '  marker-fill: ramp([price], colorbrewer(<%= color %>));',
-                            '  marker-allow-overlap:true;',
-                            '}'
-                        ].join('\n'),
-                        cartocss_version: '2.0.2'
-                    }
+    function template(table) {
+        return {
+            version: '0.0.1',
+            name: templateId,
+            auth: { method: 'open' },
+            placeholders: {
+                color: {
+                    type: "css_color",
+                    default: "Reds"
                 }
-            ]
-        }
-    };
+            },
+            layergroup: {
+                version: '1.0.0',
+                layers: [
+                    {
+                        options: {
+                            sql: [
+                                'SELECT ' + table + '.*, _prices.price FROM ' + table + ' JOIN (' +
+                                '  SELECT 1 AS cartodb_id, 10.00 AS price',
+                                '  UNION',
+                                '  SELECT 2, 10.50',
+                                '  UNION',
+                                '  SELECT 3, 11.00',
+                                '  UNION',
+                                '  SELECT 4, 12.00',
+                                '  UNION',
+                                '  SELECT 5, 21.00',
+                                ') _prices ON _prices.cartodb_id = ' + table + '.cartodb_id'
+                            ].join('\n'),
+                            cartocss: [
+                                '#layer {',
+                                '  marker-fill: ramp([price], colorbrewer(<%= color %>));',
+                                '  marker-allow-overlap:true;',
+                                '}'
+                            ].join('\n'),
+                            cartocss_version: '2.0.2'
+                        }
+                    }
+                ]
+            }
+        };
+    }
 
     var templateParamsReds = { color: 'Reds' };
     var templateParamsBlues = { color: 'Blues' };
 
-    it('should create a template with turbo-carto parsed properly', function (done) {
-        step(
-            function postTemplate() {
-                var next = this;
+    var scenarios = [
+        {
+            desc: 'with public tables',
+            table: 'test_table'
+        },
+        {
+            desc: 'with private tables',
+            table: 'test_table_private_1'
+        }
+    ];
 
-                assert.response(server, {
-                    url: '/api/v1/map/named?api_key=1234',
-                    method: 'POST',
-                    headers: { host: 'localhost', 'Content-Type': 'application/json' },
-                    data: JSON.stringify(template)
-                }, {},
-                function (res, err) {
-                    next(err, res);
-                });
-            },
-            function checkTemplate(err, res) {
-                assert.ifError(err);
-                assert.equal(res.statusCode, 200);
-                assert.deepEqual(JSON.parse(res.body), {
-                    template_id: templateId
-                });
+    scenarios.forEach(function(scenario) {
+        it('should create a template with turbo-carto parsed properly: ' + scenario.desc, function (done) {
+            step(
+                function postTemplate() {
+                    var next = this;
 
-                return null;
-            },
-            function instantiateTemplateWithReds(err) {
-                assert.ifError(err);
+                    assert.response(server, {
+                        url: '/api/v1/map/named?api_key=1234',
+                        method: 'POST',
+                        headers: { host: 'localhost', 'Content-Type': 'application/json' },
+                        data: JSON.stringify(template(scenario.table))
+                    }, {},
+                    function (res, err) {
+                        next(err, res);
+                    });
+                },
+                function checkTemplate(err, res) {
+                    assert.ifError(err);
+                    assert.equal(res.statusCode, 200);
+                    assert.deepEqual(JSON.parse(res.body), {
+                        template_id: templateId
+                    });
 
-                var next = this;
-                assert.response(server, {
-                    url: '/api/v1/map/named/' + templateId,
-                    method: 'POST',
-                    headers: {
-                        host: 'localhost',
-                        'Content-Type': 'application/json'
-                    },
-                    data: JSON.stringify(templateParamsReds)
-                }, {},
-                function(res, err) {
-                    return next(err, res);
-                });
-            },
-            function checkInstanciationWithReds(err, res) {
-                assert.ifError(err);
+                    return null;
+                },
+                function instantiateTemplateWithReds(err) {
+                    assert.ifError(err);
 
-                assert.equal(res.statusCode, 200);
+                    var next = this;
+                    assert.response(server, {
+                        url: '/api/v1/map/named/' + templateId,
+                        method: 'POST',
+                        headers: {
+                            host: 'localhost',
+                            'Content-Type': 'application/json'
+                        },
+                        data: JSON.stringify(templateParamsReds)
+                    }, {},
+                    function(res, err) {
+                        return next(err, res);
+                    });
+                },
+                function checkInstanciationWithReds(err, res) {
+                    assert.ifError(err);
 
-                var parsedBody = JSON.parse(res.body);
+                    assert.equal(res.statusCode, 200);
 
-                keysToDelete['map_cfg|' + LayergroupToken.parse(parsedBody.layergroupid).token] = 0;
-                keysToDelete['user:localhost:mapviews:global'] = 5;
+                    var parsedBody = JSON.parse(res.body);
 
-                assert.ok(parsedBody.layergroupid);
-                assert.ok(parsedBody.last_updated);
+                    keysToDelete['map_cfg|' + LayergroupToken.parse(parsedBody.layergroupid).token] = 0;
+                    keysToDelete['user:localhost:mapviews:global'] = 5;
 
-                return parsedBody.layergroupid;
-            },
-            function requestTileReds(err, layergroupId) {
-                assert.ifError(err);
+                    assert.ok(parsedBody.layergroupid);
+                    assert.ok(parsedBody.last_updated);
 
-                var next = this;
+                    return parsedBody.layergroupid;
+                },
+                function requestTileReds(err, layergroupId) {
+                    assert.ifError(err);
 
-                assert.response(server, {
-                    url: '/api/v1/map/' + layergroupId + '/0/0/0.png',
-                    method: 'GET',
-                    headers: { host: 'localhost' },
-                    encoding: 'binary'
-                }, {},
-                function(res, err) {
-                    next(err, res);
-                });
-            },
-            function checkTileReds(err, res) {
-                assert.ifError(err);
+                    var next = this;
 
-                var next = this;
+                    assert.response(server, {
+                        url: '/api/v1/map/' + layergroupId + '/0/0/0.png',
+                        method: 'GET',
+                        headers: { host: 'localhost' },
+                        encoding: 'binary'
+                    }, {},
+                    function(res, err) {
+                        next(err, res);
+                    });
+                },
+                function checkTileReds(err, res) {
+                    assert.ifError(err);
 
-                assert.equal(res.statusCode, 200);
-                assert.equal(res.headers['content-type'], 'image/png');
+                    var next = this;
 
-                var fixturePath = './test/fixtures/turbo-carto-named-maps-reds.png';
-                var image = mapnik.Image.fromBytes(new Buffer(res.body, 'binary'));
+                    assert.equal(res.statusCode, 200);
+                    assert.equal(res.headers['content-type'], 'image/png');
 
-                assert.imageIsSimilarToFile(image, fixturePath, IMAGE_TOLERANCE_PER_MIL, next);
-            },
-            function instantiateTemplateWithBlues(err) {
-                assert.ifError(err);
+                    var fixturePath = './test/fixtures/turbo-carto-named-maps-reds.png';
+                    var image = mapnik.Image.fromBytes(new Buffer(res.body, 'binary'));
 
-                var next = this;
-                assert.response(server, {
-                    url: '/api/v1/map/named/' + templateId,
-                    method: 'POST',
-                    headers: {
-                        host: 'localhost',
-                        'Content-Type': 'application/json'
-                    },
-                    data: JSON.stringify(templateParamsBlues)
-                }, {},
-                function(res, err) {
-                    return next(err, res);
-                });
-            },
-            function checkInstanciationWithBlues(err, res) {
-                assert.ifError(err);
-                assert.equal(res.statusCode, 200);
+                    assert.imageIsSimilarToFile(image, fixturePath, IMAGE_TOLERANCE_PER_MIL, next);
+                },
+                function instantiateTemplateWithBlues(err) {
+                    assert.ifError(err);
 
-                var parsedBody = JSON.parse(res.body);
+                    var next = this;
+                    assert.response(server, {
+                        url: '/api/v1/map/named/' + templateId,
+                        method: 'POST',
+                        headers: {
+                            host: 'localhost',
+                            'Content-Type': 'application/json'
+                        },
+                        data: JSON.stringify(templateParamsBlues)
+                    }, {},
+                    function(res, err) {
+                        return next(err, res);
+                    });
+                },
+                function checkInstanciationWithBlues(err, res) {
+                    assert.ifError(err);
+                    assert.equal(res.statusCode, 200);
 
-                keysToDelete['map_cfg|' + LayergroupToken.parse(parsedBody.layergroupid).token] = 0;
-                keysToDelete['user:localhost:mapviews:global'] = 5;
+                    var parsedBody = JSON.parse(res.body);
 
-                assert.ok(parsedBody.layergroupid);
-                assert.ok(parsedBody.last_updated);
+                    keysToDelete['map_cfg|' + LayergroupToken.parse(parsedBody.layergroupid).token] = 0;
+                    keysToDelete['user:localhost:mapviews:global'] = 5;
 
-                return parsedBody.layergroupid;
-            },
-            function requestTileBlues(err, layergroupId) {
-                assert.ifError(err);
+                    assert.ok(parsedBody.layergroupid);
+                    assert.ok(parsedBody.last_updated);
 
-                var next = this;
+                    return parsedBody.layergroupid;
+                },
+                function requestTileBlues(err, layergroupId) {
+                    assert.ifError(err);
 
-                assert.response(server, {
-                    url: '/api/v1/map/' + layergroupId + '/0/0/0.png',
-                    method: 'GET',
-                    headers: { host: 'localhost' },
-                    encoding: 'binary'
-                }, {},
-                function(res, err) {
-                    next(err, res);
-                });
-            },
-            function checkTileBlues(err, res) {
-                assert.ifError(err);
+                    var next = this;
 
-                var next = this;
+                    assert.response(server, {
+                        url: '/api/v1/map/' + layergroupId + '/0/0/0.png',
+                        method: 'GET',
+                        headers: { host: 'localhost' },
+                        encoding: 'binary'
+                    }, {},
+                    function(res, err) {
+                        next(err, res);
+                    });
+                },
+                function checkTileBlues(err, res) {
+                    assert.ifError(err);
 
-                assert.equal(res.statusCode, 200);
-                assert.equal(res.headers['content-type'], 'image/png');
+                    var next = this;
 
-                var fixturePath = './test/fixtures/turbo-carto-named-maps-blues.png';
-                var image = mapnik.Image.fromBytes(new Buffer(res.body, 'binary'));
+                    assert.equal(res.statusCode, 200);
+                    assert.equal(res.headers['content-type'], 'image/png');
 
-                assert.imageIsSimilarToFile(image, fixturePath, IMAGE_TOLERANCE_PER_MIL, next);
-            },
-            function deleteTemplate(err) {
-                assert.ifError(err);
+                    var fixturePath = './test/fixtures/turbo-carto-named-maps-blues.png';
+                    var image = mapnik.Image.fromBytes(new Buffer(res.body, 'binary'));
 
-                var next = this;
+                    assert.imageIsSimilarToFile(image, fixturePath, IMAGE_TOLERANCE_PER_MIL, next);
+                },
+                function deleteTemplate(err) {
+                    assert.ifError(err);
 
-                assert.response(server, {
-                    url: '/api/v1/map/named/' + templateId + '?api_key=1234',
-                    method: 'DELETE',
-                    headers: { host: 'localhost' }
-                }, {}, function (res, err) {
-                    next(err, res);
-                });
-            },
-            function checkDeleteTemplate(err, res) {
-                assert.ifError(err);
-                assert.equal(res.statusCode, 204);
-                assert.ok(!res.body);
+                    var next = this;
 
-                return null;
-            },
-            function finish(err) {
-                done(err);
-            }
-        );
+                    assert.response(server, {
+                        url: '/api/v1/map/named/' + templateId + '?api_key=1234',
+                        method: 'DELETE',
+                        headers: { host: 'localhost' }
+                    }, {}, function (res, err) {
+                        next(err, res);
+                    });
+                },
+                function checkDeleteTemplate(err, res) {
+                    assert.ifError(err);
+                    assert.equal(res.statusCode, 204);
+                    assert.ok(!res.body);
+
+                    return null;
+                },
+                function finish(err) {
+                    done(err);
+                }
+            );
+        });
     });
 });

test/acceptance/turbo-cartocss/regressions.js

@@ -24,6 +24,8 @@ describe('turbo-carto regressions', function() {
     afterEach(function (done) {
         if (this.testClient) {
             this.testClient.drain(done);
+        } else {
+            done();
         }
     });
 
@@ -64,6 +66,57 @@ describe('turbo-carto regressions', function() {
         });
     });
 
+    it('should fail for private tables', function(done) {
+        var cartocss = [
+            "#private_table {",
+            "  marker-placement: point;",
+            "  marker-allow-overlap: true;",
+            "  marker-line-width: 0;",
+            "  marker-fill-opacity: 1.0;",
+            "  marker-width: ramp([cartodb_id], 10, 20);",
+            "  marker-fill: red;",
+            "}"
+        ].join('\n');
+
+        this.testClient = new TestClient(makeMapconfig('SELECT * FROM test_table_private_1', cartocss));
+        this.testClient.getLayergroup(TestClient.RESPONSE.ERROR, function(err, layergroup) {
+            assert.ok(!err, err);
+
+            assert.ok(!layergroup.hasOwnProperty('layergroupid'));
+            assert.ok(layergroup.hasOwnProperty('errors'));
+
+            var turboCartoError = layergroup.errors_with_context[0];
+            assert.ok(turboCartoError);
+            assert.equal(turboCartoError.type, 'layer');
+            assert.ok(turboCartoError.message.match(/permission\sdenied\sfor\srelation\stest_table_private_1/));
+
+            done();
+        });
+    });
+
+    it('should work for private tables with api key', function(done) {
+        var cartocss = [
+            "#private_table {",
+            "  marker-placement: point;",
+            "  marker-allow-overlap: true;",
+            "  marker-line-width: 0;",
+            "  marker-fill-opacity: 1.0;",
+            "  marker-width: ramp([cartodb_id], 10, 20);",
+            "  marker-fill: red;",
+            "}"
+        ].join('\n');
+
+        this.testClient = new TestClient(makeMapconfig('SELECT * FROM test_table_private_1', cartocss), 1234);
+        this.testClient.getLayergroup(function(err, layergroup) {
+            assert.ok(!err, err);
+
+            assert.ok(layergroup.hasOwnProperty('layergroupid'));
+            assert.ok(!layergroup.hasOwnProperty('errors'));
+
+            done();
+        });
+    });
+
     it('should work with mapnik substitution tokens', function(done) {
         var cartocss = [
             "#layer {",
@@ -167,4 +220,71 @@ describe('turbo-carto regressions', function() {
             done();
         });
     });
+
+    describe('empty datasource results', function() {
+
+        afterEach(function (done) {
+            if (this.testClient) {
+                this.testClient.drain(done);
+            } else {
+                done();
+            }
+        });
+
+        function emptyResultMapConfig(markerFillRule) {
+            var cartocss = [
+                "#county_points_with_population {",
+                "  marker-placement: point;",
+                "  marker-allow-overlap: true;",
+                "  marker-fill-opacity: 1.0;",
+                "  marker-fill: " + markerFillRule + ';',
+                "  marker-line-width: 0;",
+                "}"
+            ].join('\n');
+
+            return {
+                "version": "1.5.0",
+                "layers": [
+                    {
+                        "type": 'mapnik',
+                        "options": {
+                            "cartocss_version": '2.3.0',
+                            "source": {
+                                "id": "head"
+                            },
+                            "cartocss": cartocss
+                        }
+                    }
+                ],
+                "analyses": [
+                    {
+                        "id": "head",
+                        "type": "source",
+                        "params": {
+                            "query": "SELECT * FROM populated_places_simple_reduced limit 0"
+                        }
+                    }
+                ]
+            };
+        }
+
+        var methods = ['quantiles', 'equal', 'jenks', 'headtails', 'category'];
+
+        methods.forEach(function(method) {
+            it('should work for "' + method+ '" method', function(done) {
+                var makerFillRule = 'ramp([pop_max], (#E5F5F9,#99D8C9,#2CA25F), ' + method + ')';
+
+                this.testClient = new TestClient(emptyResultMapConfig(makerFillRule), 1234);
+                this.testClient.getLayergroup(function(err, layergroup) {
+                    assert.ok(!err, err);
+
+                    assert.ok(layergroup.hasOwnProperty('layergroupid'));
+                    assert.ok(!layergroup.hasOwnProperty('errors'));
+
+                    done();
+                });
+            });
+        });
+    });
+
 });

test/acceptance/widgets/regressions.js

@@ -0,0 +1,223 @@
+require('../../support/test_helper');
+
+var assert = require('../../support/assert');
+var TestClient = require('../../support/test-client');
+
+describe('widgets-regressions', function() {
+
+    describe('aggregations', function() {
+
+        afterEach(function(done) {
+            if (this.testClient) {
+                this.testClient.drain(done);
+            } else {
+                done();
+            }
+        });
+
+        it('should work when there is a mix of layers with and without widgets', function(done) {
+            var layersWithNoWidgetsMapConfig = {
+                version: '1.5.0',
+                layers: [
+                    {
+                        type: 'mapnik',
+                        options: {
+                            sql: 'select * from populated_places_simple_reduced',
+                            cartocss: '#layer0 { marker-fill: red; marker-width: 10; }',
+                            cartocss_version: '2.0.1',
+                            widgets: {
+                                adm0name: {
+                                    type: 'aggregation',
+                                    options: {
+                                        column: 'adm0name',
+                                        aggregation: 'sum',
+                                        aggregationColumn: 'pop_max'
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    {
+                        type: 'mapnik',
+                        options: {
+                            sql: 'select * from populated_places_simple_reduced limit 100',
+                            cartocss: '#layer0 { marker-fill: red; marker-width: 10; }',
+                            cartocss_version: '2.0.1'
+                        }
+                    }
+                ]
+            };
+
+            this.testClient = new TestClient(layersWithNoWidgetsMapConfig);
+            this.testClient.getWidget('adm0name', { own_filter: 0 }, function (err, res, aggregation) {
+                assert.ok(!err, err);
+                assert.ok(aggregation);
+                assert.equal(aggregation.type, 'aggregation');
+
+                assert.equal(aggregation.categories.length, 6);
+
+                assert.deepEqual(
+                    aggregation.categories[0],
+                    { category: 'China', value: 374537585, agg: false }
+                );
+
+                assert.deepEqual(
+                    aggregation.categories[aggregation.categories.length - 1],
+                    { category: 'Other', value: 1412626289, agg: true }
+                );
+
+                done();
+            });
+        });
+
+        it('should work when there is a mix of layers with and without widgets, source and sql', function(done) {
+            var mixOfLayersMapConfig = {
+                version: '1.5.0',
+                layers: [
+                    {
+                        type: 'mapnik',
+                        options: {
+                            sql: 'select * from populated_places_simple_reduced',
+                            cartocss: '#layer0 { marker-fill: red; marker-width: 10; }',
+                            cartocss_version: '2.0.1',
+                            widgets: {
+                                adm0name_categories: {
+                                    type: 'aggregation',
+                                    options: {
+                                        column: 'adm0name',
+                                        aggregation: 'sum',
+                                        aggregationColumn: 'pop_max'
+                                    }
+                                },
+                                adm1name_categories: {
+                                    type: 'aggregation',
+                                    options: {
+                                        column: 'adm1name',
+                                        aggregation: 'sum',
+                                        aggregationColumn: 'pop_max'
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    {
+                        type: 'mapnik',
+                        options: {
+                            source: {id: 'head-limited'},
+                            cartocss: '#layer0 { marker-fill: red; marker-width: 10; }',
+                            cartocss_version: '2.0.1',
+                            widgets: {
+                                pop_max_histogram: {
+                                    type: 'histogram',
+                                    options: {
+                                        column: 'pop_max'
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    {
+                        "type": "http",
+                        "options": {
+                            "urlTemplate": "http://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png",
+                            "subdomains": "abcd"
+                        }
+                    }
+                ],
+                analyses: [
+                    {
+                        id: 'head-limited',
+                        type: 'source',
+                        params: {
+                            query: 'select * from populated_places_simple_reduced limit 100'
+                        }
+                    }
+                ],
+                dataviews: {
+                    wadus: {
+                        type: 'histogram',
+                        source: {
+                            id: 'head-limited'
+                        },
+                        options: {
+                            column: 'population'
+                        }
+                    }
+                }
+            };
+
+            this.testClient = new TestClient(mixOfLayersMapConfig);
+            this.testClient.getLayergroup(function(err, layergroup) {
+                assert.ok(!err, err);
+                assert.ok(layergroup.metadata);
+                var metadata = layergroup.metadata;
+                assert.equal(metadata.layers.length, 3);
+                assert.equal(metadata.analyses.length, 2);
+                assert.equal(Object.keys(metadata.dataviews).length, 4);
+                assert.deepEqual(
+                    Object.keys(metadata.dataviews),
+                    ['wadus', 'adm0name_categories', 'adm1name_categories', 'pop_max_histogram']
+                );
+
+
+                done();
+            });
+        });
+
+        it('should work with layers not containing sql', function(done) {
+            var nonSqlLayersMapConfig = {
+                version: '1.5.0',
+                layers: [
+                    {
+                        type: 'mapnik',
+                        options: {
+                            sql: 'select * from populated_places_simple_reduced',
+                            cartocss: '#layer0 { marker-fill: red; marker-width: 10; }',
+                            cartocss_version: '2.0.1',
+                            widgets: {
+                                adm0name: {
+                                    type: 'aggregation',
+                                    options: {
+                                        column: 'adm0name',
+                                        aggregation: 'sum',
+                                        aggregationColumn: 'pop_max'
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    {
+                        "type": "http",
+                        "options": {
+                            "urlTemplate": "http://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png",
+                            "subdomains": "abcd"
+                        }
+                    }
+                ]
+            };
+
+            this.testClient = new TestClient(nonSqlLayersMapConfig);
+            this.testClient.getWidget('adm0name', { own_filter: 0 }, function (err, res, aggregation) {
+                assert.ok(!err, err);
+                assert.ok(aggregation);
+                assert.equal(aggregation.type, 'aggregation');
+
+                assert.equal(aggregation.categories.length, 6);
+
+                assert.deepEqual(
+                    aggregation.categories[0],
+                    { category: 'China', value: 374537585, agg: false }
+                );
+
+                assert.deepEqual(
+                    aggregation.categories[aggregation.categories.length - 1],
+                    { category: 'Other', value: 1412626289, agg: true }
+                );
+
+                done();
+            });
+        });
+
+    });
+
+});

test/support/prepare_db.sh

@@ -75,8 +75,8 @@ 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='windshaft.test gadm4 ported/populated_places_simple_reduced'
-  REMOTE_SQL_SCRIPTS='CDB_QueryStatements CDB_QueryTables CDB_CartodbfyTable CDB_TableMetadata CDB_ForeignTable CDB_UserTables CDB_ColumnNames CDB_AnalysisCatalog CDB_ZoomFromScale CDB_Overviews CDB_QuantileBins CDB_JenksBins CDB_HeadsTailsBins CDB_EqualIntervalBins CDB_Hexagon CDB_XYZ'
+  LOCAL_SQL_SCRIPTS='analysis_catalog windshaft.test gadm4 ported/populated_places_simple_reduced'
+  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=""
   for i in ${REMOTE_SQL_SCRIPTS}

test/support/sql/analysis_catalog.sql

@@ -0,0 +1,30 @@
+-- Table to register analysis nodes from https://github.com/cartodb/camshaft
+CREATE TABLE IF NOT EXISTS
+    cartodb.cdb_analysis_catalog (
+-- useful for multi account deployments
+    username text,
+-- md5 hex hash
+    node_id char(40) CONSTRAINT cdb_analysis_catalog_pkey PRIMARY KEY,
+-- being json allows to do queries like analysis_def->>'type' = 'buffer'
+    analysis_def json NOT NULL,
+-- can reference other nodes in this very same table, allowing recursive queries
+    input_nodes char(40) ARRAY NOT NULL DEFAULT '{}',
+    status TEXT NOT NULL DEFAULT 'pending',
+    CONSTRAINT valid_status CHECK (
+        status IN ( 'pending', 'waiting', 'running', 'canceled', 'failed', 'ready' )
+    ),
+    created_at timestamp with time zone NOT NULL DEFAULT now(),
+-- should be updated when some operation was performed in the node
+-- and anything associated to it might have changed
+    updated_at timestamp with time zone DEFAULT NULL,
+-- should register last time the node was used
+    used_at timestamp with time zone NOT NULL DEFAULT now(),
+-- should register the number of times the node was used
+    hits NUMERIC DEFAULT 0,
+-- should register what was the last node using current node
+    last_used_from char(40),
+-- last job modifying the node
+    last_modified_by uuid,
+-- store error message for failures
+    last_error_message text
+);

test/support/sql/windshaft.test.sql

@@ -633,3 +633,18 @@ GRANT SELECT ON TABLE analysis_rent_listings TO :PUBLICUSER;
 
 --
 GRANT SELECT, UPDATE, INSERT, DELETE ON cdb_analysis_catalog TO :TESTUSER;
+
+create schema cdb_crankshaft;
+GRANT USAGE ON SCHEMA cdb_crankshaft TO :TESTUSER;
+CREATE TYPE kmeans_type as (cartodb_id numeric, cluster_no numeric);
+CREATE OR REPLACE FUNCTION cdb_crankshaft.CDB_KMeans(query text, no_clusters integer,no_init integer default 20)
+    RETURNS setof kmeans_type as $$
+    DECLARE r kmeans_type;
+    BEGIN
+    FOR r IN EXECUTE format('select cartodb_id, ceil(random() * 10) AS cluster_no from (%s) _cdb_query', query) loop
+        RETURN NEXT r;
+    END LOOP;
+    RETURN;
+    END;
+$$ LANGUAGE plpgsql;
+GRANT ALL ON FUNCTION cdb_crankshaft.CDB_KMeans(text, integer, integer) TO :TESTUSER;

test/support/test-client.js

@@ -24,6 +24,48 @@ function TestClient(mapConfig, apiKey) {
 
 module.exports = TestClient;
 
+module.exports.RESPONSE = {
+    ERROR: {
+        status: 400,
+        headers: {
+            'Content-Type': 'application/json; charset=utf-8'
+        }
+    }
+};
+
+module.exports.CARTOCSS = {
+    POINTS: [
+        '#layer{',
+        '  marker-placement: point;',
+        '  marker-allow-overlap: true;',
+        '  marker-line-opacity: 0.2;',
+        '  marker-line-width: 0.5;',
+        '  marker-opacity: 1;',
+        '  marker-width: 5;',
+        '  marker-fill: red;',
+        '}'
+    ].join('\n'),
+
+    LINES: [
+        '#lines {',
+        '  line-color: black;',
+        '  line-width: 1;',
+        '  line-opacity: 1;',
+        '}'
+    ].join('\n'),
+
+    POLYGONS: [
+        '#layer {',
+        '  polygon-fill: red;',
+        '  polygon-opacity: 0.6;',
+        '  polygon-opacity: 0.7;',
+        '  line-color: #FFF;',
+        '  line-width: 0.5;',
+        '  line-opacity: 1;',
+        '}'
+    ].join('\n')
+};
+
 TestClient.prototype.getWidget = function(widgetName, params, callback) {
     var self = this;
 
@@ -310,9 +352,13 @@ TestClient.prototype.getDataview = function(dataviewName, params, callback) {
             var urlParams = {
                 own_filter: params.hasOwnProperty('own_filter') ? params.own_filter : 1
             };
-            if (params && params.bbox) {
-                urlParams.bbox = params.bbox;
-            }
+
+            ['bbox', 'bins', 'start', 'end'].forEach(function(extraParam) {
+                if (params.hasOwnProperty(extraParam)) {
+                    urlParams[extraParam] = params[extraParam];
+                }
+            });
+
             if (self.apiKey) {
                 urlParams.api_key = self.apiKey;
             }
@@ -341,10 +387,10 @@ TestClient.prototype.getDataview = function(dataviewName, params, callback) {
                 }
             );
         },
-        function finish(err, res) {
+        function finish(err, dataview) {
             self.keysToDelete['map_cfg|' + LayergroupToken.parse(layergroupId).token] = 0;
             self.keysToDelete['user:localhost:mapviews:global'] = 5;
-            return callback(err, res);
+            return callback(err, dataview);
         }
     );
 };