Release 2.47.0

Upgrades camshaft to 0.14.0

.travis.yml

@@ -1,18 +1,14 @@
-dist: precise
-
 sudo: false
 
 addons:
-  postgresql: "9.3"
+  postgresql: "9.4"
   apt:
     packages:
-      - postgresql-9.3-postgis-2.1
-      - postgresql-plpython-9.3
+      - postgresql-plpython-9.4
       - pkg-config
       - libcairo2-dev
       - libjpeg8-dev
       - libgif-dev
-      - libpango1.0-dev
 
 before_install:
   - npm install -g npm@2

Makefile

@@ -43,7 +43,7 @@ jshint:
 	@echo "***jshint***"
 	@./node_modules/.bin/jshint lib/ test/ app.js
 
-test-all: jshint test
+test-all: test jshint
 
 coverage:
 	@RUNTESTFLAGS=--with-coverage make test

NEWS.md

@@ -1,12 +1,69 @@
 # Changelog
 
-## 2.43.2
+## 2.47.0
 
-Released 2017-09-01
+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:
- - Adding a new cartodb-psql fixing a pg vulnerability
- 
+ - 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
+
+Improvements:
+ - Removes Windshaft's widgets dependency.
+ - Makes widgets/dataviews endpoint compatible, but all using dataviews backend instead of widgets from Windshaft.
+ - Keeps adding widgets metadata in map instantiations for old clients.
+
+Announcements:
+ - Upgrades windshaft to [2.0.1](https://github.com/CartoDB/camshaft/releases/tag/2.0.1 )
+ - Upgrades camshaft to [0.12.1](https://github.com/CartoDB/camshaft/releases/tag/0.12.1)
+ - Upgrades turbo-carto to [0.10.1](https://github.com/CartoDB/turbo-carto/releases/tag/0.10.1)
+
+
+## 2.44.1
+
+Released 2016-06-01
+
+Improvements:
+ - Extend overviews support to histogram and aggregation dataviews
+ - Test improvements
+
+
+## 2.44.0
+
+Released 2016-05-31
+
+Announcements:
+ - Upgrades camshaft to [0.11.0](https://github.com/CartoDB/camshaft/releases/tag/0.11.0)
+ - Upgrades turbo-carto to [0.10.0](https://github.com/CartoDB/turbo-carto/releases/tag/0.10.0)
+
+New features:
+ - Adds support for sql wrap in all layers
+
+Bug fixes:
+ - Fail on turbo-carto invalid quantification methods
+
 
 ## 2.43.1
 

docs/MapConfig-Analyses-extension.md

@@ -0,0 +1,93 @@
+# 1. Purpose
+
+This specification describes an extension for
+[MapConfig 1.4.0](https://github.com/CartoDB/Windshaft/blob/master/doc/MapConfig-1.4.0.md) version.
+
+
+# 2. Changes over specification
+
+This extension targets layers with `sql` option, including layer types: `cartodb`, `mapnik`, and `torque`.
+
+It extends MapConfig with a new attribute: `analyses`.
+
+## 2.1 Analyses attribute
+
+The new analyses attribute must be an array of analyses as per [camshaft](https://github.com/CartoDB/camshaft). Each
+analysis must adhere to the [camshaft-reference](https://github.com/CartoDB/camshaft/blob/0.8.0/reference/versions/0.7.0/reference.json) specification.
+
+Each node can have an id that can be later references to consume the query from MapConfig's layers.
+
+Basic analyses example:
+
+```javascript
+[
+    {
+        // REQUIRED
+        // string, `id` free identifier that can be reference from any layer
+        "id": "HEAD",
+        // REQUIRED
+        // string, `type` camshaft's analysis type
+        "type": "source",
+        // REQUIRED
+        // object, `params` will depend on `type`, check camshaft-reference for more information
+        "params": {
+            "query": "select * from your_table"
+        }
+    }
+]
+```
+
+# 2.2. Integration with layers
+
+As pointed before an analysis node id can be referenced from layers to consume its output query.
+
+The layer consuming the output must reference it with the following option:
+
+```
+{
+    "options": {
+        // REQUIRED
+        // object, `source` as in the future we might want to have other source options
+        "source": {
+            // REQUIRED
+            // string, `id` the analysis node identifier
+            "id": "HEAD"
+        }
+    }
+}
+```
+
+## 2.3. Complete example
+
+```
+{
+    "version": "1.4.0",
+    "layers": [
+        {
+            "type": "cartodb",
+            "options": {
+                "source": {
+                    "id": "HEAD"
+                },
+                "cartocss": "...",
+                "cartocss_version": "2.3.0"
+            }
+        }
+    ],
+    "analyses": [
+        {
+            "id": "HEAD",
+            "type": "source",
+            "params": {
+                "query": "select * from your_table"
+            }
+        }
+    ]
+}
+```
+
+# History
+
+## 1.0.0
+
+ - Initial version

docs/MapConfig-Dataviews-extension.md

@@ -0,0 +1,314 @@
+# 1. Purpose
+
+This specification describes an extension for
+[MapConfig 1.4.0](https://github.com/CartoDB/Windshaft/blob/master/doc/MapConfig-1.4.0.md) version.
+
+
+# 2. Changes over specification
+
+This extension depends on Analyses extension. It extends MapConfig with a new attribute: `dataviews`.
+
+It makes possible to get tabular data from analysis nodes: lists, aggregated lists, aggregations, and histograms.
+
+## 2.1. Dataview types
+
+### List
+
+A list is a simple result set per row where is possible to retrieve several columns from the original layer query.
+
+Definition
+```
+{
+    // REQUIRED
+    // string, `type` the list type
+    “type”: “list”,
+    // REQUIRED
+    // object, `options` dataview params
+    “options”: {
+        // REQUIRED
+        // array, `columns` to select for the list
+        “columns”: [“name”, “description”]
+    }
+}
+```
+
+Expected output
+```
+{
+  "type": "list",
+  "rows": [
+    {
+      "{columnName1}": "val1",
+      "{columnName2}": 100
+    },
+    {
+      "{columnName1}": "val2",
+      "{columnName2}": 200
+    }
+  ]
+}
+```
+
+### Aggregation
+
+An aggregation is very similar to a list but results are aggregated by a column and a given aggregation function.
+
+Definition
+```
+{
+    // REQUIRED
+    // string, `type` the aggregation type
+    “type”: “aggregation”,
+    // REQUIRED
+    // object, `options` dataview params
+    “options”: {
+        // REQUIRED
+        // string, `column` column name to aggregate by
+        “column”: “country”,
+        // REQUIRED
+        // string, `aggregation` operation to perform
+        “aggregation”: “count”
+        // OPTIONAL
+        // string, `aggregationColumn` column value to aggregate
+        // This param is required when `aggregation` is different than "count"
+        “aggregationColumn”: “population”
+    }
+}
+```
+
+Expected output
+```
+{
+  "type": "aggregation",
+  "categories": [
+    {
+      "category": "foo",
+      "value": 100
+    },
+    {
+      "category": "bar",
+      "value": 200
+    }
+  ]
+}
+```
+
+### Histograms
+
+Histograms represent the data distribution for a column.
+
+Definition
+```
+{
+    // REQUIRED
+    // string, `type` the histogram type
+    “type”: “histogram”,
+    // REQUIRED
+    // object, `options` dataview params
+    “options”: {
+        // REQUIRED
+        // string, `column` column name to aggregate by
+        “column”: “name”,
+        // OPTIONAL
+        // number, `bins` how many buckets the histogram should use
+        “bins”: 10
+    }
+}
+```
+
+Expected output
+```
+{
+  "type": "histogram",
+  "bins": [{"bin": 0, "start": 2, "end": 2, "min": 2, "max": 2, "freq": 1}, null, null, {"bin": 3, "min": 40, "max": 44, "freq": 2}, null],
+  "width": 10
+}
+```
+
+### Formula
+
+Formulas given a final value representing the whole dataset.
+
+Definition
+```
+{
+    // REQUIRED
+    // string, `type` the formula type
+    “type”: “formula”,
+    // REQUIRED
+    // object, `options` dataview params
+    “options”: {
+        // REQUIRED
+        // string, `column` column name to aggregate by
+        “column”: “name”,
+        // REQUIRED
+        // string, `aggregation` operation to perform
+        “operation”: “count”
+    }
+}
+```
+
+Operation must be: “min”, “max”, “count”, “avg”, or “sum”.
+
+Result
+```
+{
+  "type": "formula",
+  "operation": "count",
+  "result": 1000,
+  "nulls": 0
+}
+```
+
+
+## 2.2 Dataviews attribute
+
+The new dataviews attribute must be a dictionary of dataviews.
+
+An analysis node id can be referenced from dataviews to consume its output query.
+
+
+The layer consuming the output must reference it with the following option:
+
+```
+{
+    // REQUIRED
+    // object, `source` as in the future we might want to have other source options
+    "source": {
+        // REQUIRED
+        // string, `id` the analysis node identifier
+        "id": "HEAD"
+    }
+}
+```
+
+## 2.3. Complete example
+
+```
+{
+    "version": "1.4.0",
+    "layers": [
+        {
+            "type": "cartodb",
+            "options": {
+                "source": {
+                    "id": "HEAD"
+                },
+                "cartocss": "...",
+                "cartocss_version": "2.3.0"
+            }
+        }
+    ],
+    "dataviews" {
+        "basic_histogram": {
+            "source": {
+                "id": "HEAD"
+            },
+            "type": "histogram",
+            "options": {
+                "column": "pop_max"
+            }
+        }
+    },
+    "analyses": [
+        {
+            "id": "HEAD",
+            "type": "source",
+            "params": {
+                "query": "select * from your_table"
+            }
+        }
+    ]
+}
+```
+
+## 3. Filters
+
+Camshaft's analyses expose a filtering capability and `aggregation` and `histogram` dataviews get them for free with
+ this extension. Filters are available with the very dataview id, so if you have a "basic_histogram" histogram dataview
+ you can filter with a range filter with "basic_histogram" name.
+
+
+## 3.1 Filter types
+
+### Category
+
+Allows to remove results that are not contained within a set of elements.
+Initially this filter can be applied to a `numeric` or `text` columns.
+
+Params
+
+```
+{
+    “accept”: [“Spain”, “Germany”]
+    “reject”: [“Japan”]
+}
+```
+
+### Range filter
+
+Allows to remove results that don’t satisfy numeric min and max values.
+Filter is applied to a numeric column.
+
+Params
+
+```
+{
+    “min”: 0,
+    “max”: 1000
+}
+```
+
+## 3.2. How to apply filters
+
+Filters must be applied at map instantiation time.
+
+With :mapconfig as a valid MapConfig and with :filters (a valid JSON) as:
+
+### Anonymous map
+
+`GET /api/v1/map?config=:mapconfig&filters=:filters`
+
+`POST /api/v1/map?filters=:filters`
+with `BODY=:mapconfig`
+
+If in the future we need to support a bigger filters param and it doesn’t fit in the query string,
+ we might solve it by accepting:
+
+`POST /api/v1/map`
+with `BODY={“config”: :mapconfig, “filters”: :filters}`
+
+### Named map
+
+Assume :params (a valid JSON) as named maps params, like in: `{“color”: “red”}`
+
+`GET /api/v1/named/:name/jsonp?config=:params&filters=:filters&callback=cb`
+
+`POST /api/v1/named/:name?filters=:filters`
+with `BODY=:params`
+
+If, again, in the future we need to support a bigger filters param that doesn’t fit in the query string,
+ we might solve it by accepting:
+
+`POST /api/v1/named/:name`
+with `BODY={“config”: :params, “filters”: :filters}`
+
+
+## 3.3 Bounding box special filter
+
+A bounding box filter allows to remove results that don’t satisfy a geospatial range.
+
+The bounding box special filter is available per dataview and there is no need to create a bounding box definition as
+it’s always possible to apply a bbox filter per dataview.
+
+A dataview can get its result filtered by bounding box by sending a bbox param in the query string,
+param must be in the form `west,south,east,north`.
+
+So applying a bbox filter to a dataview looks like:
+GET /api/v1/map/:layergroupid/dataview/:dataview_name?bbox=-90,-45,90,45
+
+# History
+
+## 1.0.0-alpha
+
+ - WIP document

lib/cartodb/backends/dataview.js

@@ -123,7 +123,7 @@ DataviewBackend.prototype.getDataview = function (mapConfigProvider, user, param
             var queryRewriteData = layer && layer.options.query_rewrite_data;
             if ( queryRewriteData ) {
                 if ( node.type === 'source' ) {
-                    var filters = node.filters; // TODO: node.getFilters() when available in camshaft
+                    var filters = node.getFilters();
                     var filters_disabler = Object.keys(filters).reduce(
                         function(disabler, filter_id){ disabler[filter_id] = false; return disabler; },
                         {}
@@ -137,14 +137,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

lib/cartodb/cache/named_map_provider_cache.js

@@ -1,24 +1,17 @@
 var _ = require('underscore');
 var dot = require('dot');
-var NamedMapMapConfigProvider = require('../models/mapconfig/named_map_provider');
-var MapConfigNamedLayersAdapter = require('../models/mapconfig_named_layers_adapter');
-var AnalysisMapConfigAdapter = require('../models/analysis-mapconfig-adapter');
+var NamedMapMapConfigProvider = require('../models/mapconfig/provider/named-map-provider');
 var templateName = require('../backends/template_maps').templateName;
 var queue = require('queue-async');
 
 var LruCache = require("lru-cache");
 
-function NamedMapProviderCache(templateMaps, pgConnection, metadataBackend, analysisBackend, userLimitsApi,
-                               overviewsAdapter, turboCartoAdapter) {
+function NamedMapProviderCache(templateMaps, pgConnection, metadataBackend, userLimitsApi, mapConfigAdapter) {
     this.templateMaps = templateMaps;
     this.pgConnection = pgConnection;
     this.metadataBackend = metadataBackend;
     this.userLimitsApi = userLimitsApi;
-
-    this.namedLayersAdapter = new MapConfigNamedLayersAdapter(templateMaps);
-    this.analysisMapConfigAdapter = new AnalysisMapConfigAdapter(analysisBackend);
-    this.overviewsAdapter = overviewsAdapter;
-    this.turboCartoAdapter = turboCartoAdapter;
+    this.mapConfigAdapter = mapConfigAdapter;
 
     this.providerCache = new LruCache({ max: 2000 });
 }
@@ -36,10 +29,7 @@ NamedMapProviderCache.prototype.get = function(user, templateId, config, authTok
             this.pgConnection,
             this.metadataBackend,
             this.userLimitsApi,
-            this.namedLayersAdapter,
-            this.overviewsAdapter,
-            this.turboCartoAdapter,
-            this.analysisMapConfigAdapter,
+            this.mapConfigAdapter,
             user,
             templateId,
             config,

lib/cartodb/controllers/layergroup.js

@@ -10,7 +10,7 @@ var userMiddleware = require('../middleware/user');
 var DataviewBackend = require('../backends/dataview');
 var AnalysisStatusBackend = require('../backends/analysis-status');
 
-var MapStoreMapConfigProvider = require('../models/mapconfig/map_store_provider');
+var MapStoreMapConfigProvider = require('../models/mapconfig/provider/map-store-provider');
 
 var QueryTables = require('cartodb-query-tables');
 
@@ -21,7 +21,6 @@ var QueryTables = require('cartodb-query-tables');
  * @param {TileBackend} tileBackend
  * @param {PreviewBackend} previewBackend
  * @param {AttributesBackend} attributesBackend
- * @param {WidgetBackend} widgetBackend
  * @param {SurrogateKeysCache} surrogateKeysCache
  * @param {UserLimitsApi} userLimitsApi
  * @param {LayergroupAffectedTables} layergroupAffectedTables
@@ -29,7 +28,7 @@ var QueryTables = require('cartodb-query-tables');
  * @constructor
  */
 function LayergroupController(authApi, pgConnection, mapStore, tileBackend, previewBackend, attributesBackend,
-                          widgetBackend, surrogateKeysCache, userLimitsApi, layergroupAffectedTables, analysisBackend) {
+                              surrogateKeysCache, userLimitsApi, layergroupAffectedTables, analysisBackend) {
     BaseController.call(this, authApi, pgConnection);
 
     this.pgConnection = pgConnection;
@@ -37,7 +36,6 @@ function LayergroupController(authApi, pgConnection, mapStore, tileBackend, prev
     this.tileBackend = tileBackend;
     this.previewBackend = previewBackend;
     this.attributesBackend = attributesBackend;
-    this.widgetBackend = widgetBackend;
     this.surrogateKeysCache = surrogateKeysCache;
     this.userLimitsApi = userLimitsApi;
     this.layergroupAffectedTables = layergroupAffectedTables;
@@ -78,21 +76,19 @@ LayergroupController.prototype.register = function(app) {
 
     // Undocumented/non-supported API endpoint methods.
     // Use at your own peril.
-    app.get(app.base_url_mapconfig +
-        '/:token/:layer/widget/:widgetName', cors(), userMiddleware,
-        this.widget.bind(this));
-
-    app.get(app.base_url_mapconfig +
-            '/:token/:layer/widget/:widgetName/search', cors(), userMiddleware,
-        this.widgetSearch.bind(this));
-
     app.get(app.base_url_mapconfig +
             '/:token/dataview/:dataviewName', cors(), userMiddleware,
         this.dataview.bind(this));
+    app.get(app.base_url_mapconfig +
+            '/:token/:layer/widget/:dataviewName', cors(), userMiddleware,
+        this.dataview.bind(this));
 
     app.get(app.base_url_mapconfig +
             '/:token/dataview/:dataviewName/search', cors(), userMiddleware,
         this.dataviewSearch.bind(this));
+    app.get(app.base_url_mapconfig +
+            '/:token/:layer/widget/:dataviewName/search', cors(), userMiddleware,
+        this.dataviewSearch.bind(this));
 
     app.get(app.base_url_mapconfig +
         '/:token/analysis/node/:nodeId', cors(), userMiddleware,
@@ -181,62 +177,6 @@ LayergroupController.prototype.dataviewSearch = function(req, res) {
 
 };
 
-LayergroupController.prototype.widget = function(req, res) {
-    var self = this;
-
-    step(
-        function setupParams() {
-            self.req2params(req, this);
-        },
-        function retrieveList(err) {
-            assert.ifError(err);
-
-            var mapConfigProvider = new MapStoreMapConfigProvider(
-                self.mapStore, req.context.user, self.userLimitsApi, req.params
-            );
-            self.widgetBackend.getWidget(mapConfigProvider, req.params, this);
-        },
-        function finish(err, widget, stats) {
-            req.profiler.add(stats || {});
-
-            if (err) {
-                self.sendError(req, res, err, 'GET WIDGET');
-            } else {
-                self.sendResponse(req, res, widget, 200);
-            }
-        }
-    );
-
-};
-
-LayergroupController.prototype.widgetSearch = function(req, res) {
-    var self = this;
-
-    step(
-        function setupParams() {
-            self.req2params(req, this);
-        },
-        function retrieveList(err) {
-            assert.ifError(err);
-
-            var mapConfigProvider = new MapStoreMapConfigProvider(
-                self.mapStore, req.context.user, self.userLimitsApi, req.params
-            );
-            self.widgetBackend.search(mapConfigProvider, req.params, this);
-        },
-        function finish(err, searchResult, stats) {
-            req.profiler.add(stats || {});
-
-            if (err) {
-                self.sendError(req, res, err, 'GET WIDGET');
-            } else {
-                self.sendResponse(req, res, searchResult, 200);
-            }
-        }
-    );
-
-};
-
 LayergroupController.prototype.attributes = function(req, res) {
     var self = this;
 

lib/cartodb/controllers/map.js

@@ -15,10 +15,8 @@ var Datasource = windshaft.model.Datasource;
 
 var NamedMapsCacheEntry = require('../cache/model/named_maps_entry');
 
-var MapConfigNamedLayersAdapter = require('../models/mapconfig_named_layers_adapter');
-var AnalysisMapConfigAdapter = require('../models/analysis-mapconfig-adapter');
-var NamedMapMapConfigProvider = require('../models/mapconfig/named_map_provider');
-var CreateLayergroupMapConfigProvider = require('../models/mapconfig/create_layergroup_provider');
+var NamedMapMapConfigProvider = require('../models/mapconfig/provider/named-map-provider');
+var CreateLayergroupMapConfigProvider = require('../models/mapconfig/provider/create-layergroup-provider');
 
 /**
  * @param {AuthApi} authApi
@@ -29,14 +27,11 @@ var CreateLayergroupMapConfigProvider = require('../models/mapconfig/create_laye
  * @param {SurrogateKeysCache} surrogateKeysCache
  * @param {UserLimitsApi} userLimitsApi
  * @param {LayergroupAffectedTables} layergroupAffectedTables
- * @param {MapConfigOverviewsAdapter} overviewsAdapter
- * @param {TurboCartoAdapter} turboCartoAdapter
- * @param {AnalysisBackend} analysisBackend
+ * @param {MapConfigAdapter} mapConfigAdapter
  * @constructor
  */
 function MapController(authApi, pgConnection, templateMaps, mapBackend, metadataBackend,
-                       surrogateKeysCache, userLimitsApi, layergroupAffectedTables,
-                       overviewsAdapter, turboCartoAdapter, analysisBackend) {
+                       surrogateKeysCache, userLimitsApi, layergroupAffectedTables, mapConfigAdapter) {
 
     BaseController.call(this, authApi, pgConnection);
 
@@ -47,11 +42,8 @@ function MapController(authApi, pgConnection, templateMaps, mapBackend, metadata
     this.surrogateKeysCache = surrogateKeysCache;
     this.userLimitsApi = userLimitsApi;
     this.layergroupAffectedTables = layergroupAffectedTables;
-    this.turboCartoAdapter = turboCartoAdapter;
 
-    this.analysisMapConfigAdapter = new AnalysisMapConfigAdapter(analysisBackend);
-    this.namedLayersAdapter = new MapConfigNamedLayersAdapter(templateMaps);
-    this.overviewsAdapter = overviewsAdapter;
+    this.mapConfigAdapter = mapConfigAdapter;
 }
 
 util.inherits(MapController, BaseController);
@@ -132,16 +124,17 @@ MapController.prototype.create = function(req, res, prepareConfigFn) {
     var self = this;
 
     var mapConfig;
-    var analysesResults = [];
+
+    var context = {};
 
     step(
         function setupParams(){
             self.req2params(req, this);
         },
         prepareConfigFn,
-        function prepareAnalysisLayers(err, requestMapConfig) {
+        function prepareAdapterMapConfig(err, requestMapConfig) {
             assert.ifError(err);
-            var analysisConfiguration = {
+            context.analysisConfiguration = {
                 db: {
                     host: req.params.dbhost,
                     port: req.params.dbport,
@@ -154,71 +147,12 @@ MapController.prototype.create = function(req, res, prepareConfigFn) {
                     apiKey: req.params.api_key
                 }
             };
-
-            var filters = {};
-            if (req.params.filters) {
-                try {
-                    filters = JSON.parse(req.params.filters);
-                } catch (e) {
-                    // ignore
-                }
-            }
-            self.analysisMapConfigAdapter.getMapConfig(analysisConfiguration, requestMapConfig, filters, this);
+            self.mapConfigAdapter.getMapConfig(req.context.user, requestMapConfig, req.params, context, this);
         },
-        function beforeLayergroupCreate(err, requestMapConfig, _analysesResults) {
+        function createLayergroup(err, requestMapConfig) {
             assert.ifError(err);
-            var next = this;
-            analysesResults = _analysesResults;
-            self.namedLayersAdapter.getLayers(req.context.user, requestMapConfig.layers, self.pgConnection,
-                function(err, layers, datasource) {
-                    if (err) {
-                        return next(err);
-                    }
-
-                    if (layers) {
-                        requestMapConfig.layers = layers;
-                    }
-                    return next(null, requestMapConfig, datasource);
-                }
-            );
-        },
-        function addOverviewsInformation(err, requestMapConfig, datasource) {
-            assert.ifError(err);
-            var next = this;
-            self.overviewsAdapter.getLayers(
-                req.context.user, requestMapConfig.layers, analysesResults,
-                function(err, layers) {
-                    if (err) {
-                        return next(err);
-                    }
-
-                    if (layers) {
-                        requestMapConfig.layers = layers;
-                    }
-
-                    return next(null, requestMapConfig, datasource);
-                }
-            );
-        },
-        function parseTurboCarto(err, requestMapConfig, datasource) {
-            assert.ifError(err);
-
-            var next = this;
-            self.turboCartoAdapter.getLayers(req.context.user, requestMapConfig.layers, function (err, layers) {
-                if (err) {
-                    return next(err);
-                }
-
-                if (layers) {
-                    requestMapConfig.layers = layers;
-                }
-
-                return next(null, requestMapConfig, datasource);
-            });
-        },
-        function createLayergroup(err, requestMapConfig, datasource) {
-            assert.ifError(err);
-            mapConfig = new MapConfig(requestMapConfig, datasource || Datasource.EmptyDatasource());
+            var datasource = context.datasource || Datasource.EmptyDatasource();
+            mapConfig = new MapConfig(requestMapConfig, datasource);
             self.mapBackend.createLayergroup(
                 mapConfig, req.params,
                 new CreateLayergroupMapConfigProvider(mapConfig, req.context.user, self.userLimitsApi, req.params),
@@ -227,14 +161,15 @@ MapController.prototype.create = function(req, res, prepareConfigFn) {
         },
         function afterLayergroupCreate(err, layergroup) {
             assert.ifError(err);
-            self.afterLayergroupCreate(req, res, mapConfig, analysesResults, layergroup, this);
+            self.afterLayergroupCreate(req, res, mapConfig, layergroup, this);
         },
         function finish(err, layergroup) {
             if (err) {
                 self.sendError(req, res, err, 'ANONYMOUS LAYERGROUP');
             } else {
-                addWidgetsUrl(req.context.user, layergroup);
-
+                var analysesResults = context.analysesResults || [];
+                addDataviewsAndWidgetsUrls(req.context.user, layergroup, mapConfig.obj());
+                addAnalysesMetadata(req.context.user, layergroup, analysesResults, true);
                 res.set('X-Layergroup-Id', layergroup.layergroupid);
                 self.send(req, res, layergroup, 200);
             }
@@ -264,10 +199,7 @@ MapController.prototype.instantiateTemplate = function(req, res, prepareParamsFn
                 self.pgConnection,
                 self.metadataBackend,
                 self.userLimitsApi,
-                self.namedLayersAdapter,
-                self.overviewsAdapter,
-                self.turboCartoAdapter,
-                self.analysisMapConfigAdapter,
+                self.mapConfigAdapter,
                 cdbuser,
                 req.params.template_id,
                 templateParams,
@@ -287,7 +219,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, this);
         },
         function finishTemplateInstantiation(err, layergroup) {
             if (err) {
@@ -296,8 +228,7 @@ MapController.prototype.instantiateTemplate = function(req, res, prepareParamsFn
                 var templateHash = self.templateMaps.fingerPrint(mapConfigProvider.template).substring(0, 8);
                 layergroup.layergroupid = cdbuser + '@' + templateHash + '@' + layergroup.layergroupid;
 
-                addWidgetsUrl(cdbuser, layergroup);
-                addDataviewsUrls(cdbuser, layergroup, mapConfig.obj());
+                addDataviewsAndWidgetsUrls(cdbuser, layergroup, mapConfig.obj());
                 addAnalysesMetadata(cdbuser, layergroup, mapConfigProvider.analysesResults);
 
                 res.set('X-Layergroup-Id', layergroup.layergroupid);
@@ -309,8 +240,7 @@ MapController.prototype.instantiateTemplate = function(req, res, prepareParamsFn
     );
 };
 
-
-MapController.prototype.afterLayergroupCreate = function(req, res, mapconfig, analysesResults, layergroup, callback) {
+MapController.prototype.afterLayergroupCreate = function(req, res, mapconfig, layergroup, callback) {
     var self = this;
 
     var username = req.context.user;
@@ -373,10 +303,6 @@ MapController.prototype.afterLayergroupCreate = function(req, res, mapconfig, an
             layergroup.layergroupid = layergroup.layergroupid + ':' + result.getLastUpdatedAt();
             layergroup.last_updated = new Date(result.getLastUpdatedAt()).toISOString();
 
-            // TODO this should take into account several URL patterns
-            addWidgetsUrl(username, layergroup);
-            addDataviewsUrls(username, layergroup, mapconfig.obj());
-            addAnalysesMetadata(username, layergroup, analysesResults, true);
             if (req.method === 'GET') {
                 var ttl = global.environment.varnish.layergroupTtl || 86400;
                 res.set('Cache-Control', 'public,max-age='+ttl+',must-revalidate');
@@ -421,6 +347,12 @@ function addAnalysesMetadata(username, layergroup, analysesResults, includeQuery
     });
 }
 
+// TODO this should take into account several URL patterns
+function addDataviewsAndWidgetsUrls(username, layergroup, mapConfig) {
+    addDataviewsUrls(username, layergroup, mapConfig);
+    addWidgetsUrl(username, layergroup, mapConfig);
+}
+
 function addDataviewsUrls(username, layergroup, mapConfig) {
     layergroup.metadata.dataviews = layergroup.metadata.dataviews || {};
     var dataviews = mapConfig.dataviews || {};
@@ -433,20 +365,23 @@ function addDataviewsUrls(username, layergroup, mapConfig) {
     });
 }
 
-function addWidgetsUrl(username, layergroup) {
-
-    if (layergroup.metadata && Array.isArray(layergroup.metadata.layers)) {
+function addWidgetsUrl(username, layergroup, mapConfig) {
+    if (layergroup.metadata && Array.isArray(layergroup.metadata.layers) && Array.isArray(mapConfig.layers)) {
         layergroup.metadata.layers = layergroup.metadata.layers.map(function(layer, layerIndex) {
-            if (layer.widgets) {
-                Object.keys(layer.widgets).forEach(function(widgetName) {
+            var mapConfigLayer = mapConfig.layers[layerIndex];
+            if (mapConfigLayer.options && mapConfigLayer.options.widgets) {
+                layer.widgets = layer.widgets || {};
+                Object.keys(mapConfigLayer.options.widgets).forEach(function(widgetName) {
                     var resource = layergroup.layergroupid + '/' + layerIndex + '/widget/' + widgetName;
-                    layer.widgets[widgetName].url = getUrls(username, resource);
+                    layer.widgets[widgetName] = {
+                        type: mapConfigLayer.options.widgets[widgetName].type,
+                        url: getUrls(username, resource)
+                    };
                 });
             }
             return layer;
         });
     }
-
 }
 
 function getUrls(username, resource) {

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

@@ -102,7 +102,7 @@ Aggregation.prototype.constructor = Aggregation;
 
 module.exports = Aggregation;
 
-Aggregation.prototype.sql = function(psql, filters, override, callback) {
+Aggregation.prototype.sql = function(psql, override, callback) {
     if (!callback) {
         callback = override;
         override = {};

lib/cartodb/models/dataview/formula.js

@@ -56,7 +56,7 @@ Formula.prototype.constructor = Formula;
 
 module.exports = Formula;
 
-Formula.prototype.sql = function(psql, filters, override, callback) {
+Formula.prototype.sql = function(psql, override, callback) {
     if (!callback) {
         callback = override;
         override = {};

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/dataview/list.js

@@ -34,7 +34,7 @@ List.prototype.constructor = List;
 
 module.exports = List;
 
-List.prototype.sql = function(psql, filters, override, callback) {
+List.prototype.sql = function(psql, override, callback) {
     if (!callback) {
         callback = override;
     }

lib/cartodb/models/dataview/overviews/aggregation.js

@@ -0,0 +1,141 @@
+var BaseOverviewsDataview = require('./base');
+var BaseDataview = require('../aggregation');
+
+var dot = require('dot');
+dot.templateSettings.strip = false;
+
+var summaryQueryTpl = dot.template([
+    'summary AS (',
+    '  SELECT',
+    '  sum(_feature_count) AS count,',
+    '  sum(CASE WHEN {{=it._column}} IS NULL THEN 1 ELSE 0 END) AS nulls_count',
+    '  FROM ({{=it._query}}) _cdb_aggregation_nulls',
+    ')'
+].join('\n'));
+
+var rankedCategoriesQueryTpl = dot.template([
+    'categories AS(',
+    '  SELECT {{=it._column}} AS category, {{=it._aggregation}} AS value,',
+    '    row_number() OVER (ORDER BY {{=it._aggregation}} desc) as rank',
+    '  FROM ({{=it._query}}) _cdb_aggregation_all',
+    '  GROUP BY {{=it._column}}',
+    '  ORDER BY 2 DESC',
+    ')'
+].join('\n'));
+
+var categoriesSummaryQueryTpl = dot.template([
+    'categories_summary AS(',
+    '  SELECT count(1) categories_count, max(value) max_val, min(value) min_val',
+    '  FROM categories',
+    ')'
+].join('\n'));
+
+var rankedAggregationQueryTpl = dot.template([
+    'SELECT CAST(category AS text), value, false as agg, nulls_count, min_val, max_val, count, categories_count',
+    '  FROM categories, summary, categories_summary',
+    '  WHERE rank < {{=it._limit}}',
+    'UNION ALL',
+    'SELECT \'Other\' category, sum(value), true as agg, nulls_count, min_val, max_val, count, categories_count',
+    '  FROM categories, summary, categories_summary',
+    '  WHERE rank >= {{=it._limit}}',
+    'GROUP BY nulls_count, min_val, max_val, count, categories_count'
+].join('\n'));
+
+var aggregationQueryTpl = dot.template([
+    'SELECT CAST({{=it._column}} AS text) AS category, {{=it._aggregation}} AS value, false as agg,',
+    '  nulls_count, min_val, max_val, count, categories_count',
+    'FROM ({{=it._query}}) _cdb_aggregation_all, summary, categories_summary',
+    'GROUP BY category, nulls_count, min_val, max_val, count, categories_count',
+    'ORDER BY value DESC'
+].join('\n'));
+
+var CATEGORIES_LIMIT = 6;
+
+ function Aggregation(query, options, queryRewriter, queryRewriteData, params) {
+    BaseOverviewsDataview.call(this, query, options, BaseDataview, queryRewriter, queryRewriteData, params);
+
+    this.query = query;
+    this.column = options.column;
+    this.aggregation = options.aggregation;
+    this.aggregationColumn = options.aggregationColumn;
+}
+
+Aggregation.prototype = Object.create(BaseOverviewsDataview.prototype);
+Aggregation.prototype.constructor = Aggregation;
+
+module.exports = Aggregation;
+
+Aggregation.prototype.sql = function(psql, filters, override, callback) {
+    if (!callback) {
+        callback = override;
+        override = {};
+    }
+
+    var _query = this.rewrittenQuery(this.query);
+
+    var aggregationSql;
+    if (!!override.ownFilter) {
+        aggregationSql = [
+            "WITH",
+            [
+                summaryQueryTpl({
+                    _query: _query,
+                    _column: this.column
+                }),
+                rankedCategoriesQueryTpl({
+                    _query: _query,
+                    _column: this.column,
+                    _aggregation: this.getAggregationSql()
+                }),
+                categoriesSummaryQueryTpl({
+                    _query: _query,
+                    _column: this.column
+                })
+            ].join(',\n'),
+            aggregationQueryTpl({
+                _query: _query,
+                _column: this.column,
+                _aggregation: this.getAggregationSql(),
+                _limit: CATEGORIES_LIMIT
+            })
+        ].join('\n');
+    } else {
+        aggregationSql = [
+            "WITH",
+            [
+                summaryQueryTpl({
+                    _query: _query,
+                    _column: this.column
+                }),
+                rankedCategoriesQueryTpl({
+                    _query: _query,
+                    _column: this.column,
+                    _aggregation: this.getAggregationSql()
+                }),
+                categoriesSummaryQueryTpl({
+                    _query: _query,
+                    _column: this.column
+                })
+            ].join(',\n'),
+            rankedAggregationQueryTpl({
+                _query: _query,
+                _column: this.column,
+                _limit: CATEGORIES_LIMIT
+            })
+        ].join('\n');
+    }
+
+    return callback(null, aggregationSql);
+};
+
+var aggregationFnQueryTpl = {
+    count: dot.template('sum(_feature_count)'),
+    sum:   dot.template('sum({{=it._aggregationColumn}}*_feature_count)')
+};
+
+Aggregation.prototype.getAggregationSql = function() {
+    return aggregationFnQueryTpl[this.aggregation]({
+        _aggregationFn: this.aggregation,
+        _aggregationColumn: this.aggregationColumn || 1
+    });
+};

lib/cartodb/models/dataview/overviews/base.js

@@ -0,0 +1,88 @@
+var _ = require('underscore');
+var BaseDataview = require('../base');
+
+function BaseOverviewsDataview(query, queryOptions, BaseDataview, queryRewriter, queryRewriteData, options) {
+  this.BaseDataview = BaseDataview;
+  this.query = query;
+  this.queryOptions = queryOptions;
+  this.queryRewriter = queryRewriter;
+  this.queryRewriteData = queryRewriteData;
+  this.options = options;
+  this.baseDataview = new this.BaseDataview(this.query, this.queryOptions);
+}
+
+module.exports = BaseOverviewsDataview;
+
+BaseOverviewsDataview.prototype = new BaseDataview();
+BaseOverviewsDataview.prototype.constructor = BaseOverviewsDataview;
+
+// TODO: parameterized these settings
+var SETTINGS = {
+    // use overviews as a default fallback strategy
+    defaultOverviews: false,
+
+    // minimum ratio of bounding box size to grid size
+    // (this would ideally be based on the viewport size in pixels)
+    zoomLevelFactor: 1024.0
+};
+
+// Compute zoom level so that the the resolution grid size of the
+// selected overview is smaller (zoomLevelFactor times smaller at least)
+// than the bounding box size.
+BaseOverviewsDataview.prototype.zoomLevelForBbox = function(bbox) {
+    var pxPerTile = 256.0;
+    var earthWidth = 360.0;
+    // TODO: now we assume overviews are computed for 1-pixel tolerance;
+    // should use extended overviews metadata to compute this properly.
+    if ( bbox ) {
+      var bboxValues = _.map(bbox.split(','), function(v) { return +v; });
+      var w = Math.abs(bboxValues[2]-bboxValues[0]);
+      var h = Math.abs(bboxValues[3]-bboxValues[1]);
+      var maxDim = Math.min(w, h);
+
+      // Find minimum suitable z
+      // note that the QueryRewirter will use the minimum level overview
+      // of level >= z if it exists, and otherwise the base table
+      var z = Math.ceil(-Math.log(maxDim*pxPerTile/earthWidth/SETTINGS.zoomLevelFactor)/Math.log(2.0));
+      return Math.max(z, 0);
+    }
+    return 0;
+};
+
+BaseOverviewsDataview.prototype.rewrittenQuery = function(query) {
+    var zoom_level = this.zoomLevelForBbox(this.options.bbox);
+    return this.queryRewriter.query(query, this.queryRewriteData, { zoom_level: zoom_level });
+};
+
+// Default behaviour
+BaseOverviewsDataview.prototype.defaultSql = function(psql, filters, override, callback) {
+    var query = this.query;
+    var dataview = this.baseDataview;
+    if ( SETTINGS.defaultOverviews ) {
+        query = this.rewrittenQuery(query);
+        dataview = new this.BaseDataview(query, this.queryOptions);
+    }
+    return dataview.sql(psql, filters, override, callback);
+};
+
+// default implementation that can be override in derived classes:
+
+BaseOverviewsDataview.prototype.sql = function(psql, filters, override, callback) {
+    return this.defaultSql(psql, filters, override, callback);
+};
+
+BaseOverviewsDataview.prototype.search = function(psql, userQuery, callback) {
+    return this.baseDataview.search(psql, userQuery, callback);
+};
+
+BaseOverviewsDataview.prototype.format = function(result) {
+    return this.baseDataview.format(result);
+};
+
+BaseOverviewsDataview.prototype.getType = function() {
+    return this.baseDataview.getType();
+};
+
+BaseOverviewsDataview.prototype.toString = function() {
+    return this.baseDataview.toString();
+};

lib/cartodb/models/dataview/overviews/formula.js

@@ -1,9 +1,6 @@
-var _ = require('underscore');
-var BaseWidget = require('../base');
+var BaseOverviewsDataview = require('./base');
 var BaseDataview = require('../formula');
 
-var debug = require('debug')('windshaft:widget:formula:overviews');
-
 var dot = require('dot');
 dot.templateSettings.strip = false;
 
@@ -29,76 +26,31 @@ var formulaQueryTpls = {
 };
 
 function Formula(query, options, queryRewriter, queryRewriteData, params) {
-    this.base_dataview = new BaseDataview(query, options);
-    this.query = query;
+    BaseOverviewsDataview.call(this, query, options, BaseDataview, queryRewriter, queryRewriteData, params);
     this.column = options.column || '1';
     this.operation = options.operation;
-    this.queryRewriter = queryRewriter;
-    this.queryRewriteData = queryRewriteData;
-    this.options = params;
 }
 
-Formula.prototype = new BaseWidget();
+Formula.prototype = Object.create(BaseOverviewsDataview.prototype);
 Formula.prototype.constructor = Formula;
 
 module.exports = Formula;
 
-var zoom_level_factor = 100.0;
-
-// Compute zoom level so that the the resolution grid size of the
-// selected overview is smaller (zoom_level_factor times smaller at least)
-// than the bounding box size.
-function zoom_level_for_bbox(bbox) {
-    var px_per_tile = 256.0;
-    var earth_width = 360.0;
-    // TODO: now we assume overviews are computed for 1-pixel tolerance;
-    // should use extended overviews metadata to compute this properly.
-    if ( bbox ) {
-      var bbox_values = _.map(bbox.split(','), function(v) { return +v; });
-      var w = Math.abs(bbox_values[2]-bbox_values[0]);
-      var h = Math.abs(bbox_values[3]-bbox_values[1]);
-      var max_dim = Math.min(w, h);
-
-      // Find minimum suitable z
-      // note that the QueryRewirter will use the minimum level overview
-      // of level >= z if it exists, and otherwise the base table
-      var z = Math.ceil(-Math.log(max_dim*px_per_tile/earth_width/zoom_level_factor)/Math.log(2.0));
-      return Math.max(z, 0);
-    }
-    return 0;
-}
-
 Formula.prototype.sql = function(psql, filters, override, callback) {
-    var _query = this.query;
     var formulaQueryTpl = formulaQueryTpls[this.operation];
 
     if ( formulaQueryTpl ) {
         // supported formula for use with overviews
-        var zoom_level = zoom_level_for_bbox(this.options.bbox);
-        _query = this.queryRewriter.query(_query, this.queryRewriteData, { zoom_level: zoom_level });
         var formulaSql = formulaQueryTpl({
-            _query: _query,
+            _query:     this.rewrittenQuery(this.query),
             _operation: this.operation,
-            _column: this.column
+            _column:    this.column
         });
-        debug(formulaSql);
         callback = callback || override;
 
         return callback(null, formulaSql);
     }
 
-    // For non supported operations (min, max) we're not using overviews.
-    return this.base_dataview.sql(psql, filters, override, callback);
-};
-
-Formula.prototype.format = function(result) {
-    return this.base_dataview.format(result);
-};
-
-Formula.prototype.getType = function() {
-    return this.base_dataview.getType();
-};
-
-Formula.prototype.toString = function() {
-    return this.base_dataview.toString();
+    // default behaviour
+    return this.defaultSql(psql, filters, override, callback);
 };

lib/cartodb/models/dataview/overviews/histogram.js

@@ -0,0 +1,217 @@
+var _ = require('underscore');
+var BaseOverviewsDataview = require('./base');
+var BaseDataview = require('../histogram');
+
+var dot = require('dot');
+dot.templateSettings.strip = false;
+
+var columnTypeQueryTpl = dot.template(
+    'SELECT pg_typeof({{=it.column}})::oid FROM ({{=it.query}}) _cdb_histogram_column_type limit 1'
+);
+var columnCastTpl = dot.template("date_part('epoch', {{=it.column}})");
+
+var BIN_MIN_NUMBER = 6;
+var BIN_MAX_NUMBER = 48;
+
+var basicsQueryTpl = dot.template([
+    'basics AS (',
+    '  SELECT',
+    '    max({{=it._column}}) AS max_val, min({{=it._column}}) AS min_val,',
+    '    sum({{=it._column}}*_feature_count)/sum(_feature_count) AS avg_val, sum(_feature_count) AS total_rows',
+    '  FROM ({{=it._query}}) _cdb_basics',
+    ')'
+].join(' \n'));
+
+var overrideBasicsQueryTpl = dot.template([
+    'basics AS (',
+    '  SELECT',
+    '    max({{=it._end}}) AS max_val, min({{=it._start}}) AS min_val,',
+    '    sum({{=it._column}}*_feature_count)/sum(_feature_count) AS avg_val, sum(_feature_count) AS total_rows',
+    '  FROM ({{=it._query}}) _cdb_basics',
+    ')'
+].join('\n'));
+
+var iqrQueryTpl = dot.template([
+    'iqrange AS (',
+    '  SELECT max(quartile_max) - min(quartile_max) AS iqr',
+    '  FROM (',
+    '    SELECT quartile, max(_cdb_iqr_column) AS quartile_max from (',
+    '      SELECT {{=it._column}} AS _cdb_iqr_column, ntile(4) over (order by {{=it._column}}',
+    '    ) AS quartile',
+    '    FROM ({{=it._query}}) _cdb_rank) _cdb_quartiles',
+    '    WHERE quartile = 1 or quartile = 3',
+    '    GROUP BY quartile',
+    '  ) _cdb_iqr',
+    ')'
+].join('\n'));
+
+var binsQueryTpl = dot.template([
+    'bins AS (',
+    '  SELECT CASE WHEN total_rows = 0 OR iqr = 0',
+    '      THEN 1',
+    '      ELSE GREATEST(',
+    '        LEAST({{=it._minBins}}, CAST(total_rows AS INT)),',
+    '        LEAST(',
+    '          CAST(((max_val - min_val) / (2 * iqr * power(total_rows, 1/3))) AS INT),',
+    '          {{=it._maxBins}}',
+    '        )',
+    '      )',
+    '    END AS bins_number',
+    '  FROM basics, iqrange, ({{=it._query}}) _cdb_bins',
+    '  LIMIT 1',
+    ')'
+].join('\n'));
+
+var overrideBinsQueryTpl = dot.template([
+    'bins AS (',
+    '  SELECT {{=it._bins}} AS bins_number',
+    ')'
+].join('\n'));
+
+var nullsQueryTpl = dot.template([
+    'nulls AS (',
+    '  SELECT',
+    '  count(*) AS nulls_count',
+    '  FROM ({{=it._query}}) _cdb_histogram_nulls',
+    '  WHERE {{=it._column}} IS NULL',
+    ')'
+].join('\n'));
+
+var histogramQueryTpl = dot.template([
+    'SELECT',
+    '    (max_val - min_val) / cast(bins_number as float) AS bin_width,',
+    '    bins_number,',
+    '    nulls_count,',
+    '    avg_val,',
+    '    CASE WHEN min_val = max_val',
+    '      THEN 0',
+    '      ELSE GREATEST(1, LEAST(WIDTH_BUCKET({{=it._column}}, min_val, max_val, bins_number), bins_number)) - 1',
+    '    END AS bin,',
+    '    min({{=it._column}})::numeric AS min,',
+    '    max({{=it._column}})::numeric AS max,',
+    '    sum({{=it._column}}*_feature_count)/sum(_feature_count)::numeric AS avg,',
+    '    sum(_feature_count) AS freq',
+    'FROM ({{=it._query}}) _cdb_histogram, basics, nulls, bins',
+    'WHERE {{=it._column}} IS NOT NULL',
+    'GROUP BY bin, bins_number, bin_width, nulls_count, avg_val',
+    'ORDER BY bin'
+].join('\n'));
+
+function Histogram(query, options, queryRewriter, queryRewriteData, params) {
+    BaseOverviewsDataview.call(this, query, options, BaseDataview, queryRewriter, queryRewriteData, params);
+
+    this.query = query;
+    this.column = options.column;
+    this.bins = options.bins;
+
+    this._columnType = null;
+}
+
+Histogram.prototype = Object.create(BaseOverviewsDataview.prototype);
+Histogram.prototype.constructor = Histogram;
+
+module.exports = Histogram;
+
+
+var DATE_OIDS = {
+    1082: true,
+    1114: true,
+    1184: true
+};
+
+Histogram.prototype.sql = function(psql, override, callback) {
+    if (!callback) {
+        callback = override;
+        override = {};
+    }
+
+    var self = this;
+
+    var _column = this.column;
+
+    var columnTypeQuery = columnTypeQueryTpl({
+        column: _column, query: this.rewrittenQuery(this.query)
+    });
+
+    if (this._columnType === null) {
+        psql.query(columnTypeQuery, function(err, result) {
+            // assume numeric, will fail later
+            self._columnType = 'numeric';
+            if (!err && !!result.rows[0]) {
+                var pgType = result.rows[0].pg_typeof;
+                if (DATE_OIDS.hasOwnProperty(pgType)) {
+                    self._columnType = 'date';
+                }
+            }
+            self.sql(psql, override, callback);
+        }, true); // use read-only transaction
+        return null;
+    }
+
+    if (this._columnType === 'date') {
+        _column = columnCastTpl({column: _column});
+    }
+
+    var _query = this.rewrittenQuery(this.query);
+
+    var basicsQuery, binsQuery;
+
+    if (override && _.has(override, 'start') && _.has(override, 'end') && _.has(override, 'bins')) {
+        basicsQuery = overrideBasicsQueryTpl({
+            _query: _query,
+            _column: _column,
+            _start: override.start,
+            _end: override.end
+        });
+
+        binsQuery = [
+            overrideBinsQueryTpl({
+                _bins: override.bins
+            })
+        ].join(',\n');
+    } else {
+        basicsQuery = basicsQueryTpl({
+            _query: _query,
+            _column: _column
+        });
+
+        if (override && _.has(override, 'bins')) {
+            binsQuery = [
+                overrideBinsQueryTpl({
+                    _bins: override.bins
+                })
+            ].join(',\n');
+        } else {
+            binsQuery = [
+                iqrQueryTpl({
+                    _query: _query,
+                    _column: _column
+                }),
+                binsQueryTpl({
+                    _query: _query,
+                    _minBins: BIN_MIN_NUMBER,
+                    _maxBins: BIN_MAX_NUMBER
+                })
+            ].join(',\n');
+        }
+    }
+
+
+    var histogramSql = [
+        "WITH",
+        [
+            basicsQuery,
+            binsQuery,
+            nullsQueryTpl({
+                _query: _query,
+                _column: _column
+            })
+        ].join(',\n'),
+        histogramQueryTpl({
+            _query: _query,
+            _column: _column
+        })
+    ].join('\n');
+
+    return callback(null, histogramSql);
+};

lib/cartodb/models/dataview/overviews/index.js

@@ -1,3 +1,6 @@
 module.exports = {
-    Formula: require('./formula')
+  Aggregation: require('./aggregation'),
+  Formula: require('./formula'),
+  Histogram: require('./histogram'),
+  List: require('./list')
 };

lib/cartodb/models/dataview/overviews/list.js

@@ -0,0 +1,11 @@
+var BaseOverviewsDataview = require('./base');
+var BaseDataview = require('../list');
+
+function List(query, options, queryRewriter, queryRewriteData, params) {
+    BaseOverviewsDataview.call(this, query, options, BaseDataview, queryRewriter, queryRewriteData, params);
+}
+
+List.prototype = Object.create(BaseOverviewsDataview.prototype);
+List.prototype.constructor = List;
+
+module.exports = List;

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

@@ -11,73 +11,25 @@ function AnalysisMapConfigAdapter(analysisBackend) {
 
 module.exports = AnalysisMapConfigAdapter;
 
-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) {
-    if (node.type === 'source') {
-        return node.getQuery();
-    }
-    var _columns = ['ST_Transform(the_geom, 3857) the_geom_webmercator'].concat(skipColumns(node.getColumns()));
-    return layerQueryTemplate({ _query: node.getQuery(), _columns: _columns.join(', ') });
-}
-
-function appendFiltersToNodes(requestMapConfig, dataviewsFiltersBySourceId) {
-    var analyses = requestMapConfig.analyses || [];
-
-    requestMapConfig.analyses = analyses.map(function(analysisDefinition) {
-        var analysisGraph = new camshaft.reference.AnalysisGraph(analysisDefinition);
-        var definition = analysisDefinition;
-        Object.keys(dataviewsFiltersBySourceId).forEach(function(sourceId) {
-            definition = analysisGraph.getDefinitionWith(sourceId, {filters: dataviewsFiltersBySourceId[sourceId] });
-        });
-
-        return definition;
-    });
-
-    return requestMapConfig;
-}
-
-function shouldAdaptLayers(requestMapConfig) {
-    return Array.isArray(requestMapConfig.layers) &&
-        Array.isArray(requestMapConfig.analyses) && requestMapConfig.analyses.length > 0;
-}
-
-var DATAVIEW_TYPE_2_FILTER_TYPE = {
-    aggregation: 'category',
-    histogram: 'range'
-};
-function getFilter(dataview, params) {
-    var type = dataview.type;
-
-    return {
-        type: DATAVIEW_TYPE_2_FILTER_TYPE[type],
-        column: dataview.options.column,
-        params: params
-    };
-}
-
-AnalysisMapConfigAdapter.prototype.getMapConfig = function(analysisConfiguration, requestMapConfig, filters, callback) {
+AnalysisMapConfigAdapter.prototype.getMapConfig = function(user, requestMapConfig, params, context, callback) {
     // jshint maxcomplexity:7
     var self = this;
-    filters = filters || {};
 
     if (!shouldAdaptLayers(requestMapConfig)) {
         return callback(null, requestMapConfig);
     }
 
+    var analysisConfiguration = context.analysisConfiguration;
+
+    var filters = {};
+    if (params.filters) {
+        try {
+            filters = JSON.parse(params.filters);
+        } catch (e) {
+            // ignore
+        }
+    }
+
     var dataviewsFilters = filters.dataviews || {};
     debug(dataviewsFilters);
     var dataviews = requestMapConfig.dataviews || {};
@@ -145,13 +97,11 @@ AnalysisMapConfigAdapter.prototype.getMapConfig = function(analysisConfiguration
                     var analysisSql = layerQuery(layerNode);
                     var sqlQueryWrap = layer.options.sql_wrap;
                     if (sqlQueryWrap) {
+                        layer.options.sql_raw = analysisSql;
                         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)
@@ -167,10 +117,70 @@ AnalysisMapConfigAdapter.prototype.getMapConfig = function(analysisConfiguration
             return callback(missingNodesErrors);
         }
 
-        return callback(null, requestMapConfig, analysesResults);
+        context.analysesResults = analysesResults;
+
+        return callback(null, requestMapConfig);
     });
 };
 
+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) {
+    if (node.type === 'source') {
+        return node.getQuery();
+    }
+    var _columns = ['ST_Transform(the_geom, 3857) the_geom_webmercator'].concat(skipColumns(node.getColumns()));
+    return layerQueryTemplate({ _query: node.getQuery(), _columns: _columns.join(', ') });
+}
+
+function appendFiltersToNodes(requestMapConfig, dataviewsFiltersBySourceId) {
+    var analyses = requestMapConfig.analyses || [];
+
+    requestMapConfig.analyses = analyses.map(function(analysisDefinition) {
+        var analysisGraph = new camshaft.reference.AnalysisGraph(analysisDefinition);
+        var definition = analysisDefinition;
+        Object.keys(dataviewsFiltersBySourceId).forEach(function(sourceId) {
+            definition = analysisGraph.getDefinitionWith(sourceId, {filters: dataviewsFiltersBySourceId[sourceId] });
+        });
+
+        return definition;
+    });
+
+    return requestMapConfig;
+}
+
+function shouldAdaptLayers(requestMapConfig) {
+    return Array.isArray(requestMapConfig.layers) &&
+        Array.isArray(requestMapConfig.analyses) && requestMapConfig.analyses.length > 0;
+}
+
+var DATAVIEW_TYPE_2_FILTER_TYPE = {
+    aggregation: 'category',
+    histogram: 'range'
+};
+function getFilter(dataview, params) {
+    var type = dataview.type;
+
+    return {
+        type: DATAVIEW_TYPE_2_FILTER_TYPE[type],
+        column: dataview.options.column,
+        params: params
+    };
+}
+
 function getLayerSourceId(layer) {
     return layer.options.source && layer.options.source.id;
 }
@@ -195,11 +205,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]);
         }
     });
@@ -211,6 +232,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) {

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

@@ -0,0 +1,98 @@
+function DataviewsWidgetsMapConfigAdapter() {
+}
+
+module.exports = DataviewsWidgetsMapConfigAdapter;
+
+
+DataviewsWidgetsMapConfigAdapter.prototype.getMapConfig = function(user, requestMapConfig, params, context, callback) {
+    if (!shouldAdapt(requestMapConfig)) {
+        return callback(null, requestMapConfig);
+    }
+
+    // prepare placeholders for new dataviews created from widgets
+    requestMapConfig.analyses = requestMapConfig.analyses || [];
+    requestMapConfig.dataviews = requestMapConfig.dataviews || {};
+
+    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) {
+            requestMapConfig.analyses.push(
+                {
+                    id: dataviewSourceId,
+                    type: 'source',
+                    params: {
+                        query: layer.options.sql
+                    }
+                }
+            );
+        }
+        var source = { id: dataviewSourceId };
+        var layerWidgets = layer.options.widgets || {};
+        Object.keys(layerWidgets).forEach(function(widgetId) {
+            var dataview = layerWidgets[widgetId];
+            requestMapConfig.dataviews[widgetId] = {
+                source: source,
+                type: dataview.type,
+                options: dataview.options
+            };
+        });
+
+        layer.options.source = source;
+
+        delete layer.options.sql;
+        // don't delete widgets for now as it might be useful for old clients
+        //delete layer.options.widgets;
+    });
+
+    // filters have to be rewritten also
+    var filters = getFilters(params);
+    var layersFilters = filters.layers || [];
+    filters.dataviews = filters.dataviews || {};
+
+    layersFilters.forEach(function(layerFilters) {
+        Object.keys(layerFilters).forEach(function(filterName) {
+            if (!filters.dataviews.hasOwnProperty(filterName)) {
+                filters.dataviews[filterName] = layerFilters[filterName];
+            }
+        });
+    });
+
+    delete filters.layers;
+
+    params.filters = JSON.stringify(filters);
+
+    return callback(null, requestMapConfig);
+};
+
+function shouldAdapt(requestMapConfig) {
+    return Array.isArray(requestMapConfig.layers) && requestMapConfig.layers.some(function hasWidgets(layer) {
+        return layer.options && layer.options.widgets && Object.keys(layer.options.widgets).length > 0;
+    });
+}
+
+function getLayerSourceId(layer) {
+    return layer.options.source && layer.options.source.id;
+}
+
+function getFilters(params) {
+    var filters = {};
+    if (params.filters) {
+        try {
+            filters = JSON.parse(params.filters);
+        } catch (e) {
+            // ignore
+        }
+    }
+    return filters;
+}

lib/cartodb/models/mapconfig/adapter/index.js

@@ -0,0 +1,26 @@
+'use strict';
+
+function MapConfigAdapter(adapters) {
+    this.adapters = Array.isArray(adapters) ? adapters : Array.apply(null, arguments);
+}
+
+module.exports = MapConfigAdapter;
+
+MapConfigAdapter.prototype.getMapConfig = function(user, requestMapConfig, params, context, callback) {
+    var self = this;
+    var i = 0;
+    var tasksLeft = this.adapters.length;
+
+    function next(err, _requestMapConfig) {
+        if (err) {
+            return callback(err);
+        }
+        if (tasksLeft-- === 0) {
+            return callback(null, _requestMapConfig);
+        }
+        var nextAdapter = self.adapters[i++];
+        nextAdapter.getMapConfig(user, _requestMapConfig, params, context, next);
+    }
+
+    next(null, requestMapConfig);
+};

lib/cartodb/models/mapconfig/adapter/mapconfig-named-layers-adapter.js

@@ -2,17 +2,20 @@ var queue = require('queue-async');
 var _ = require('underscore');
 var Datasource = require('windshaft').model.Datasource;
 
-function MapConfigNamedLayersAdapter(templateMaps) {
+function MapConfigNamedLayersAdapter(templateMaps, pgConnection) {
     this.templateMaps = templateMaps;
+    this.pgConnection = pgConnection;
 }
 
 module.exports = MapConfigNamedLayersAdapter;
 
-MapConfigNamedLayersAdapter.prototype.getLayers = function(username, layers, dbMetadata, callback) {
+MapConfigNamedLayersAdapter.prototype.getMapConfig = function (user, requestMapConfig, params, context, callback) {
     var self = this;
 
+    var layers = requestMapConfig.layers;
+
     if (!layers) {
-        return callback(null);
+        return callback(null, requestMapConfig);
     }
 
     var adaptLayersQueue = queue(layers.length);
@@ -28,9 +31,9 @@ MapConfigNamedLayersAdapter.prototype.getLayers = function(username, layers, dbM
             var templateConfigParams = layer.options.config || {};
             var templateAuthTokens = layer.options.auth_tokens;
 
-            self.templateMaps.getTemplate(username, templateName, function(err,  template) {
+            self.templateMaps.getTemplate(user, templateName, function(err,  template) {
                 if (err || !template) {
-                    return done(new Error("Template '" + templateName + "' of user '" + username + "' not found"));
+                    return done(new Error("Template '" + templateName + "' of user '" + user + "' not found"));
                 }
 
                 if (self.templateMaps.isAuthorized(template, templateAuthTokens)) {
@@ -96,7 +99,10 @@ MapConfigNamedLayersAdapter.prototype.getLayers = function(username, layers, dbM
 
         });
 
-        return callback(null, layers, datasourceBuilder.build());
+        requestMapConfig.layers = layers;
+        context.datasource = datasourceBuilder.build();
+
+        return callback(null, requestMapConfig);
     }
 
 
@@ -104,7 +110,7 @@ MapConfigNamedLayersAdapter.prototype.getLayers = function(username, layers, dbM
 
     if (_.some(layers, isNamedTypeLayer)) {
         // Lazy load dbAuth
-        dbMetadata.setDBAuth(username, dbAuth, function(err) {
+        this.pgConnection.setDBAuth(user, dbAuth, function(err) {
             if (err) {
                 return callback(err);
             }
@@ -114,7 +120,8 @@ MapConfigNamedLayersAdapter.prototype.getLayers = function(username, layers, dbM
             adaptLayersQueue.awaitAll(layersAdaptQueueFinish);
         });
     } else {
-        return callback(null, layers, datasourceBuilder.build());
+        context.datasource = datasourceBuilder.build();
+        return callback(null, requestMapConfig);
     }
 
 };

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

@@ -9,11 +9,14 @@ function MapConfigOverviewsAdapter(overviewsMetadataApi, filterStatsApi) {
 
 module.exports = MapConfigOverviewsAdapter;
 
-MapConfigOverviewsAdapter.prototype.getLayers = function(username, layers, analysesResults, callback) {
+MapConfigOverviewsAdapter.prototype.getMapConfig = function(user, requestMapConfig, params, context, callback) {
   var self = this;
 
+  var layers = requestMapConfig.layers;
+  var analysesResults = context.analysesResults;
+
   if (!layers || layers.length === 0) {
-      return callback(null, layers);
+      return callback(null, requestMapConfig);
   }
 
   var augmentLayersQueue = queue(layers.length);
@@ -22,7 +25,7 @@ MapConfigOverviewsAdapter.prototype.getLayers = function(username, layers, analy
       if ( layer.type !== 'mapnik' && layer.type !== 'cartodb' ) {
           return done(null, layer);
       }
-      self.overviewsMetadataApi.getOverviewsMetadata(username, layer.options.sql, function(err, metadata){
+      self.overviewsMetadataApi.getOverviewsMetadata(user, layer.options.sql, function(err, metadata){
            if (err) {
                done(err, layer);
            } else {
@@ -35,7 +38,7 @@ MapConfigOverviewsAdapter.prototype.getLayers = function(username, layers, analy
                            var node = _.find(analysesResults, function(a){ return a.rootNode.params.id === sourceId; });
                            if ( node ) {
                                node = node.rootNode;
-                               filters = node.filters; // TODO: node.getFilters() when available in camshaft
+                               filters = node.getFilters();
                                var filters_disabler = Object.keys(filters).reduce(
                                    function(disabler, filter_id){ disabler[filter_id] = false; return disabler; },
                                    {}
@@ -51,7 +54,7 @@ MapConfigOverviewsAdapter.prototype.getLayers = function(username, layers, analy
                        var next_step = this;
                        if ( filters ) {
                            self.filterStatsApi.getFilterStats(
-                               username,
+                               user,
                                unfiltered_query, filters,
                                function(err, stats) {
                                  if ( !err ) {
@@ -69,7 +72,7 @@ MapConfigOverviewsAdapter.prototype.getLayers = function(username, layers, analy
                            layer = _.extend({}, layer);
                            layer.options = _.extend({}, layer.options, { query_rewrite_data: query_rewrite_data });
                        }
-                       done(err, layer);
+                       done(null, layer);
                    }
                );
            }
@@ -85,7 +88,9 @@ MapConfigOverviewsAdapter.prototype.getLayers = function(username, layers, analy
         return callback(new Error('Missing layers array from layergroup config'));
     }
 
-    return callback(null, layers);
+    requestMapConfig.layers = layers;
+
+    return callback(null, requestMapConfig);
   }
 
   layers.forEach(function(layer) {

lib/cartodb/models/mapconfig/adapter/sql-wrap-mapconfig-adapter.js

@@ -0,0 +1,25 @@
+function SqlWrapMapConfigAdapter() {
+}
+
+module.exports = SqlWrapMapConfigAdapter;
+
+
+SqlWrapMapConfigAdapter.prototype.getMapConfig = function(user, requestMapConfig, params, context, callback) {
+    if (requestMapConfig && Array.isArray(requestMapConfig.layers)) {
+        requestMapConfig.layers = requestMapConfig.layers.map(function(layer) {
+            if (layer.options) {
+                var sqlQueryWrap = layer.options.sql_wrap;
+                if (sqlQueryWrap) {
+                    var layerSql = layer.options.sql;
+                    if (layerSql) {
+                        layer.options.sql_raw = layerSql;
+                        layer.options.sql = sqlQueryWrap.replace(/<%=\s*sql\s*%>/g, layerSql);
+                    }
+                }
+            }
+            return layer;
+        });
+    }
+
+    return callback(null, requestMapConfig);
+};

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

@@ -0,0 +1,102 @@
+'use strict';
+
+var dot = require('dot');
+dot.templateSettings.strip = false;
+var queue = require('queue-async');
+var SubstitutionTokens = require('../../../utils/substitution-tokens');
+
+function TurboCartoAdapter(turboCartoParser) {
+    this.turboCartoParser = turboCartoParser;
+}
+
+module.exports = TurboCartoAdapter;
+
+TurboCartoAdapter.prototype.getMapConfig = function (user, requestMapConfig, params, context, callback) {
+    var self = this;
+
+    var layers = requestMapConfig.layers;
+
+    if (!layers || layers.length === 0) {
+        return callback(null, requestMapConfig);
+    }
+
+    var parseCartoQueue = queue(layers.length);
+
+    layers.forEach(function(layer) {
+        parseCartoQueue.defer(self._parseCartoCss.bind(self), user, layer);
+    });
+
+    parseCartoQueue.awaitAll(function (err, layers) {
+        if (err) {
+            return callback(err);
+        }
+
+        requestMapConfig.layers = layers;
+
+        return callback(null, requestMapConfig);
+    });
+};
+
+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',
+    ')'
+].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) {
+    if (!shouldParseLayerCartocss(layer)) {
+        return callback(null, layer);
+    }
+
+    var tokens = {
+        bbox: 'ST_MakeEnvelope(-20037508.34,-20037508.34,20037508.34,20037508.34,3857)',
+        scale_denominator: '500000001',
+        pixel_width: '156412',
+        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.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);
+    });
+};
+
+function shouldParseLayerCartocss(layer) {
+    return layer && layer.options && layer.options.cartocss && layer.options.sql;
+}

lib/cartodb/models/mapconfig/provider/create-layergroup-provider.js

@@ -1,7 +1,7 @@
 var assert = require('assert');
 var step = require('step');
 
-var MapStoreMapConfigProvider = require('./map_store_provider');
+var MapStoreMapConfigProvider = require('./map-store-provider');
 
 /**
  * @param {MapConfig} mapConfig

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

@@ -4,24 +4,20 @@ var crypto = require('crypto');
 var dot = require('dot');
 var step = require('step');
 var MapConfig = require('windshaft').model.MapConfig;
-var templateName = require('../../backends/template_maps').templateName;
+var templateName = require('../../../backends/template_maps').templateName;
 var QueryTables = require('cartodb-query-tables');
 
 /**
  * @constructor
  * @type {NamedMapMapConfigProvider}
  */
-function NamedMapMapConfigProvider(templateMaps, pgConnection, metadataBackend, userLimitsApi,
-                                   namedLayersAdapter, overviewsAdapter, turboCartoAdapter, analysisMapConfigAdapter,
+function NamedMapMapConfigProvider(templateMaps, pgConnection, metadataBackend, userLimitsApi, mapConfigAdapter,
                                    owner, templateId, config, authToken, params) {
     this.templateMaps = templateMaps;
     this.pgConnection = pgConnection;
     this.metadataBackend = metadataBackend;
     this.userLimitsApi = userLimitsApi;
-    this.namedLayersAdapter = namedLayersAdapter;
-    this.turboCartoAdapter = turboCartoAdapter;
-    this.analysisMapConfigAdapter = analysisMapConfigAdapter;
-    this.overviewsAdapter = overviewsAdapter;
+    this.mapConfigAdapter = mapConfigAdapter;
 
     this.owner = owner;
     this.templateName = templateName(templateId);
@@ -54,10 +50,11 @@ NamedMapMapConfigProvider.prototype.getMapConfig = function(callback) {
     var self = this;
 
     var mapConfig = null;
-    var datasource = null;
     var rendererParams;
     var apiKey;
 
+    var context = {};
+
     step(
         function getTemplate() {
             self.getTemplate(this);
@@ -95,9 +92,9 @@ NamedMapMapConfigProvider.prototype.getMapConfig = function(callback) {
             assert.ifError(err);
             return self.templateMaps.instance(self.template, templateParams);
         },
-        function prepareAnalysisLayers(err, requestMapConfig) {
+        function prepareAdapterMapConfig(err, requestMapConfig) {
             assert.ifError(err);
-            var analysisConfiguration = {
+            context.analysisConfiguration = {
                 db: {
                     host: rendererParams.dbhost,
                     port: rendererParams.dbport,
@@ -110,75 +107,17 @@ NamedMapMapConfigProvider.prototype.getMapConfig = function(callback) {
                     apiKey: apiKey
                 }
             };
-
-            var filters = {};
-            if (self.params.filters) {
-                try {
-                    filters = JSON.parse(self.params.filters);
-                } catch (e) {
-                    // ignore
-                }
-            }
-            self.analysisMapConfigAdapter.getMapConfig(analysisConfiguration, requestMapConfig, filters, this);
+            self.mapConfigAdapter.getMapConfig(self.owner, requestMapConfig, rendererParams, context, this);
         },
-        function prepareLayergroup(err, _mapConfig, analysesResults) {
-            assert.ifError(err);
-            var next = this;
-            self.analysesResults = analysesResults || [];
-            self.namedLayersAdapter.getLayers(self.owner, _mapConfig.layers, self.pgConnection,
-                function(err, layers, datasource) {
-                    if (err) {
-                        return next(err);
-                    }
-
-                    if (layers) {
-                        _mapConfig.layers = layers;
-                    }
-                    return next(null, _mapConfig, datasource);
-                }
-            );
-        },
-        function addOverviewsInformation(err, _mapConfig, datasource) {
-            assert.ifError(err);
-            var next = this;
-
-            self.overviewsAdapter.getLayers(self.owner, _mapConfig.layers, self.analysesResults, function(err, layers) {
-                if (err) {
-                    return next(err);
-                }
-
-                if (layers) {
-                    _mapConfig.layers = layers;
-                }
-
-                return next(null, _mapConfig, datasource);
-            });
-        },
-        function parseTurboCarto(err, _mapConfig, datasource) {
-            assert.ifError(err);
-            var next = this;
-
-            self.turboCartoAdapter.getLayers(self.owner, _mapConfig.layers, function (err, layers) {
-                if (err) {
-                    return next(err);
-                }
-
-                if (layers) {
-                    _mapConfig.layers = layers;
-                }
-
-                return next(null, _mapConfig, datasource);
-            });
-        },
-        function prepareContextLimits(err, _mapConfig, _datasource) {
+        function prepareContextLimits(err, _mapConfig) {
             assert.ifError(err);
             mapConfig = _mapConfig;
-            datasource = _datasource;
             self.userLimitsApi.getRenderLimits(self.owner, this);
         },
         function cacheAndReturnMapConfig(err, renderLimits) {
             self.err = err;
-            self.mapConfig = (mapConfig === null) ? null : new MapConfig(mapConfig, datasource);
+            self.mapConfig = (mapConfig === null) ? null : new MapConfig(mapConfig, context.datasource);
+            self.analysesResults = context.analysesResults || [];
             self.rendererParams = rendererParams;
             self.context.limits = renderLimits || {};
             return callback(self.err, self.mapConfig, self.rendererParams, self.context);

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,10 +33,15 @@ var AnalysisBackend = require('./backends/analysis');
 var timeoutErrorTilePath = __dirname + '/../../assets/render-timeout-fallback.png';
 var timeoutErrorTile = require('fs').readFileSync(timeoutErrorTilePath, {encoding: null});
 
-var MapConfigOverviewsAdapter = require('./models/mapconfig_overviews_adapter');
-
 var TurboCartoParser = require('./utils/style/turbo-carto-parser');
-var TurboCartoAdapter = require('./utils/style/turbo-carto-adapter');
+
+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');
+var MapConfigOverviewsAdapter = require('./models/mapconfig/adapter/mapconfig-overviews-adapter');
+var TurboCartoAdapter = require('./models/mapconfig/adapter/turbo-carto-adapter');
+var DataviewsWidgetsAdapter = require('./models/mapconfig/adapter/dataviews-widgets-adapter');
+var MapConfigAdapter = require('./models/mapconfig/adapter');
 
 module.exports = function(serverOptions) {
     // Make stats client globally accessible
@@ -150,19 +154,23 @@ module.exports = function(serverOptions) {
     var layergroupAffectedTablesCache = new LayergroupAffectedTablesCache();
     app.layergroupAffectedTablesCache = layergroupAffectedTablesCache;
 
-    var overviewsAdapter = new MapConfigOverviewsAdapter(overviewsMetadataApi, filterStatsApi);
-
     var turboCartoParser = new TurboCartoParser(pgQueryRunner);
-    var turboCartoAdapter = new TurboCartoAdapter(turboCartoParser);
+
+    var mapConfigAdapter = new MapConfigAdapter(
+        new MapConfigNamedLayersAdapter(templateMaps, pgConnection),
+        new SqlWrapMapConfigAdapter(),
+        new DataviewsWidgetsAdapter(),
+        new AnalysisMapConfigAdapter(analysisBackend),
+        new MapConfigOverviewsAdapter(overviewsMetadataApi, filterStatsApi),
+        new TurboCartoAdapter(turboCartoParser)
+    );
 
     var namedMapProviderCache = new NamedMapProviderCache(
         templateMaps,
         pgConnection,
         metadataBackend,
-        analysisBackend,
         userLimitsApi,
-        overviewsAdapter,
-        turboCartoAdapter
+        mapConfigAdapter
     );
 
     ['update', 'delete'].forEach(function(eventType) {
@@ -174,6 +182,8 @@ module.exports = function(serverOptions) {
     var TablesExtentApi = require('./api/tables_extent_api');
     var tablesExtentApi = new TablesExtentApi(pgQueryRunner);
 
+    var versions = getAndValidateVersions(serverOptions);
+
     /*******************************************************************************************************************
      * Routing
      ******************************************************************************************************************/
@@ -185,7 +195,6 @@ module.exports = function(serverOptions) {
         tileBackend,
         previewBackend,
         attributesBackend,
-        new windshaft.backend.Widget(),
         surrogateKeysCache,
         userLimitsApi,
         layergroupAffectedTablesCache,
@@ -201,9 +210,7 @@ module.exports = function(serverOptions) {
         surrogateKeysCache,
         userLimitsApi,
         layergroupAffectedTablesCache,
-        overviewsAdapter,
-        turboCartoAdapter,
-        analysisBackend
+        mapConfigAdapter
     ).register(app);
 
     new controller.NamedMaps(
@@ -219,7 +226,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
@@ -232,12 +239,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/postgres-datasource.js

@@ -23,8 +23,35 @@ var methodTemplates = Object.keys(methods).reduce(function(methodTemplates, meth
     return methodTemplates;
 }, {});
 
+methodTemplates.category = dot.template([
+    'WITH',
+    'categories AS (',
+    '  SELECT {{=it._column}} AS category, count(1) AS value, row_number() OVER (ORDER BY count(1) desc) as rank',
+    '  FROM ({{=it._sql}}) _cdb_aggregation_all',
+    '  GROUP BY {{=it._column}}',
+    '  ORDER BY 2 DESC',
+    '),',
+    'agg_categories AS (',
+    '  SELECT \'__other\' category',
+    '  FROM categories',
+    '  WHERE rank >= {{=it._buckets}}',
+    '  GROUP BY 1',
+    '  UNION ALL',
+    '  SELECT CAST(category AS text)',
+    '  FROM categories',
+    '  WHERE rank < {{=it._buckets}}',
+    ')',
+    'SELECT array_agg(category) AS category FROM agg_categories'
+].join('\n'));
+
+var STRATEGY = {
+    SPLIT: 'split',
+    EXACT: 'exact'
+};
+
 var method2strategy = {
-    headtails: 'split'
+    headtails: STRATEGY.SPLIT,
+    category: STRATEGY.EXACT
 };
 
 function PostgresDatasource (pgQueryRunner, username, query) {
@@ -38,7 +65,12 @@ PostgresDatasource.prototype.getName = function () {
 };
 
 PostgresDatasource.prototype.getRamp = function (column, buckets, method, callback) {
-    var methodName = methods.hasOwnProperty(method) ? method : 'quantiles';
+    if (method && !methodTemplates.hasOwnProperty(method)) {
+        return callback(new Error(
+            'Invalid method "' + method + '", valid methods: [' + Object.keys(methodTemplates).join(',') + ']'
+        ));
+    }
+    var methodName = method || 'quantiles';
     var template = methodTemplates[methodName];
 
     var query = template({ _column: column, _sql: this.query, _buckets: buckets });
@@ -48,11 +80,15 @@ PostgresDatasource.prototype.getRamp = function (column, buckets, method, callba
             return callback(err);
         }
 
-        var ramp = result[0][methodName].sort(function(a, b) {
-            return a - b;
-        });
+        var strategy = method2strategy[methodName];
+        var ramp = result[0][methodName];
+        if (strategy !== STRATEGY.EXACT) {
+            ramp = ramp.sort(function(a, b) {
+                return a - b;
+            });
+        }
 
-        return callback(null, { ramp: ramp, strategy: method2strategy[methodName] });
+        return callback(null, { ramp: ramp, strategy: strategy });
     });
 };
 

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

@@ -1,70 +0,0 @@
-'use strict';
-
-var queue = require('queue-async');
-var SubstitutionTokens = require('../substitution-tokens');
-
-function TurboCartoAdapter(turboCartoParser) {
-    this.turboCartoParser = turboCartoParser;
-}
-
-module.exports = TurboCartoAdapter;
-
-TurboCartoAdapter.prototype.getLayers = function (username, layers, callback) {
-    var self = this;
-
-    if (!layers || layers.length === 0) {
-        return callback(null, layers);
-    }
-
-    var parseCartoQueue = queue(layers.length);
-
-    layers.forEach(function(layer) {
-        parseCartoQueue.defer(self._parseCartoCss.bind(self), username, layer);
-    });
-
-    parseCartoQueue.awaitAll(function (err, layers) {
-        if (err) {
-            return callback(err);
-        }
-
-        return callback(null, layers);
-    });
-};
-
-TurboCartoAdapter.prototype._parseCartoCss = function (username, layer, callback) {
-    if (isNotLayerToParseCartocss(layer)) {
-        return process.nextTick(function () {
-            callback(null, layer);
-        });
-    }
-
-    var sql = SubstitutionTokens.replace(layer.options.sql, {
-        bbox: 'ST_MakeEnvelope(-20037508.34,-20037508.34,20037508.34,20037508.34,3857)',
-        scale_denominator: '500000001',
-        pixel_width: '156412',
-        pixel_height: '156412'
-    });
-
-    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);
-    });
-};
-
-function isNotLayerToParseCartocss(layer) {
-    if (!layer || !layer.options || !layer.options.cartocss || !layer.options.sql) {
-        return true;
-    }
-
-    return false;
-}

lib/cartodb/utils/substitution-tokens.js

@@ -6,6 +6,16 @@ var SUBSTITUTION_TOKENS = {
 };
 
 var SubstitutionTokens = {
+    tokens: function(sql) {
+        return Object.keys(SUBSTITUTION_TOKENS).filter(function(tokenName) {
+            return !!sql.match(SUBSTITUTION_TOKENS[tokenName]);
+        });
+    },
+
+    hasTokens: function(sql) {
+        return this.tokens(sql).length > 0;
+    },
+
     replace: function(sql, replaceValues) {
         Object.keys(replaceValues).forEach(function(token) {
             if (SUBSTITUTION_TOKENS[token]) {

package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "windshaft-cartodb",
-  "version": "2.43.2",
+  "version": "2.47.0",
   "description": "A map tile server for CartoDB",
   "keywords": [
     "cartodb"
@@ -20,8 +20,8 @@
   ],
   "dependencies": {
     "body-parser": "~1.14.0",
-    "camshaft": "0.8.0",
-    "cartodb-psql": "0.10.1",
+    "camshaft": "0.14.0",
+    "cartodb-psql": "~0.6.1",
     "cartodb-query-tables": "~0.1.0",
     "cartodb-redis": "~0.13.0",
     "debug": "~2.2.0",
@@ -37,9 +37,9 @@
     "request": "~2.62.0",
     "step": "~0.0.6",
     "step-profiler": "~0.3.0",
-    "turbo-carto": "0.9.2",
+    "turbo-carto": "0.11.0",
     "underscore": "~1.6.0",
-    "windshaft": "1.19.0"
+    "windshaft": "2.3.0"
   },
   "devDependencies": {
     "istanbul": "~0.4.3",

run_tests.sh

@@ -5,6 +5,7 @@ OPT_CREATE_PGSQL=yes # create the PostgreSQL test environment
 OPT_DROP_REDIS=yes   # drop the redis test environment
 OPT_DROP_PGSQL=yes   # drop the PostgreSQL test environment
 OPT_COVERAGE=no      # run tests with coverage
+OPT_DOWNLOAD_SQL=yes # download a fresh copy of sql files
 
 export PGAPPNAME=cartodb_tiler_tester
 
@@ -73,6 +74,10 @@ while [ -n "$1" ]; do
                 OPT_CREATE_REDIS=no
                 shift
                 continue
+        elif test "$1" = "--no-sql-download"; then
+                OPT_DOWNLOAD_SQL=no
+                shift
+                continue
         elif test "$1" = "--with-coverage"; then
                 OPT_COVERAGE=yes
                 shift
@@ -113,6 +118,9 @@ fi
 if test x"$OPT_CREATE_REDIS" != xyes; then
   PREPARE_DB_OPTS="$PREPARE_DB_OPTS --skip-redis"
 fi
+if test x"$OPT_DOWNLOAD_SQL" != xyes; then
+  PREPARE_DB_OPTS="$PREPARE_DB_OPTS --no-sql-download"
+fi
 
 echo "Preparing the environment"
 cd ${BASEDIR}/test/support

test/acceptance/analysis/named-maps.js

@@ -7,7 +7,7 @@ var serverOptions = require('../../../lib/cartodb/server_options');
 var server = new CartodbWindshaft(serverOptions);
 var TestClient = require('../../support/test-client');
 
-var LayergroupToken = require('../../../lib/cartodb/models/layergroup_token');
+var LayergroupToken = require('../../support/layergroup-token');
 
 describe('named-maps analysis', function() {
 

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/dynamic-styling-named-maps.js

@@ -1,6 +1,6 @@
 var assert = require('../support/assert');
 var step = require('step');
-var LayergroupToken = require('../../lib/cartodb/models/layergroup_token');
+var LayergroupToken = require('../support/layergroup-token');
 var testHelper = require(__dirname + '/../support/test_helper');
 var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/server');
 var serverOptions = require(__dirname + '/../../lib/cartodb/server_options');

test/acceptance/geojson-renderer.js

@@ -0,0 +1,343 @@
+require('../support/test_helper');
+
+var assert = require('../support/assert');
+var TestClient = require('../support/test-client');
+
+
+describe('use only needed columns', function() {
+
+    function getFeatureByCartodbId(features, cartodbId) {
+        for (var i = 0, len = features.length; i < len; i++) {
+            if (features[i].properties.cartodb_id === cartodbId) {
+                return features[i];
+            }
+        }
+        return {};
+    }
+
+    var options = { format: 'geojson', layer: 0 };
+
+    afterEach(function(done) {
+        if (this.testClient) {
+            this.testClient.drain(done);
+        } else {
+            done();
+        }
+    });
+
+    it('with aggregation widget, interactivity and cartocss columns', function(done) {
+        var widgetMapConfig = {
+            version: '1.5.0',
+            layers: [{
+                type: 'mapnik',
+                options: {
+                    sql: 'select * from populated_places_simple_reduced',
+                    cartocss: '#layer0 { marker-fill: red; marker-width: 10; [name="Madrid"] { marker-fill: green; } }',
+                    cartocss_version: '2.0.1',
+                    widgets: {
+                        adm0name: {
+                            type: 'aggregation',
+                            options: {
+                                column: 'adm0name',
+                                aggregation: 'sum',
+                                aggregationColumn: 'pop_max'
+                            }
+                        }
+                    },
+                    interactivity: "cartodb_id,pop_min"
+                }
+            }]
+        };
+
+        this.testClient = new TestClient(widgetMapConfig);
+        this.testClient.getTile(0, 0, 0, options, function (err, res, geojsonTile) {
+            assert.ok(!err, err);
+            assert.deepEqual(getFeatureByCartodbId(geojsonTile.features, 1109).properties, {
+                cartodb_id: 1109,
+                name: 'Mardin',
+                adm0name: 'Turkey',
+                pop_max: 71373,
+                pop_min: 57586
+            });
+            done();
+        });
+    });
+
+    it('should not duplicate columns', function(done) {
+        var widgetMapConfig = {
+            version: '1.5.0',
+            layers: [{
+                type: 'mapnik',
+                options: {
+                    sql: 'select * from populated_places_simple_reduced',
+                    cartocss: ['#layer0 {',
+                        'marker-fill: red;',
+                        'marker-width: 10;',
+                        '[name="Madrid"] { marker-fill: green; } ',
+                        '[pop_max>100000] { marker-fill: black; } ',
+                        '}'].join('\n'),
+                    cartocss_version: '2.3.0',
+                    widgets: {
+                        adm0name: {
+                            type: 'aggregation',
+                            options: {
+                                column: 'adm0name',
+                                aggregation: 'sum',
+                                aggregationColumn: 'pop_max'
+                            }
+                        }
+                    },
+                    interactivity: "cartodb_id,pop_max"
+                }
+            }]
+        };
+
+        this.testClient = new TestClient(widgetMapConfig);
+        this.testClient.getTile(0, 0, 0, options, function (err, res, geojsonTile) {
+            assert.ok(!err, err);
+            assert.deepEqual(getFeatureByCartodbId(geojsonTile.features, 1109).properties, {
+                cartodb_id: 1109,
+                name: 'Mardin',
+                adm0name: 'Turkey',
+                pop_max: 71373
+            });
+            done();
+        });
+    });
+
+    it('with formula widget, no interactivity and no cartocss columns', function(done) {
+        var formulaWidgetMapConfig = {
+            version: '1.5.0',
+            layers: [{
+                type: 'mapnik',
+                options: {
+                    sql: 'select * from populated_places_simple_reduced where pop_max > 0 and pop_max < 600000',
+                    cartocss: '#layer0 { marker-fill: red; marker-width: 10; }',
+                    cartocss_version: '2.0.1',
+                    interactivity: 'cartodb_id',
+                    widgets: {
+                        pop_max_f: {
+                            type: 'formula',
+                            options: {
+                                column: 'pop_max',
+                                operation: 'count'
+                            }
+                        }
+                    }
+                }
+            }]
+        };
+
+        this.testClient = new TestClient(formulaWidgetMapConfig);
+        this.testClient.getTile(0, 0, 0, options, function (err, res, geojsonTile) {
+            assert.ok(!err, err);
+            assert.deepEqual(getFeatureByCartodbId(geojsonTile.features, 1109).properties, {
+                cartodb_id: 1109,
+                pop_max: 71373
+            });
+            done();
+        });
+    });
+    it('with cartocss with multiple expressions', function(done) {
+        var formulaWidgetMapConfig = {
+            version: '1.5.0',
+            layers: [{
+                type: 'mapnik',
+                options: {
+                    sql: 'select * from populated_places_simple_reduced where pop_max > 0 and pop_max < 600000',
+                    cartocss: '#layer0 { marker-fill: red; marker-width: 10; }' +
+                        '#layer0 { marker-width: 14; [name="Madrid"] { marker-width: 20; } }' +
+                        '#layer0[pop_max>1000] { marker-width: 14; [name="Madrid"] { marker-width: 20; } }' +
+                        '#layer0[adm0name=~".*Turkey*"] { marker-width: 14; [name="Madrid"] { marker-width: 20; } }',
+                    cartocss_version: '2.0.1',
+                    interactivity: 'cartodb_id'
+                }
+            }]
+        };
+
+        this.testClient = new TestClient(formulaWidgetMapConfig);
+        this.testClient.getTile(0, 0, 0, options, function (err, res, geojsonTile) {
+            assert.ok(!err, err);
+            assert.deepEqual(getFeatureByCartodbId(geojsonTile.features, 1109).properties, {
+                cartodb_id: 1109,
+                pop_max:71373,
+                name:"Mardin",
+                adm0name:"Turkey"
+            });
+            done();
+        });
+    });
+
+    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

@@ -7,7 +7,7 @@ var redis = require('redis');
 var CartodbWindshaft = require('../../lib/cartodb/server');
 var serverOptions = require('../../lib/cartodb/server_options');
 
-var LayergroupToken = require('../../lib/cartodb/models/layergroup_token');
+var LayergroupToken = require('../support/layergroup-token');
 
 describe('render limits', function() {
 

test/acceptance/multilayer.js

@@ -6,7 +6,7 @@ var strftime    = require('strftime');
 var redis_stats_db = 5;
 
 var helper = require(__dirname + '/../support/test_helper');
-var LayergroupToken = require('../../lib/cartodb/models/layergroup_token');
+var LayergroupToken = require('../support/layergroup-token');
 
 var windshaft_fixtures = __dirname + '/../../node_modules/windshaft/test/fixtures';
 

test/acceptance/multilayer_server.js

@@ -4,7 +4,7 @@ var assert = require('../support/assert');
 
 var _ = require('underscore');
 
-var LayergroupToken = require('../../lib/cartodb/models/layergroup_token');
+var LayergroupToken = require('../support/layergroup-token');
 
 var PgQueryRunner = require('../../lib/cartodb/backends/pg_query_runner');
 var QueryTables = require('cartodb-query-tables');

test/acceptance/named_layers.js

@@ -5,7 +5,7 @@ var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/server');
 var serverOptions = require(__dirname + '/../../lib/cartodb/server_options');
 var server = new CartodbWindshaft(serverOptions);
 
-var LayergroupToken = require('../../lib/cartodb/models/layergroup_token');
+var LayergroupToken = require('../support/layergroup-token');
 
 var RedisPool = require('redis-mpool');
 var TemplateMaps = require('../../lib/cartodb/backends/template_maps.js');

test/acceptance/overviews_metadata.js

@@ -5,7 +5,7 @@ var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/server');
 var serverOptions = require(__dirname + '/../../lib/cartodb/server_options');
 var server = new CartodbWindshaft(serverOptions);
 
-var LayergroupToken = require('../../lib/cartodb/models/layergroup_token');
+var LayergroupToken = require('../support/layergroup-token');
 
 var RedisPool = require('redis-mpool');
 

test/acceptance/overviews_metadata_named_maps.js

@@ -5,7 +5,7 @@ var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/server');
 var serverOptions = require(__dirname + '/../../lib/cartodb/server_options');
 var server = new CartodbWindshaft(serverOptions);
 
-var LayergroupToken = require('../../lib/cartodb/models/layergroup_token');
+var LayergroupToken = require('../support/layergroup-token');
 
 var RedisPool = require('redis-mpool');
 

test/acceptance/ported/attributes.js

@@ -6,7 +6,7 @@ var cartodbServer = require('../../../lib/cartodb/server');
 var PortedServerOptions = require('./support/ported_server_options');
 var BaseController = require('../../../lib/cartodb/controllers/base');
 
-var LayergroupToken = require('../../../lib/cartodb/models/layergroup_token');
+var LayergroupToken = require('../../support/layergroup-token');
 
 
 describe('attributes', function() {

test/acceptance/ported/multilayer.js

@@ -7,7 +7,7 @@ var step = require('step');
 var mapnik = require('windshaft').mapnik;
 var cartodbServer = require('../../../lib/cartodb/server');
 var ServerOptions = require('./support/ported_server_options');
-var LayergroupToken = require('../../../lib/cartodb/models/layergroup_token');
+var LayergroupToken = require('../../support/layergroup-token');
 var BaseController = require('../../../lib/cartodb/controllers/base');
 
 describe('multilayer', function() {

test/acceptance/ported/multilayer_interactivity.js

@@ -5,7 +5,7 @@ var _             = require('underscore');
 var cartodbServer = require('../../../lib/cartodb/server');
 var getLayerTypeFn = require('windshaft').model.MapConfig.prototype.getType;
 var PortedServerOptions = require('./support/ported_server_options');
-var LayergroupToken = require('../../../lib/cartodb/models/layergroup_token');
+var LayergroupToken = require('../../support/layergroup-token');
 
 var BaseController = require('../../../lib/cartodb/controllers/base');
 

test/acceptance/ported/raster.js

@@ -6,7 +6,7 @@ var cartodbServer = require('../../../lib/cartodb/server');
 var ServerOptions = require('./support/ported_server_options');
 
 var BaseController = require('../../../lib/cartodb/controllers/base');
-var LayergroupToken = require('../../../lib/cartodb/models/layergroup_token');
+var LayergroupToken = require('../../support/layergroup-token');
 
 describe('raster', function() {
 

test/acceptance/ported/retina.js

@@ -6,7 +6,7 @@ var cartodbServer = require('../../../lib/cartodb/server');
 var ServerOptions = require('./support/ported_server_options');
 
 var BaseController = require('../../../lib/cartodb/controllers/base');
-var LayergroupToken = require('../../../lib/cartodb/models/layergroup_token');
+var LayergroupToken = require('../../support/layergroup-token');
 
 describe('retina support', function() {
 

test/acceptance/ported/server_png8_format.js

@@ -7,7 +7,7 @@ var cartodbServer = require('../../../lib/cartodb/server');
 var ServerOptions = require('./support/ported_server_options');
 
 var BaseController = require('../../../lib/cartodb/controllers/base');
-var LayergroupToken = require('../../../lib/cartodb/models/layergroup_token');
+var LayergroupToken = require('../../support/layergroup-token');
 
 var IMAGE_EQUALS_TOLERANCE_PER_MIL = 85;
 

test/acceptance/ported/support/ported_server_options.js

@@ -1,6 +1,6 @@
 var _ = require('underscore');
 var serverOptions = require('../../../../lib/cartodb/server_options');
-var LayergroupToken = require('../../../../lib/cartodb/models/layergroup_token');
+var LayergroupToken = require('../../../support/layergroup-token');
 var mapnik = require('windshaft').mapnik;
 var OverviewsQueryRewriter = require('../../../../lib/cartodb/utils/overviews_query_rewriter');
 var overviewsQueryRewriter = new OverviewsQueryRewriter({

test/acceptance/ported/support/test_client.js

@@ -1,5 +1,5 @@
 var testHelper = require('../../../support/test_helper');
-var LayergroupToken = require('../../../../lib/cartodb/models/layergroup_token');
+var LayergroupToken = require('../../../support/layergroup-token');
 
 var step = require('step');
 var assert = require('../../../support/assert');

test/acceptance/ported/torque.js

@@ -7,7 +7,7 @@ var cartodbServer = require('../../../lib/cartodb/server');
 var ServerOptions = require('./support/ported_server_options');
 
 var BaseController = require('../../../lib/cartodb/controllers/base');
-var LayergroupToken = require('../../../lib/cartodb/models/layergroup_token');
+var LayergroupToken = require('../../support/layergroup-token');
 
 describe('torque', function() {
 

test/acceptance/ported/torque_boundaries.js

@@ -5,7 +5,7 @@ var cartodbServer = require('../../../lib/cartodb/server');
 var ServerOptions = require('./support/ported_server_options');
 
 var BaseController = require('../../../lib/cartodb/controllers/base');
-var LayergroupToken = require('../../../lib/cartodb/models/layergroup_token');
+var LayergroupToken = require('../../support/layergroup-token');
 
 describe('torque boundary points', function() {
 

test/acceptance/sql-wrap.js

@@ -0,0 +1,52 @@
+require('../support/test_helper');
+
+var assert = require('../support/assert');
+var TestClient = require('../support/test-client');
+
+describe('sql-wrap', function() {
+
+    afterEach(function(done) {
+        if (this.testClient) {
+            this.testClient.drain(done);
+        } else {
+            return done();
+        }
+    });
+
+    it('should use sql_wrap from layer options', function(done) {
+        var mapConfig = {
+            version: '1.5.0',
+            layers: [
+                {
+                    "type": "cartodb",
+                    "options": {
+                        "sql": "SELECT * FROM populated_places_simple_reduced",
+                        "sql_wrap": "SELECT * FROM (<%= sql %>) _w WHERE adm0_a3 = 'USA'",
+                        "cartocss": [
+                            "#points {",
+                            "  marker-fill-opacity: 1;",
+                            "  marker-line-color: #FFF;",
+                            "  marker-line-width: 0.5;",
+                            "  marker-line-opacity: 1;",
+                            "  marker-placement: point;",
+                            "  marker-type: ellipse;",
+                            "  marker-width: 8;",
+                            "  marker-fill: red;",
+                            "  marker-allow-overlap: true;",
+                            "}"
+                        ].join('\n'),
+                        "cartocss_version": "2.3.0"
+                    }
+                }
+            ]
+        };
+
+        this.testClient = new TestClient(mapConfig, 1234);
+        this.testClient.getTile(0, 0, 0, function(err, tile, img) {
+            assert.ok(!err, err);
+            var fixtureImg = './test/fixtures/sql-wrap-usa-filter.png';
+            assert.imageIsSimilarToFile(img, fixtureImg, 20, done);
+        });
+    });
+
+});

test/acceptance/templates.js

@@ -23,7 +23,7 @@ var serverOptions = require(__dirname + '/../../lib/cartodb/server_options');
 var server = new CartodbWindshaft(serverOptions);
 server.setMaxListeners(0);
 
-var LayergroupToken = require('../../lib/cartodb/models/layergroup_token');
+var LayergroupToken = require('../support/layergroup-token');
 
 describe('template_api', function() {
     server.layergroupAffectedTablesCache.cache.reset();

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

@@ -53,6 +53,20 @@ describe('turbo-carto for anonymous maps', function() {
             var fixturePath = 'test_turbo_carto_greens_13_4011_3088.png';
             this.testClient.getTile(13, 4011, 3088, imageCompareFn(fixturePath, done));
         });
+
+        it('should work for different char case in quantification names', function(done) {
+            this.testClient = new TestClient(
+                makeMapconfig('#layer { marker-fill: ramp([price], colorbrewer(Greens, 3), jeNkS); }')
+            );
+            this.testClient.getLayergroup(function(err, layergroup) {
+                assert.ok(!err, err);
+
+                assert.ok(layergroup.hasOwnProperty('layergroupid'));
+                assert.ok(!layergroup.hasOwnProperty('errors'));
+
+                done();
+            });
+        });
     });
 
     describe('parsing ramp function with colorbrewer for reds and mapnik renderer', function () {

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

@@ -78,6 +78,21 @@ describe('turbo-carto error cases', function() {
         });
     });
 
+    it('should return invalid method from datasource', function(done) {
+        this.testClient = new TestClient(makeMapconfig(null, 'ramp([wadus_column], (red, green, blue), wadusmethod)'));
+        this.testClient.getLayergroup(ERROR_RESPONSE, function(err, layergroup) {
+            assert.ok(!err, err);
+
+            assert.ok(layergroup.hasOwnProperty('errors'));
+            assert.equal(layergroup.errors.length, 1);
+            assert.ok(layergroup.errors[0].match(/^turbo-carto/));
+            assert.ok(layergroup.errors[0].match(/unable\sto\scompute\sramp/i));
+            assert.ok(layergroup.errors[0].match(/invalid\smethod\s\"wadusmethod\"/i));
+
+            done();
+        });
+    });
+
     it('should fail by falling back to normal carto parser', function(done) {
         this.testClient = new TestClient(makeMapconfig('ramp([price], (8,24,96), (8,24,96));//(red, green, blue))'));
         this.testClient.getLayergroup(ERROR_RESPONSE, function(err, layergroup) {

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

@@ -1,6 +1,6 @@
 var assert = require('../../support/assert');
 var step = require('step');
-var LayergroupToken = require('../../../lib/cartodb/models/layergroup_token');
+var LayergroupToken = require('../../support/layergroup-token');
 var testHelper = require('../../support/test_helper');
 var CartodbWindshaft = require('../../../lib/cartodb/server');
 var serverOptions = require('../../../lib/cartodb/server_options');

test/acceptance/turbo-cartocss/regressions.js

@@ -102,4 +102,69 @@ describe('turbo-carto regressions', function() {
             done();
         });
     });
+
+    it('should work with mapnik substitution tokens and analyses', 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 sqlWrap = [
+            '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, (<%= sql %>) i',
+            'where ST_Intersects(i.the_geom_webmercator, hgrid.cell)',
+            'GROUP BY hgrid.cell'
+        ].join('\n');
+
+        var mapConfig = {
+            "version": "1.5.0",
+            "layers": [
+                {
+                    "type": 'mapnik',
+                    "options": {
+                        "cartocss_version": '2.3.0',
+                        "source": {
+                            "id": "head"
+                        },
+                        sql_wrap: sqlWrap,
+                        "cartocss": cartocss
+                    }
+                }
+            ],
+            "analyses": [
+                {
+                    "id": "head",
+                    "type": "source",
+                    "params": {
+                        "query": "SELECT * FROM populated_places_simple_reduced"
+                    }
+                }
+            ]
+        };
+
+        this.testClient = new TestClient(mapConfig, 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/named-maps.js

@@ -10,7 +10,7 @@ var CartodbWindshaft = require('../../../lib/cartodb/server');
 var serverOptions = require('../../../lib/cartodb/server_options');
 var server = new CartodbWindshaft(serverOptions);
 
-var LayergroupToken = require('../../../lib/cartodb/models/layergroup_token');
+var LayergroupToken = require('../../support/layergroup-token');
 
 describe('named-maps widgets', function() {
 

test/acceptance/widgets/ported/aggregation.js

@@ -0,0 +1,329 @@
+require('../../../support/test_helper');
+
+var assert = require('../../../support/assert');
+var TestClient = require('../../../support/test-client');
+
+describe('widgets', function() {
+
+    describe('aggregations', function() {
+
+        afterEach(function(done) {
+            if (this.testClient) {
+                this.testClient.drain(done);
+            } else {
+                done();
+            }
+        });
+
+        var aggregationMapConfig = {
+            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: 'count'
+                                }
+                            }
+                        }
+                    }
+                }
+            ]
+        };
+
+        it('can be fetched from a valid aggregation', function(done) {
+            this.testClient = new TestClient(aggregationMapConfig);
+            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: 'United States of America', value: 769, agg: false }
+                );
+
+                assert.deepEqual(
+                    aggregation.categories[aggregation.categories.length - 1],
+                    { category: 'Other', value: 4914, agg: true }
+                );
+
+                done();
+            });
+        });
+
+        var filteredCategoriesScenarios = [
+            { accept: ['Canada'], values: [256] },
+            { accept: ['Canada', 'Spain', 'Chile', 'Thailand'], values: [256, 49, 83, 79] },
+            { accept: ['Canada', 'Spain', 'Chile', 'Thailand', 'Japan'], values: [256, 49, 83, 79, 69] },
+            { accept: ['Canada', 'Spain', 'Chile', 'Thailand', 'Japan', 'France'], values: [256, 49, 83, 79, 69, 71] },
+            {
+                accept: ['United States of America', 'Canada', 'Spain', 'Chile', 'Thailand', 'Japan', 'France'],
+                values: [769, 256, 49, 83, 79, 69, 71]
+            }
+        ];
+
+        filteredCategoriesScenarios.forEach(function(scenario) {
+            it('can filter some categories: ' + scenario.accept.join(', '), function(done) {
+                this.testClient = new TestClient(aggregationMapConfig);
+                var adm0nameFilter = {
+                    adm0name: {
+                        accept: scenario.accept
+                    }
+                };
+                var params = {
+                    own_filter: 1,
+                    filters: {
+                        layers: [
+                            adm0nameFilter
+                        ]
+                    }
+                };
+                this.testClient.getWidget('adm0name', params, function (err, res, aggregation) {
+                    assert.ok(!err, err);
+                    assert.ok(aggregation);
+                    assert.equal(aggregation.type, 'aggregation');
+
+                    assert.equal(aggregation.categories.length, scenario.accept.length);
+
+                    var categoriesByCategory = aggregation.categories.reduce(function(byCategory, row) {
+                        byCategory[row.category] = row;
+                        return byCategory;
+                    }, {});
+
+                    var scenarioByCategory = scenario.accept.reduce(function(byCategory, category, index) {
+                        byCategory[category] = { category: category, value: scenario.values[index], agg: false };
+                        return byCategory;
+                    }, {});
+
+                    Object.keys(categoriesByCategory).forEach(function(category) {
+                        assert.deepEqual(categoriesByCategory[category], scenarioByCategory[category]);
+                    });
+
+                    done();
+                });
+            });
+        });
+
+        var aggregationSumMapConfig = {
+            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'
+                                }
+                            }
+                        }
+                    }
+                }
+            ]
+        };
+
+        it('can sum other column for aggregation value', function(done) {
+
+            this.testClient = new TestClient(aggregationSumMapConfig);
+            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();
+            });
+        });
+
+        var filteredCategoriesSumScenarios = [
+            { accept: [], values: [] },
+            { accept: ['Canada'], values: [23955084] },
+            { accept: ['Canada', 'Spain', 'Chile', 'Thailand'], values: [23955084, 22902774, 14356263, 17492483] },
+            {
+                accept: ['United States of America', 'Canada', 'Spain', 'Chile', 'Thailand', 'Japan', 'France'],
+                values: [239098994, 23955084, 22902774, 14356263, 17492483, 93577001, 25473876]
+            }
+        ];
+
+        filteredCategoriesSumScenarios.forEach(function(scenario) {
+            it('can filter some categories with sum aggregation: ' + scenario.accept.join(', '), function(done) {
+                this.testClient = new TestClient(aggregationSumMapConfig);
+                var adm0nameFilter = {
+                    adm0name: {
+                        accept: scenario.accept
+                    }
+                };
+                var params = {
+                    own_filter: 1,
+                    filters: {
+                        layers: [
+                            adm0nameFilter
+                        ]
+                    }
+                };
+                this.testClient.getWidget('adm0name', params, function (err, res, aggregation) {
+                    assert.ok(!err, err);
+                    assert.ok(aggregation);
+                    assert.equal(aggregation.type, 'aggregation');
+
+                    assert.equal(aggregation.categories.length, scenario.accept.length);
+
+                    var categoriesByCategory = aggregation.categories.reduce(function(byCategory, row) {
+                        byCategory[row.category] = row;
+                        return byCategory;
+                    }, {});
+
+                    var scenarioByCategory = scenario.accept.reduce(function(byCategory, category, index) {
+                        byCategory[category] = { category: category, value: scenario.values[index], agg: false };
+                        return byCategory;
+                    }, {});
+
+                    Object.keys(categoriesByCategory).forEach(function(category) {
+                        assert.deepEqual(categoriesByCategory[category], scenarioByCategory[category]);
+                    });
+
+                    done();
+                });
+            });
+        });
+
+        var numericAggregationMapConfig = {
+            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.3.0',
+                        widgets: {
+                            scalerank: {
+                                type: 'aggregation',
+                                options: {
+                                    column: 'scalerank',
+                                    aggregation: 'count'
+                                }
+                            }
+                        }
+                    }
+                }
+            ]
+        };
+
+        ['1', 1].forEach(function(filterValue) {
+            it('can filter numeric categories: ' + (typeof filterValue), function(done) {
+                this.testClient = new TestClient(numericAggregationMapConfig);
+                var scalerankFilter = {
+                    scalerank: {
+                        accept: [filterValue]
+                    }
+                };
+                var params = {
+                    own_filter: 1,
+                    filters: {
+                        layers: [scalerankFilter]
+                    }
+                };
+                this.testClient.getWidget('scalerank', params, function (err, res, aggregation) {
+                    assert.ok(!err, err);
+                    assert.ok(aggregation);
+                    assert.equal(aggregation.type, 'aggregation');
+
+                    assert.equal(aggregation.categories.length, 1);
+                    assert.deepEqual(aggregation.categories[0], { category: '1', value: 179, agg: false });
+
+                    done();
+                });
+            });
+        });
+
+        describe('search', function() {
+            afterEach(function(done) {
+                if (this.testClient) {
+                    this.testClient.drain(done);
+                } else {
+                    done();
+                }
+            });
+
+            ['1', 1].forEach(function(userQuery) {
+                it('can search numeric categories: ' + (typeof userQuery), function(done) {
+                    this.testClient = new TestClient(numericAggregationMapConfig);
+                    var scalerankFilter = {
+                        scalerank: {
+                            accept: [userQuery]
+                        }
+                    };
+                    var params = {
+                        own_filter: 0,
+                        filters: {
+                            layers: [scalerankFilter]
+                        }
+                    };
+                    this.testClient.widgetSearch('scalerank', userQuery, params, function (err, res, searchResult) {
+                        assert.ok(!err, err);
+                        assert.ok(searchResult);
+                        assert.equal(searchResult.type, 'aggregation');
+
+                        assert.equal(searchResult.categories.length, 2);
+                        assert.deepEqual(
+                            searchResult.categories,
+                            [{ category: 10, value: 515 }, { category: 1, value: 179 }]
+                        );
+
+                        done();
+                    });
+                });
+            });
+
+            var adm0name = 'Argentina';
+            [adm0name, adm0name.toLowerCase(), adm0name.toUpperCase()].forEach(function(userQuery) {
+                it('should search with case insensitive: ' + userQuery, function(done) {
+                    this.testClient = new TestClient(aggregationMapConfig);
+                    this.testClient.widgetSearch('adm0name', userQuery, function (err, res, searchResult) {
+                        assert.ok(!err, err);
+                        assert.ok(searchResult);
+                        assert.equal(searchResult.type, 'aggregation');
+
+                        assert.equal(searchResult.categories.length, 1);
+                        assert.deepEqual(
+                            searchResult.categories,
+                            [{ category:"Argentina", value:159 }]
+                        );
+
+                        done();
+                    });
+                });
+            });
+        });
+
+    });
+
+});

test/acceptance/widgets/ported/formula.js

@@ -0,0 +1,89 @@
+require('../../../support/test_helper');
+
+var assert        = require('../../../support/assert');
+var TestClient = require('../../../support/test-client');
+
+describe('widgets', function() {
+
+    describe('formula', function() {
+
+        afterEach(function(done) {
+            if (this.testClient) {
+                this.testClient.drain(done);
+            } else {
+                done();
+            }
+        });
+
+        function widgetsMapConfig(widgets) {
+            return {
+                version: '1.5.0',
+                layers: [
+                    {
+                        type: 'mapnik',
+                        options: {
+                            sql: 'select * from populated_places_simple_reduced where pop_max > 0 and pop_max < 600000',
+                            cartocss: '#layer0 { marker-fill: red; marker-width: 10; }',
+                            cartocss_version: '2.0.1',
+                            widgets: widgets
+                        }
+                    }
+                ]
+            };
+        }
+
+        var operations = {
+            min: [10, 0],
+            max: [599579, 0],
+            count: [5822, 0],
+            avg: [112246.00893163861, 0],
+            sum: [653496264, 0]
+        };
+
+        Object.keys(operations).forEach(function(operation) {
+            it('should do ' + operation + ' over column', function(done) {
+                var widgets = {
+                    pop_max_f: {
+                        type: 'formula',
+                        options: {
+                            column: 'pop_max',
+                            operation: operation
+                        }
+                    }
+                };
+                this.testClient = new TestClient(widgetsMapConfig(widgets));
+                this.testClient.getWidget('pop_max_f', function (err, res, result) {
+                    assert.ok(!err, err);
+                    assert.equal(result.operation, operation);
+                    assert.equal(result.result, operations[operation][0]);
+                    assert.equal(result.nulls, operations[operation][1]);
+
+                    done();
+                });
+            });
+        });
+
+        it('does not require column for count formula', function(done) {
+           var operation = 'count';
+            var widgets = {
+                pop_max_count_f: {
+                    type: 'formula',
+                    options: {
+                        operation: operation
+                    }
+                }
+            };
+            this.testClient = new TestClient(widgetsMapConfig(widgets));
+            this.testClient.getWidget('pop_max_count_f', function (err, res, result) {
+                assert.ok(!err, err);
+                assert.equal(result.operation, operation);
+                assert.equal(result.result, operations[operation][0]);
+                assert.equal(result.nulls, operations[operation][1]);
+
+                done();
+            });
+        });
+
+    });
+
+});

test/acceptance/widgets/ported/histogram.js

@@ -0,0 +1,373 @@
+require('../../../support/test_helper');
+
+var assert        = require('../../../support/assert');
+var TestClient = require('../../../support/test-client');
+
+describe('widgets', function() {
+
+    describe('histograms', function() {
+
+        afterEach(function(done) {
+            if (this.testClient) {
+                this.testClient.drain(done);
+            } else {
+                done();
+            }
+        });
+
+        function histogramsMapConfig(widgets) {
+            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: widgets || {
+                                scalerank: {
+                                    type: 'histogram',
+                                    options: {
+                                        column: 'scalerank'
+                                    }
+                                },
+                                pop_max: {
+                                    type: 'histogram',
+                                    options: {
+                                        column: 'pop_max'
+                                    }
+                                }
+                            }
+                        }
+                    }
+                ]
+            };
+        }
+
+        it('can be fetched from a valid histogram', function(done) {
+            this.testClient = new TestClient(histogramsMapConfig());
+            this.testClient.getWidget('scalerank', function (err, res, histogram) {
+                assert.ok(!err, err);
+                assert.ok(histogram);
+                assert.equal(histogram.type, 'histogram');
+                validateHistogramBins(histogram);
+
+                assert.ok(histogram.bins.length);
+
+                assert.deepEqual(histogram.bins[0], { bin: 0, freq: 179, min: 1, max: 1, avg: 1 });
+
+                done();
+            });
+        });
+
+        it('can be fetched from a valid histogram', function(done) {
+            this.testClient = new TestClient(histogramsMapConfig());
+            this.testClient.getWidget('pop_max', function (err, res, histogram) {
+                assert.ok(!err, err);
+                assert.ok(histogram);
+                assert.equal(histogram.type, 'histogram');
+                validateHistogramBins(histogram);
+
+                assert.ok(histogram.bins.length);
+
+                assert.deepEqual(
+                    histogram.bins[histogram.bins.length - 1],
+                    { bin: 47, freq: 1, min: 35676000, max: 35676000, avg: 35676000 }
+                );
+
+                done();
+            });
+        });
+
+        it('can be fetched from a valid filtered histogram', function(done) {
+            this.testClient = new TestClient(histogramsMapConfig());
+            var popMaxFilter = {
+                pop_max: {
+                    min: 1e5,
+                    max: 1e7
+                }
+            };
+            var params = {
+                own_filter: 1,
+                filters: {
+                    layers: [popMaxFilter]
+                }
+            };
+            this.testClient.getWidget('pop_max', params, function (err, res, histogram) {
+                assert.ok(!err, err);
+                assert.ok(histogram);
+                assert.equal(histogram.type, 'histogram');
+                validateHistogramBins(histogram);
+
+                assert.ok(histogram.bins.length);
+
+                assert.deepEqual(
+                    histogram.bins[histogram.bins.length - 1],
+                    { bin: 7, min: 8829000, max: 9904000, avg: 9340914.714285715, freq: 7 }
+                );
+
+                done();
+            });
+        });
+
+        it('returns array with freq=0 entries for empty bins', function(done) {
+            var histogram20binsMapConfig = {
+                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: {
+                                pop_max: {
+                                    type: 'histogram',
+                                    options: {
+                                        column: 'pop_max'
+                                    }
+                                }
+                            }
+                        }
+                    }
+                ]
+            };
+
+            this.testClient = new TestClient(histogram20binsMapConfig);
+            this.testClient.getWidget('pop_max', { start: 0, end: 35676000, bins: 20 }, function (err, res, histogram) {
+                assert.ok(!err, err);
+                assert.equal(histogram.type, 'histogram');
+                validateHistogramBins(histogram);
+                assert.ok(histogram.bins.length);
+                assert.deepEqual(
+                    histogram.bins[histogram.bins.length - 1],
+                    { bin: 19, freq: 1, min: 35676000, max: 35676000, avg: 35676000 }
+                );
+
+                var emptyBin = histogram.bins[18];
+                assert.ok(!emptyBin);
+
+                done();
+            });
+        });
+
+        it('can use a fixed number of bins', function(done) {
+            var fixedBinsHistogramMapConfig = histogramsMapConfig({
+                pop_max: {
+                    type: 'histogram',
+                    options: {
+                        column: 'pop_max'
+                    }
+                }
+            });
+
+            this.testClient = new TestClient(fixedBinsHistogramMapConfig);
+            this.testClient.getWidget('pop_max', { bins: 5 }, function (err, res, histogram) {
+                assert.ok(!err, err);
+                assert.equal(histogram.type, 'histogram');
+
+                assert.equal(histogram.bins_count, 5);
+
+                validateHistogramBins(histogram);
+
+                assert.ok(histogram.bins.length);
+                assert.deepEqual(
+                    histogram.bins[0],
+                    { bin: 0, min: 0, max: 7067423, avg: 280820.0057731959, freq: 7275 }
+                );
+                assert.deepEqual(
+                    histogram.bins[histogram.bins.length - 1],
+                    { bin: 4, freq: 1, min: 35676000, max: 35676000, avg: 35676000 }
+                );
+
+                done();
+            });
+        });
+
+        function validateHistogramBins(histogram) {
+            var binWidth = histogram.bin_width;
+            var start = histogram.bins_start;
+            var end = start + (histogram.bins_count * binWidth);
+
+            var firstBin = histogram.bins[0];
+            assert.equal(firstBin.min, start,
+                'First bin does not match min and start ' + JSON.stringify({
+                    min: firstBin.min,
+                    start: start
+                })
+            );
+
+            var lastBin = histogram.bins[histogram.bins.length - 1];
+            assert.equal(lastBin.max, end,
+                'Last bin does not match max and end ' + JSON.stringify({
+                    max: lastBin.max,
+                    end: end
+                })
+            );
+
+            function getBinStartEnd(binIndex) {
+                return {
+                    start: start + (binIndex * binWidth),
+                    end: start + ((binIndex + 1) * binWidth)
+                };
+            }
+
+            histogram.bins.forEach(function(bin) {
+                var binStartEnd = getBinStartEnd(bin.bin);
+
+                assert.ok(binStartEnd.start <= bin.min,
+                    'Bin start bigger than bin min ' + JSON.stringify({
+                        bin: bin.bin,
+                        min: bin.min,
+                        start: binStartEnd.start
+                    })
+                );
+
+                assert.ok(binStartEnd.end >= bin.max,
+                    'Bin end smaller than bin max ' + JSON.stringify({
+                        bin: bin.bin,
+                        max: bin.max,
+                        end: binStartEnd.end
+                    })
+                );
+
+                assert.ok(bin.avg >= bin.min && bin.avg <= bin.max,
+                        'Bin avg not between min and max values' + JSON.stringify({
+                        bin: bin.bin,
+                        avg: bin.avg,
+                        min: bin.min,
+                        max: bin.max
+                    })
+                );
+            });
+        }
+
+        describe('datetime column', function() {
+            afterEach(function(done) {
+                if (this.testClient) {
+                    this.testClient.drain(done);
+                } else {
+                    done();
+                }
+            });
+
+            var updatedAtFilter = {
+                updated_at: {
+                    min: 0
+                }
+            };
+
+            it('can use a datetime column', function(done) {
+                this.testClient = new TestClient(histogramsMapConfig({
+                    updated_at: {
+                        type: 'histogram',
+                        options: {
+                            column: 'updated_at'
+                        }
+                    }
+                }));
+                this.testClient.getWidget('updated_at', function (err, res, histogram) {
+                    assert.ok(!err, err);
+                    assert.ok(histogram);
+                    assert.equal(histogram.type, 'histogram');
+
+                    assert.ok(histogram.bins.length);
+
+                    done();
+                });
+            });
+
+            it('can use a datetime filtered column', function(done) {
+                this.testClient = new TestClient(histogramsMapConfig({
+                    updated_at: {
+                        type: 'histogram',
+                        options: {
+                            column: 'updated_at'
+                        }
+                    }
+                }));
+                var params = {
+                    own_filter: 1,
+                    filters: {
+                        layers: [updatedAtFilter]
+                    }
+                };
+                this.testClient.getWidget('updated_at', params, function (err, res, histogram) {
+                    assert.ok(!err, err);
+                    assert.ok(histogram);
+                    assert.equal(histogram.type, 'histogram');
+
+                    assert.ok(histogram.bins.length);
+
+                    done();
+                });
+            });
+
+            it('can getTile with datetime filtered column', function(done) {
+                this.testClient = new TestClient(histogramsMapConfig({
+                    updated_at: {
+                        type: 'histogram',
+                        options: {
+                            column: 'updated_at'
+                        }
+                    }
+                }));
+                var params = {
+                    own_filter: 1,
+                    filters: {
+                        layers: [updatedAtFilter]
+                    }
+                };
+                this.testClient.getTile(0, 0, 0, params, function (err, res, tile) {
+                    assert.ok(!err, err);
+                    assert.ok(tile);
+
+                    done();
+                });
+            });
+
+            it('can use two columns with different types', function(done) {
+                this.testClient = new TestClient(histogramsMapConfig({
+                    updated_at: {
+                        type: 'histogram',
+                        options: {
+                            column: 'updated_at'
+                        }
+                    },
+                    pop_max: {
+                        type: 'histogram',
+                        options: {
+                            column: 'pop_max'
+                        }
+                    }
+                }));
+
+                var popMaxFilter = {
+                    pop_max: {
+                        max: 1e7
+                    }
+                };
+
+                var params = {
+                    own_filter: 1,
+                    filters: {
+                        layers: [popMaxFilter]
+                    }
+                };
+
+                this.testClient.getWidget('updated_at', params, function (err, res, histogram) {
+                    assert.ok(!err, err);
+                    assert.ok(histogram);
+                    assert.equal(histogram.type, 'histogram');
+
+                    assert.ok(histogram.bins.length);
+
+                    done();
+                });
+            });
+        });
+
+    });
+
+});

test/acceptance/widgets/ported/list.js

@@ -0,0 +1,106 @@
+require('../../../support/test_helper');
+
+var assert        = require('../../../support/assert');
+var TestClient = require('../../../support/test-client');
+var _ = require('underscore');
+
+describe('widgets', function() {
+
+    describe('lists', function() {
+
+        afterEach(function(done) {
+            if (this.testClient) {
+                this.testClient.drain(done);
+            } else {
+                done();
+            }
+        });
+
+        function listsMapConfig(columns) {
+            return {
+                version: '1.5.0',
+                layers: [
+                    {
+                        type: 'mapnik',
+                        options: {
+                            sql: 'select * from test_table',
+                            cartocss: '#layer0 { marker-fill: red; marker-width: 10; }',
+                            cartocss_version: '2.0.1',
+                            widgets: {
+                                places: {
+                                    type: 'list',
+                                    options: {
+                                        columns: columns || ['name', 'address']
+                                    }
+                                }
+                            }
+                        }
+                    }
+                ]
+            };
+        }
+
+        var EXPECTED_NAMES = ['Hawai', 'El Estocolmo', 'El Rey del Tallarín', 'El Lacón', 'El Pico'];
+
+        it('can be fetched from a valid list', function(done) {
+            var columns = ['name', 'address'];
+            this.testClient = new TestClient(listsMapConfig(columns));
+            this.testClient.getWidget('places', function (err, res, list) {
+                assert.ok(!err, err);
+                assert.ok(list);
+                assert.equal(list.type, 'list');
+                assert.equal(list.rows.length, 5);
+
+                assert.ok(onlyHasFields(list, columns));
+
+                var names = list.rows.map(function (item) {
+                    return item.name;
+                });
+                assert.deepEqual(names, EXPECTED_NAMES);
+
+                var expectedAddresses = [
+                    'Calle de Pérez Galdós 9, Madrid, Spain',
+                    'Calle de la Palma 72, Madrid, Spain',
+                    'Plaza Conde de Toreno 2, Madrid, Spain',
+                    'Manuel Fernández y González 8, Madrid, Spain',
+                    'Calle Divino Pastor 12, Madrid, Spain'
+                ];
+                var addresses = list.rows.map(function (item) {
+                    return item.address;
+                });
+                assert.deepEqual(addresses, expectedAddresses);
+
+                done();
+            });
+        });
+
+        it('should fetch just one column', function(done) {
+            var columns = ['name'];
+            this.testClient = new TestClient(listsMapConfig(columns));
+            this.testClient.getWidget('places', function (err, res, list) {
+                assert.ok(!err, err);
+                assert.ok(list);
+                assert.equal(list.type, 'list');
+                assert.equal(list.rows.length, 5);
+
+                assert.ok(onlyHasFields(list, columns));
+
+                var names = list.rows.map(function (item) {
+                    return item.name;
+                });
+                assert.deepEqual(names, EXPECTED_NAMES);
+
+                done();
+            });
+        });
+
+        function onlyHasFields(list, expectedFields) {
+            var fields = (!!list.rows[0]) ? Object.keys(list.rows[0]) : [];
+
+            return _.difference(fields, expectedFields).length === 0 &&
+                _.difference(expectedFields, fields).length === 0;
+        }
+
+    });
+
+});

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/acceptance/x_cache_channel.js

@@ -8,7 +8,7 @@ var serverOptions = require('../../lib/cartodb/server_options');
 var server = new CartodbWindshaft(serverOptions);
 server.setMaxListeners(0);
 
-var LayergroupToken = require('../../lib/cartodb/models/layergroup_token');
+var LayergroupToken = require('../support/layergroup-token');
 
 describe('get requests x-cache-channel', function() {
 

test/integration/mapconfig_named_layers_datasource.js

@@ -4,7 +4,7 @@ var assert = require('assert');
 var RedisPool = require('redis-mpool');
 var TemplateMaps = require('../../lib/cartodb/backends/template_maps.js');
 var PgConnection = require(__dirname + '/../../lib/cartodb/backends/pg_connection');
-var MapConfigNamedLayersAdapter = require('../../lib/cartodb/models/mapconfig_named_layers_adapter');
+var MapConfigNamedLayersAdapter = require('../../lib/cartodb/models/mapconfig/adapter/mapconfig-named-layers-adapter');
 
 // configure redis pool instance to use in tests
 var redisPool = new RedisPool(global.environment.redis);
@@ -14,7 +14,7 @@ var templateMaps = new TemplateMaps(redisPool, {
     max_user_templates: global.environment.maxUserTemplates
 });
 
-var mapConfigNamedLayersAdapter = new MapConfigNamedLayersAdapter(templateMaps);
+var mapConfigNamedLayersAdapter = new MapConfigNamedLayersAdapter(templateMaps, pgConnection);
 
 var wadusSql = 'select 1 wadusLayer, null::geometry the_geom_webmercator';
 var wadusLayer = {
@@ -294,9 +294,11 @@ describe('named_layers datasources', function() {
 
     testScenarios.forEach(function(testScenario) {
         it('should return a list of layers ' + testScenario.desc, function(done) {
-            mapConfigNamedLayersAdapter.getLayers(username, testScenario.config.layers, pgConnection,
-                function(err, layers, datasource) {
-                    testScenario.test(err, layers, datasource, done);
+            var params = {};
+            var context = {};
+            mapConfigNamedLayersAdapter.getMapConfig(username, testScenario.config, params, context,
+                function(err, mapConfig) {
+                    testScenario.test(err, mapConfig.layers, context.datasource, done);
                 }
             );
         });

test/integration/mapconfig_named_layers_expanded.js

@@ -4,9 +4,9 @@ var assert = require('assert');
 var RedisPool = require('redis-mpool');
 var TemplateMaps = require('../../lib/cartodb/backends/template_maps.js');
 var PgConnection = require(__dirname + '/../../lib/cartodb/backends/pg_connection');
-var MapConfigNamedLayersAdapter = require('../../lib/cartodb/models/mapconfig_named_layers_adapter');
+var MapConfigNamedLayersAdapter = require('../../lib/cartodb/models/mapconfig/adapter/mapconfig-named-layers-adapter');
 
-describe('mapconfig_named_layers_adapter', function() {
+describe('mapconfig-named-layers-adapter', function() {
 
     // configure redis pool instance to use in tests
     var redisPool = new RedisPool(global.environment.redis);
@@ -16,7 +16,7 @@ describe('mapconfig_named_layers_adapter', function() {
         max_user_templates: global.environment.maxUserTemplates
     });
 
-    var mapConfigNamedLayersAdapter = new MapConfigNamedLayersAdapter(templateMaps);
+    var mapConfigNamedLayersAdapter = new MapConfigNamedLayersAdapter(templateMaps, pgConnection);
 
     var wadusLayer = {
         type: 'cartodb',
@@ -134,6 +134,8 @@ describe('mapconfig_named_layers_adapter', function() {
         };
     }
 
+    var params = {};
+    var context = {};
 
     beforeEach(function(done) {
         templateMaps.addTemplate(username, template, done);
@@ -147,11 +149,11 @@ describe('mapconfig_named_layers_adapter', function() {
         var missingNamedMapLayerConfig = makeNamedMapLayerConfig({
             config: {}
         });
-        mapConfigNamedLayersAdapter.getLayers(username, missingNamedMapLayerConfig.layers, pgConnection,
-            function(err, layers, datasource) {
+        mapConfigNamedLayersAdapter.getMapConfig(username, missingNamedMapLayerConfig, params, context,
+            function(err, mapConfig) {
                 assert.ok(err);
-                assert.ok(!layers);
-                assert.ok(!datasource);
+                assert.ok(!mapConfig);
+                assert.ok(!context.datasource);
                 assert.equal(err.message, 'Missing Named Map `name` in layer options');
 
                 done();
@@ -164,11 +166,11 @@ describe('mapconfig_named_layers_adapter', function() {
         var nonExistentNamedMapLayerConfig = makeNamedMapLayerConfig({
             name: missingTemplateName
         });
-        mapConfigNamedLayersAdapter.getLayers(username, nonExistentNamedMapLayerConfig.layers, pgConnection,
-            function(err, layers, datasource) {
+        mapConfigNamedLayersAdapter.getMapConfig(username, nonExistentNamedMapLayerConfig, params, context,
+            function(err, mapConfig) {
                 assert.ok(err);
-                assert.ok(!layers);
-                assert.ok(!datasource);
+                assert.ok(!mapConfig);
+                assert.ok(!context.datasource);
                 assert.equal(
                     err.message, "Template '" + missingTemplateName + "' of user '" + username + "' not found"
                 );
@@ -187,11 +189,11 @@ describe('mapconfig_named_layers_adapter', function() {
             var nonAuthTokensNamedMapLayerConfig = makeNamedMapLayerConfig({
                 name: tokenAuthTemplateName
             });
-            mapConfigNamedLayersAdapter.getLayers(username, nonAuthTokensNamedMapLayerConfig.layers, pgConnection,
-                function(err, layers, datasource) {
+            mapConfigNamedLayersAdapter.getMapConfig(username, nonAuthTokensNamedMapLayerConfig, params, context,
+                function(err, mapConfig) {
                     assert.ok(err);
-                    assert.ok(!layers);
-                    assert.ok(!datasource);
+                    assert.ok(!mapConfig);
+                    assert.ok(!context.datasource);
                     assert.equal(err.message, "Unauthorized '" + tokenAuthTemplateName + "' template instantiation");
 
                     templateMaps.delTemplate(username, tokenAuthTemplateName, done);
@@ -209,11 +211,11 @@ describe('mapconfig_named_layers_adapter', function() {
             var nestedNamedMapLayerConfig = makeNamedMapLayerConfig({
                 name: nestedNamedMapTemplateName
             });
-            mapConfigNamedLayersAdapter.getLayers(username, nestedNamedMapLayerConfig.layers, pgConnection,
-                function(err, layers, datasource) {
+            mapConfigNamedLayersAdapter.getMapConfig(username, nestedNamedMapLayerConfig, params, context,
+                function(err, mapConfig) {
                     assert.ok(err);
-                    assert.ok(!layers);
-                    assert.ok(!datasource);
+                    assert.ok(!mapConfig);
+                    assert.ok(!context.datasource);
                     assert.equal(err.message, 'Nested named layers are not allowed');
 
                     templateMaps.delTemplate(username, nestedNamedMapTemplateName, done);
@@ -226,12 +228,13 @@ describe('mapconfig_named_layers_adapter', function() {
         var validNamedMapMapLayerConfig = makeNamedMapLayerConfig({
             name: templateName
         });
-        mapConfigNamedLayersAdapter.getLayers(username, validNamedMapMapLayerConfig.layers, pgConnection,
-            function(err, layers, datasource) {
+        mapConfigNamedLayersAdapter.getMapConfig(username, validNamedMapMapLayerConfig, params, context,
+            function(err, mapConfig) {
                 assert.ok(!err);
+                var layers = mapConfig.layers;
                 assert.ok(layers.length, 1);
                 assert.ok(layers[0].type, 'cartodb');
-                assert.notEqual(datasource.getLayerDatasource(0), undefined);
+                assert.notEqual(context.datasource.getLayerDatasource(0), undefined);
 
                 done();
             }
@@ -248,11 +251,12 @@ describe('mapconfig_named_layers_adapter', function() {
                 name: tokenAuthTemplateName,
                 auth_tokens: ['valid1']
             });
-            mapConfigNamedLayersAdapter.getLayers(username, validAuthTokensNamedMapLayerConfig.layers, pgConnection,
-                function(err, layers, datasource) {
+            mapConfigNamedLayersAdapter.getMapConfig(username, validAuthTokensNamedMapLayerConfig, params, context,
+                function(err, mapConfig) {
                     assert.ok(!err);
+                    var layers = mapConfig.layers;
                     assert.equal(layers.length, 1);
-                    assert.notEqual(datasource.getLayerDatasource(0), undefined);
+                    assert.notEqual(context.datasource.getLayerDatasource(0), undefined);
 
                     templateMaps.delTemplate(username, tokenAuthTemplateName, done);
                 }
@@ -270,18 +274,19 @@ describe('mapconfig_named_layers_adapter', function() {
                 name: multipleLayersTemplateName,
                 auth_tokens: ['valid2']
             });
-            mapConfigNamedLayersAdapter.getLayers(username, multipleLayersNamedMapLayerConfig.layers, pgConnection,
-                function(err, layers, datasource) {
+            mapConfigNamedLayersAdapter.getMapConfig(username, multipleLayersNamedMapLayerConfig, params, context,
+                function(err, mapConfig) {
                     assert.ok(!err);
+                    var layers = mapConfig.layers;
                     assert.equal(layers.length, 2);
 
                     assert.equal(layers[0].type, 'mapnik');
                     assert.equal(layers[0].options.cartocss, '#layer { polygon-fill: green; }');
-                    assert.notEqual(datasource.getLayerDatasource(0), undefined);
+                    assert.notEqual(context.datasource.getLayerDatasource(0), undefined);
 
                     assert.equal(layers[1].type, 'cartodb');
                     assert.equal(layers[1].options.cartocss, '#layer { marker-fill: red; }');
-                    assert.notEqual(datasource.getLayerDatasource(1), undefined);
+                    assert.notEqual(context.datasource.getLayerDatasource(1), undefined);
 
                     templateMaps.delTemplate(username, multipleLayersTemplateName, done);
                 }
@@ -306,18 +311,19 @@ describe('mapconfig_named_layers_adapter', function() {
                 },
                 auth_tokens: ['valid2']
             });
-            mapConfigNamedLayersAdapter.getLayers(username, multipleLayersNamedMapLayerConfig.layers, pgConnection,
-                function(err, layers, datasource) {
+            mapConfigNamedLayersAdapter.getMapConfig(username, multipleLayersNamedMapLayerConfig, params, context,
+                function(err, mapConfig) {
                     assert.ok(!err);
+                    var layers = mapConfig.layers;
                     assert.equal(layers.length, 2);
 
                     assert.equal(layers[0].type, 'mapnik');
                     assert.equal(layers[0].options.cartocss, '#layer { polygon-fill: ' + polygonColor + '; }');
-                    assert.notEqual(datasource.getLayerDatasource(0), undefined);
+                    assert.notEqual(context.datasource.getLayerDatasource(0), undefined);
 
                     assert.equal(layers[1].type, 'cartodb');
                     assert.equal(layers[1].options.cartocss, '#layer { marker-fill: ' + color + '; }');
-                    assert.notEqual(datasource.getLayerDatasource(1), undefined);
+                    assert.notEqual(context.datasource.getLayerDatasource(1), undefined);
 
                     templateMaps.delTemplate(username, multipleLayersTemplateName, done);
                 }

test/integration/mapconfig_overviews_adapter.js

@@ -7,11 +7,7 @@ var PgConnection = require(__dirname + '/../../lib/cartodb/backends/pg_connectio
 var PgQueryRunner = require('../../lib/cartodb/backends/pg_query_runner');
 var OverviewsMetadataApi = require('../../lib/cartodb/api/overviews_metadata_api');
 var FilterStatsApi = require('../../lib/cartodb/api/filter_stats_api');
-var MapConfigOverviewsAdapter = require('../../lib/cartodb/models/mapconfig_overviews_adapter');
-
-// configure redis pool instance to use in tests
-var redisPool = new RedisPool(global.environment.redis);
-var pgConnection = new PgConnection(require('cartodb-redis')({ pool: redisPool }));
+var MapConfigOverviewsAdapter = require('../../lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter');
 
 var redisPool = new RedisPool(global.environment.redis);
 var metadataBackend = cartodbRedis({pool: redisPool});
@@ -37,8 +33,16 @@ describe('MapConfigOverviewsAdapter', function() {
             }
         };
 
-        mapConfigOverviewsAdapter.getLayers('localhost', [layer_without_overviews], [], function(err, layers) {
+        var _mapConfig = {
+            layers: [layer_without_overviews]
+        };
+
+        var params = {};
+        var context = {};
+
+        mapConfigOverviewsAdapter.getMapConfig('localhost', _mapConfig, params, context, function(err, mapConfig) {
             assert.ok(!err);
+            var layers = mapConfig.layers;
             assert.equal(layers.length, 1);
             assert.equal(layers[0].type, 'cartodb');
             assert.equal(layers[0].options.sql, sql);
@@ -56,7 +60,7 @@ describe('MapConfigOverviewsAdapter', function() {
         var sql = 'SELECT * FROM test_table_overviews';
         var cartocss = '#layer { marker-fill: black; }';
         var cartocss_version = '2.3.0';
-        var layer_without_overviews = {
+        var layer_with_overviews = {
             type: 'cartodb',
             options: {
                 sql: sql,
@@ -65,8 +69,16 @@ describe('MapConfigOverviewsAdapter', function() {
             }
         };
 
-        mapConfigOverviewsAdapter.getLayers('localhost', [layer_without_overviews], [], function(err, layers) {
+        var _mapConfig = {
+            layers: [layer_with_overviews]
+        };
+
+        var params = {};
+        var context = {};
+
+        mapConfigOverviewsAdapter.getMapConfig('localhost', _mapConfig, params, context, function(err, mapConfig) {
             assert.ok(!err);
+            var layers = mapConfig.layers;
             assert.equal(layers.length, 1);
             assert.equal(layers[0].type, 'cartodb');
             assert.equal(layers[0].options.sql, sql);

test/support/prepare_db.sh

@@ -12,6 +12,7 @@
 
 PREPARE_REDIS=yes
 PREPARE_PGSQL=yes
+DOWNLOAD_SQL_FILES=yes
 
 while [ -n "$1" ]; do
   if test "$1" = "--skip-pg"; then
@@ -20,6 +21,9 @@ while [ -n "$1" ]; do
   elif test "$1" = "--skip-redis"; then
     PREPARE_REDIS=no
     shift; continue
+  elif test "$1" = "--no-sql-download"; then
+    DOWNLOAD_SQL_FILES=no
+    shift; continue
   fi
 done
 
@@ -71,26 +75,31 @@ if test x"$PREPARE_PGSQL" = xyes; then
   dropdb "${TEST_DB}"
   createdb -Ttemplate_postgis -EUTF8 "${TEST_DB}" || die "Could not create test database"
 
-  curl -L -s https://raw.githubusercontent.com/CartoDB/camshaft/master/test/fixtures/cdb_analysis_catalog.sql -o sql/cdb_analysis_catalog.sql
-  cat sql/cdb_analysis_catalog.sql | psql -v ON_ERROR_STOP=1 ${TEST_DB} || exit 1
+  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'
 
-  cat sql/windshaft.test.sql sql/gadm4.sql |
-    sed "s/:PUBLICUSER/${PUBLICUSER}/" |
-    sed "s/:PUBLICPASS/${PUBLICPASS}/" |
-    sed "s/:TESTUSER/${TESTUSER}/" |
-    sed "s/:TESTPASS/${TESTPASS}/" |
-    psql -v ON_ERROR_STOP=1 ${TEST_DB} || exit 1
-
-  cat sql/_CDB_QueryStatements.sql | psql -v ON_ERROR_STOP=1 ${TEST_DB} || exit 1
-
-  SQL_SCRIPTS='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'
-  for i in ${SQL_SCRIPTS}
+  CURL_ARGS=""
+  for i in ${REMOTE_SQL_SCRIPTS}
   do
-    curl -L -s https://github.com/CartoDB/cartodb-postgresql/raw/master/scripts-available/$i.sql -o sql/$i.sql
-    cat sql/$i.sql | sed -e 's/cartodb\./public./g' -e "s/''cartodb''/''public''/g" \
-        | psql -v ON_ERROR_STOP=1 ${TEST_DB} || exit 1
+    CURL_ARGS="${CURL_ARGS}\"https://github.com/CartoDB/cartodb-postgresql/raw/master/scripts-available/$i.sql\" -o sql/$i.sql "
   done
+  if test x"$DOWNLOAD_SQL_FILES" = xyes; then
+    echo "Downloading and updating: ${REMOTE_SQL_SCRIPTS}"
+    echo ${CURL_ARGS} | xargs curl -L -s
+  fi
 
+  psql -c "CREATE EXTENSION IF NOT EXISTS plpythonu;" ${TEST_DB}
+  ALL_SQL_SCRIPTS="${REMOTE_SQL_SCRIPTS} ${LOCAL_SQL_SCRIPTS}"
+  for i in ${ALL_SQL_SCRIPTS}
+  do
+    cat sql/${i}.sql |
+      sed -e 's/cartodb\./public./g' -e "s/''cartodb''/''public''/g" |
+      sed "s/:PUBLICUSER/${PUBLICUSER}/" |
+      sed "s/:PUBLICPASS/${PUBLICPASS}/" |
+      sed "s/:TESTUSER/${TESTUSER}/" |
+      sed "s/:TESTPASS/${TESTPASS}/" |
+      PGOPTIONS='--client-min-messages=WARNING' psql -q -v ON_ERROR_STOP=1 ${TEST_DB} > /dev/null || exit 1
+  done
 fi
 
 if test x"$PREPARE_REDIS" = xyes; then
@@ -122,17 +131,3 @@ EOF
 fi
 
 echo "Finished preparing data. Ready to run tests"
-
-
-############################ WINDSHAFT TESTS ############################
-
-echo "...Configuring Windshaft test database"
-
-cat sql/ported/populated_places_simple_reduced.sql |
-    sed "s/:PUBLICUSER/${PUBLICUSER}/" |
-    sed "s/:PUBLICPASS/${PUBLICPASS}/" |
-    sed "s/:TESTUSER/${TESTUSER}/" |
-    sed "s/:TESTPASS/${TESTPASS}/" |
-    psql -v ON_ERROR_STOP=1 ${TEST_DB} || exit 1
-
-echo "...Test database configuration complete"

test/support/sql/_CDB_QueryStatements.sql

@@ -1,16 +0,0 @@
--- DUMMY IMPLEMENTATION
--- Ref: https://github.com/CartoDB/cartodb-postgresql/blob/master/scripts-available/CDB_QueryStatements.sql
--- Originally implemented in plpython for performance reasons
-
--- Return an array of statements found in the given query text
---
--- Regexp curtesy of Hubert Lubaczewski (depesz)
---
-CREATE OR REPLACE FUNCTION CDB_QueryStatements(query text)
-RETURNS SETOF TEXT AS $$
-  with matches as (
-    select regexp_matches($1, $regexp$((?:[^'"$;]+|"[^"]*"|'[^']*'|(\$[^$]*\$).*?\2)+)$regexp$, 'g') as m
-  )
-  select btrim(m[1]) from matches
-$$
-LANGUAGE SQL IMMUTABLE STRICT;

test/support/test-client.js

@@ -6,7 +6,7 @@ var urlParser = require('url');
 
 var mapnik = require('windshaft').mapnik;
 
-var LayergroupToken = require('../../lib/cartodb/models/layergroup_token');
+var LayergroupToken = require('./layergroup-token');
 
 var assert = require('./assert');
 var helper = require('./test_helper');
@@ -62,6 +62,7 @@ TestClient.prototype.getWidget = function(widgetName, params, callback) {
                         return next(err);
                     }
                     var parsedBody = JSON.parse(res.body);
+
                     var expectedWidgetURLS = {
                         http: "/api/v1/map/" + parsedBody.layergroupid + "/0/widget/" + widgetName
                     };
@@ -69,6 +70,15 @@ TestClient.prototype.getWidget = function(widgetName, params, callback) {
                     assert.ok(
                         parsedBody.metadata.layers[0].widgets[widgetName].url.http.match(expectedWidgetURLS.http)
                     );
+
+                    var expectedDataviewsURLS = {
+                        http: "/api/v1/map/" + parsedBody.layergroupid + "/dataview/" + widgetName
+                    };
+                    assert.ok(parsedBody.metadata.dataviews[widgetName]);
+                    assert.ok(
+                        parsedBody.metadata.dataviews[widgetName].url.http.match(expectedDataviewsURLS.http)
+                    );
+
                     return next(null, parsedBody.layergroupid);
                 }
             );
@@ -82,9 +92,12 @@ TestClient.prototype.getWidget = function(widgetName, 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];
+                }
+            });
+
             url = '/api/v1/map/' + layergroupId + '/0/widget/' + widgetName + '?' + qs.stringify(urlParams);
 
             assert.response(server,
@@ -113,7 +126,120 @@ TestClient.prototype.getWidget = function(widgetName, params, callback) {
         function finish(err, res) {
             self.keysToDelete['map_cfg|' + LayergroupToken.parse(layergroupId).token] = 0;
             self.keysToDelete['user:localhost:mapviews:global'] = 5;
-            return callback(err, res);
+            var widget;
+            if (!err && res.body) {
+                widget = JSON.parse(res.body);
+            }
+            return callback(err, res, widget);
+        }
+    );
+};
+
+TestClient.prototype.widgetSearch = function(widgetName, userQuery, params, callback) {
+    var self = this;
+
+    if (!callback) {
+        callback = params;
+        params = {};
+    }
+
+    var url = '/api/v1/map';
+    if (params && params.filters) {
+        url += '?' + qs.stringify({ filters: JSON.stringify(params.filters) });
+    }
+
+    var layergroupId;
+    step(
+        function createLayergroup() {
+            var next = this;
+            assert.response(server,
+                {
+                    url: url,
+                    method: 'POST',
+                    headers: {
+                        host: 'localhost',
+                        'Content-Type': 'application/json'
+                    },
+                    data: JSON.stringify(self.mapConfig)
+                },
+                {
+                    status: 200,
+                    headers: {
+                        'Content-Type': 'application/json; charset=utf-8'
+                    }
+                },
+                function(res, err) {
+                    if (err) {
+                        return next(err);
+                    }
+                    var parsedBody = JSON.parse(res.body);
+
+                    var expectedWidgetURLS = {
+                        http: "/api/v1/map/" + parsedBody.layergroupid + "/0/widget/" + widgetName
+                    };
+                    assert.ok(parsedBody.metadata.layers[0].widgets[widgetName]);
+                    assert.ok(
+                        parsedBody.metadata.layers[0].widgets[widgetName].url.http.match(expectedWidgetURLS.http)
+                    );
+
+                    var expectedDataviewsURLS = {
+                        http: "/api/v1/map/" + parsedBody.layergroupid + "/dataview/" + widgetName
+                    };
+                    assert.ok(parsedBody.metadata.dataviews[widgetName]);
+                    assert.ok(
+                        parsedBody.metadata.dataviews[widgetName].url.http.match(expectedDataviewsURLS.http)
+                    );
+
+                    return next(null, parsedBody.layergroupid);
+                }
+            );
+        },
+        function getWidgetSearchResult(err, _layergroupId) {
+            assert.ifError(err);
+
+            var next = this;
+            layergroupId = _layergroupId;
+
+            var urlParams = {
+                q: userQuery,
+                own_filter: params.hasOwnProperty('own_filter') ? params.own_filter : 1
+            };
+            if (params && params.bbox) {
+                urlParams.bbox = params.bbox;
+            }
+            url = '/api/v1/map/' + layergroupId + '/0/widget/' + widgetName + '/search?' + qs.stringify(urlParams);
+
+            assert.response(server,
+                {
+                    url: url,
+                    method: 'GET',
+                    headers: {
+                        host: 'localhost'
+                    }
+                },
+                {
+                    status: 200,
+                    headers: {
+                        'Content-Type': 'application/json; charset=utf-8'
+                    }
+                },
+                function(res, err) {
+                    if (err) {
+                        return next(err);
+                    }
+
+                    next(null, res);
+                }
+            );
+        },
+        function finish(err, res) {
+            self.keysToDelete['map_cfg|' + LayergroupToken.parse(layergroupId).token] = 0;
+            self.keysToDelete['user:localhost:mapviews:global'] = 5;
+            var searchResult;
+            if (!err && res.body) {
+                searchResult = JSON.parse(res.body);
+            }
+            return callback(err, res, searchResult);
         }
     );
 };
@@ -184,9 +310,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;
             }
@@ -215,10 +345,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);
         }
     );
 };

test/unit/cartodb/mapconfig/adapter.test.js

@@ -0,0 +1,93 @@
+//require('../../../support/test_helper');
+var assert = require('assert');
+
+var MapConfigAdapter = require('../../../../lib/cartodb/models/mapconfig/adapter');
+
+describe('MapConfigAdapter', function() {
+    var user = 'wadus';
+    function requestMapConfig() {
+        return {
+            val: 0
+        };
+    }
+    function params() {
+        return {};
+    }
+    function context() {
+        return {};
+    }
+
+    function createAdapter(valOperatorFn) {
+        return function ValMapConfigAdapter() {
+            this.getMapConfig = function(user, requestMapConfig, params, context, callback) {
+                requestMapConfig.val = valOperatorFn(requestMapConfig.val);
+                return callback(null, requestMapConfig);
+            };
+        };
+    }
+    var IncValMapConfigAdapter = createAdapter(function(val) { return val + 1; });
+    var Mul2ValMapConfigAdapter = createAdapter(function(val) { return val * 2; });
+
+    function validateMapConfig(adapter, expectedNumAdapters, expectedVal, callback) {
+        assert.equal(adapter.adapters.length, expectedNumAdapters);
+        adapter.getMapConfig(user, requestMapConfig(), params(), context(), function(err, mapConfig) {
+            assert.equal(mapConfig.val, expectedVal);
+            return callback(err);
+        });
+    }
+
+    it('works with no adapters', function(done) {
+        var adapter = new MapConfigAdapter();
+        validateMapConfig(adapter, 0, 0, done);
+    });
+
+    it('works with no adapters as empty array', function(done) {
+        var adapter = new MapConfigAdapter([]);
+        validateMapConfig(adapter, 0, 0, done);
+    });
+
+    it('works with basic adapter', function(done) {
+        var adapter = new MapConfigAdapter(new IncValMapConfigAdapter());
+        validateMapConfig(adapter, 1, 1, done);
+    });
+
+    it('works with basic adapter as array', function(done) {
+        var adapter = new MapConfigAdapter([new IncValMapConfigAdapter()]);
+        validateMapConfig(adapter, 1, 1, done);
+    });
+
+    it('works with several adapters', function(done) {
+        var adapter = new MapConfigAdapter(new IncValMapConfigAdapter(), new IncValMapConfigAdapter());
+        validateMapConfig(adapter, 2, 2, done);
+    });
+
+    it('works with several adapters as array', function(done) {
+        var adapter = new MapConfigAdapter([new IncValMapConfigAdapter(), new IncValMapConfigAdapter()]);
+        validateMapConfig(adapter, 2, 2, done);
+    });
+
+    it('should execute in order 1', function(done) {
+        var adapter = new MapConfigAdapter([new Mul2ValMapConfigAdapter(), new IncValMapConfigAdapter()]);
+        validateMapConfig(adapter, 2, 1, done);
+    });
+
+    it('should execute in order 2', function(done) {
+        var adapter = new MapConfigAdapter([new IncValMapConfigAdapter(), new Mul2ValMapConfigAdapter()]);
+        validateMapConfig(adapter, 2, 2, done);
+    });
+
+    it('should execute in order 3', function(done) {
+        var adapter = new MapConfigAdapter([new Mul2ValMapConfigAdapter(), new Mul2ValMapConfigAdapter()]);
+        validateMapConfig(adapter, 2, 0, done);
+    });
+
+    it('should execute in order 4', function(done) {
+        var Mul5ValMapConfigAdapter = createAdapter(function(val) { return val * 5; });
+        var adapter = new MapConfigAdapter(
+            new IncValMapConfigAdapter(),
+            new Mul2ValMapConfigAdapter(),
+            new Mul5ValMapConfigAdapter()
+        );
+        validateMapConfig(adapter, 3, 10, done);
+    });
+});

test/unit/cartodb/mapconfig/dataviews-widgets-adapter.test.js

@@ -0,0 +1,331 @@
+//require('../../../support/test_helper');
+var assert = require('assert');
+
+var DataviewsMapConfigAdapter = require('../../../../lib/cartodb/models/mapconfig/adapter/dataviews-widgets-adapter');
+
+describe('dataviews-widgets-adapter', function() {
+
+    var widgetsMapConfigs = [
+        {
+            "input": {
+                "version": "1.4.0",
+                "layers": [
+                    {
+                        "type": "mapnik",
+                        "options": {
+                            "sql": "select * from populated_places_simple_reduced",
+                            "cartocss": "#layer { marker-fill: red; marker-width: 32; marker-allow-overlap: true; }",
+                            "cartocss_version": "2.3.0",
+                            "widgets": {
+                                "country_places_count": {
+                                    "type": "aggregation",
+                                    "options": {
+                                        "column": "adm0_a3",
+                                        "aggregation": "count"
+                                    }
+                                }
+                            }
+                        }
+                    }
+                ]
+            },
+            "expected": {
+                "version": "1.4.0",
+                "layers": [
+                    {
+                        "type": "mapnik",
+                        "options": {
+                            "source": {
+                                "id": "cdb-layer-source-0"
+                            },
+                            "cartocss": "#layer { marker-fill: red; marker-width: 32; marker-allow-overlap: true; }",
+                            "cartocss_version": "2.3.0",
+                            // keep them for now
+                            "widgets": {
+                                "country_places_count": {
+                                    "type": "aggregation",
+                                    "options": {
+                                        "column": "adm0_a3",
+                                        "aggregation": "count"
+                                    }
+                                }
+                            }
+                        }
+                    }
+                ],
+                "analyses": [
+                    {
+                        "id": "cdb-layer-source-0",
+                        "type": "source",
+                        "params": {
+                            "query": "select * from populated_places_simple_reduced"
+                        }
+                    }
+                ],
+                "dataviews": {
+                    "country_places_count": {
+                        "source": {
+                            "id": "cdb-layer-source-0"
+                        },
+                        "type": "aggregation",
+                        "options": {
+                            "column": "adm0_a3",
+                            "aggregation": "count"
+                        }
+                    }
+                }
+            }
+        },
+        {
+            "input": {
+                "version": "1.4.0",
+                "layers": [
+                    {
+                        "type": "mapnik",
+                        "options": {
+                            "sql": "select * from populated_places_simple_reduced",
+                            "cartocss": "#layer { marker-fill: red; marker-width: 32; marker-allow-overlap: true; }",
+                            "cartocss_version": "2.3.0",
+                            "widgets": {
+                                "pop_max": {
+                                    "type": "histogram",
+                                    "options": {
+                                        "column": "pop_max"
+                                    }
+                                }
+                            }
+                        }
+                    }
+                ]
+            },
+            "expected": {
+                "version": "1.4.0",
+                "layers": [
+                    {
+                        "type": "mapnik",
+                        "options": {
+                            "source": {
+                                "id": "cdb-layer-source-0"
+                            },
+                            "cartocss": "#layer { marker-fill: red; marker-width: 32; marker-allow-overlap: true; }",
+                            "cartocss_version": "2.3.0",
+                            // keep them for now
+                            "widgets": {
+                                "pop_max": {
+                                    "type": "histogram",
+                                    "options": {
+                                        "column": "pop_max"
+                                    }
+                                }
+                            }
+                        }
+                    }
+                ],
+                "analyses": [
+                    {
+                        "id": "cdb-layer-source-0",
+                        "type": "source",
+                        "params": {
+                            "query": "select * from populated_places_simple_reduced"
+                        }
+                    }
+                ],
+                "dataviews": {
+                    "pop_max": {
+                        "source": {
+                            "id": "cdb-layer-source-0"
+                        },
+                        "type": "histogram",
+                        "options": {
+                            "column": "pop_max"
+                        }
+                    }
+                }
+            }
+        },
+        {
+            "input": {
+                "version": "1.4.0",
+                "layers": [
+                    {
+                        "type": "mapnik",
+                        "options": {
+                            "sql": "select * from test_table",
+                            "cartocss": "#layer { marker-fill: red; marker-width: 32; marker-allow-overlap: true; }",
+                            "cartocss_version": "2.3.0",
+                            "widgets": {
+                                "names": {
+                                    "type": "list",
+                                    "options": {
+                                        "columns": [
+                                            "name"
+                                        ]
+                                    }
+                                }
+                            }
+                        }
+                    }
+                ]
+            },
+            "expected": {
+                "version": "1.4.0",
+                "layers": [
+                    {
+                        "type": "mapnik",
+                        "options": {
+                            "source": {
+                                "id": "cdb-layer-source-0"
+                            },
+                            "cartocss": "#layer { marker-fill: red; marker-width: 32; marker-allow-overlap: true; }",
+                            "cartocss_version": "2.3.0",
+                            // keep them for now
+                            "widgets": {
+                                "names": {
+                                    "type": "list",
+                                    "options": {
+                                        "columns": [
+                                            "name"
+                                        ]
+                                    }
+                                }
+                            }
+                        }
+                    }
+                ],
+                "analyses": [
+                    {
+                        "id": "cdb-layer-source-0",
+                        "type": "source",
+                        "params": {
+                            "query": "select * from test_table"
+                        }
+                    }
+                ],
+                "dataviews": {
+                    "names": {
+                        "source": {
+                            "id": "cdb-layer-source-0"
+                        },
+                        "type": "list",
+                        "options": {
+                            "columns": [
+                                "name"
+                            ]
+                        }
+                    }
+                }
+            }
+        },
+        {
+            "input": {
+                "version": "1.4.0",
+                "layers": [
+                    {
+                        "type": "mapnik",
+                        "options": {
+                            "sql": "select * from populated_places_simple_reduced",
+                            "cartocss": "#layer { marker-fill: red; marker-width: 32; marker-allow-overlap: true; }",
+                            "cartocss_version": "2.3.0",
+                            "widgets": {
+                                "country_places_count": {
+                                    "type": "aggregation",
+                                    "options": {
+                                        "column": "adm0_a3",
+                                        "aggregation": "count"
+                                    }
+                                },
+                                "country_places_histogram": {
+                                    "type": "histogram",
+                                    "options": {
+                                        "column": "pop_max"
+                                    }
+                                }
+                            }
+                        }
+                    }
+                ]
+            },
+            "expected": {
+                "version": "1.4.0",
+                "layers": [
+                    {
+                        "type": "mapnik",
+                        "options": {
+                            "source": {
+                                "id": "cdb-layer-source-0"
+                            },
+                            "cartocss": "#layer { marker-fill: red; marker-width: 32; marker-allow-overlap: true; }",
+                            "cartocss_version": "2.3.0",
+                            // keep them for now
+                            "widgets": {
+                                "country_places_count": {
+                                    "type": "aggregation",
+                                    "options": {
+                                        "column": "adm0_a3",
+                                        "aggregation": "count"
+                                    }
+                                },
+                                "country_places_histogram": {
+                                    "type": "histogram",
+                                    "options": {
+                                        "column": "pop_max"
+                                    }
+                                }
+                            }
+                        }
+                    }
+                ],
+                "analyses": [
+                    {
+                        "id": "cdb-layer-source-0",
+                        "type": "source",
+                        "params": {
+                            "query": "select * from populated_places_simple_reduced"
+                        }
+                    }
+                ],
+                "dataviews": {
+                    "country_places_count": {
+                        "source": {
+                            "id": "cdb-layer-source-0"
+                        },
+                        "type": "aggregation",
+                        "options": {
+                            "column": "adm0_a3",
+                            "aggregation": "count"
+                        }
+                    },
+                    "country_places_histogram": {
+                        "source": {
+                            "id": "cdb-layer-source-0"
+                        },
+                        "type": "histogram",
+                        "options": {
+                            "column": "pop_max"
+                        }
+                    }
+                }
+            }
+        }
+    ];
+
+    var user = 'wadus';
+    function params() {
+        return {};
+    }
+    function context() {
+        return {};
+    }
+
+    var dataviewsMapConfigAdapter = new DataviewsMapConfigAdapter();
+
+    widgetsMapConfigs.forEach(function(mapConfig, index) {
+        it('should adapt widgets ' + index, function(done) {
+            dataviewsMapConfigAdapter.getMapConfig(user, mapConfig.input, params(), context(), function(err, result) {
+                assert.deepEqual(result, mapConfig.expected);
+                done();
+            });
+        });
+    });
+
+});

test/unit/cartodb/model/filter/bbox-filters.test.js

@@ -0,0 +1,129 @@
+require('../../../../support/test_helper');
+var util = require('util');
+
+var assert = require('../../../../support/assert');
+var BboxFilter = require('../../../../../lib/cartodb/models/filter/bbox');
+
+var MAX_EXTENT_MERCATOR_REF = [
+    -BboxFilter.LONGITUDE_MAX_VALUE,
+    -BboxFilter.LATITUDE_MAX_VALUE,
+    BboxFilter.LONGITUDE_MAX_VALUE,
+    BboxFilter.LATITUDE_MAX_VALUE
+];
+
+describe('Bounding box filter', function() {
+
+    describe('wrap longitude', function() {
+        var longitudesScenarios = [
+            [[0, 90], [0, 90]],
+            [[-90, 0], [-90, 0]],
+            [[-90, 90], [-90, 90]],
+            [[-990, -720], [90, 360]],
+            [[810, 1080], [90, 360]],
+            [[-180, 180], [-180, 180]]
+        ];
+
+        longitudesScenarios.forEach(function(scenario) {
+            it(util.format('should adjust from %j to %j', scenario[0], scenario[1]), function() {
+                var we = BboxFilter.adjustLongitudeRange(scenario[0]);
+
+                assert.equal(
+                    we[0], scenario[1][0],
+                    util.format('west, got %d, expected %d, scenario: %s',
+                        we[1], scenario[1][1], JSON.stringify(scenario)
+                    )
+                );
+                assert.equal(
+                    we[1], scenario[1][1],
+                    util.format('east, got %d, expected %d, scenario: %s',
+                        we[1], scenario[1][1], JSON.stringify(scenario)
+                    )
+                );
+            });
+        });
+    });
+
+    function createFilter(bbox) {
+        return new BboxFilter({}, { bbox: bbox.join(',') });
+    }
+
+    function createRef(bbox) {
+        return bbox;
+//        return mercator.forward([bbox[0], bbox[1]]).concat(mercator.forward([bbox[2], bbox[3]]));
+    }
+
+
+    it('happy case', function() {
+        var bbox = [-90, -45, 90, 45];
+        var bboxFilter = createFilter(bbox);
+        assert.equal(bboxFilter.bboxes.length, 1);
+        assert.deepEqual(bboxFilter.bboxes[0], createRef(bbox));
+    });
+
+    describe('latitude', function() {
+        it('(hardcoded) clipping out of bounds', function() {
+            var bbox = [-180, -90, 180, 90];
+            var bboxFilter = createFilter(bbox);
+            assert.equal(bboxFilter.bboxes.length, 1);
+            assert.deepEqual(bboxFilter.bboxes[0], MAX_EXTENT_MERCATOR_REF);
+        });
+
+        it('clipping out of bounds', function() {
+            var bbox = [-180, -90, 180, 90];
+            var bboxFilter = createFilter(bbox);
+            assert.equal(bboxFilter.bboxes.length, 1);
+            assert.deepEqual(
+                bboxFilter.bboxes[0],
+                createRef([-180, -BboxFilter.LATITUDE_MAX_VALUE, 180, BboxFilter.LATITUDE_MAX_VALUE])
+            );
+        });
+    });
+
+    describe('longitude', function() {
+        it('generating multiple bbox for east out of bounds', function() {
+            var bbox = [90, -45, 360, 45];
+            var bboxFilter = createFilter(bbox);
+
+            assert.equal(bboxFilter.bboxes.length, 2, JSON.stringify([bboxFilter.bboxes, bbox]));
+
+            assert.deepEqual(
+                bboxFilter.bboxes[0],
+                createRef([90, -45, 180, 45])
+            );
+            assert.deepEqual(
+                bboxFilter.bboxes[1],
+                createRef([-180, -45, 0, 45])
+            );
+        });
+
+        it('generating multiple bbox for east out of bounds', function() {
+            var bbox = [-270, -45, 0, 45];
+            var bboxFilter = createFilter(bbox);
+
+            assert.equal(bboxFilter.bboxes.length, 2);
+
+            assert.deepEqual(
+                bboxFilter.bboxes[0],
+                createRef([90, -45, 180, 45])
+            );
+            assert.deepEqual(
+                bboxFilter.bboxes[1],
+                createRef([-180, -45, 0, 45])
+            );
+        });
+    });
+
+    describe('out of bounds', function() {
+        it('wraps longitude', function () {
+            var bbox = [-190, -45, 190, 45];
+            var bboxFilter = createFilter(bbox);
+
+            assert.equal(bboxFilter.bboxes.length, 1);
+
+            assert.deepEqual(
+                bboxFilter.bboxes[0],
+                createRef([-180, -45, 180, 45])
+            );
+        });
+    });
+});

test/unit/cartodb/substitution-tokens.test.js

@@ -0,0 +1,40 @@
+var assert = require('assert');
+var SubstitutionTokens = require('../../../lib/cartodb/utils/substitution-tokens');
+
+describe('SubstitutionTokens', function() {
+
+    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 table) i',
+        'where ST_Intersects(i.the_geom_webmercator, hgrid.cell)',
+        'GROUP BY hgrid.cell'
+    ].join('\n');
+
+    it('should return tokens present in sql', function() {
+        assert.deepEqual(SubstitutionTokens.tokens(sql), ['bbox', 'scale_denominator', 'pixel_width', 'pixel_height']);
+    });
+
+    it('should return just one token', function() {
+        assert.deepEqual(SubstitutionTokens.tokens('select !bbox! from wadus'), ['bbox']);
+    });
+
+    it('should not return other tokens', function() {
+        assert.deepEqual(SubstitutionTokens.tokens('select !wadus! from wadus'), []);
+    });
+
+    it('should report sql has tokens', function() {
+        assert.equal(SubstitutionTokens.hasTokens(sql), true);
+        assert.equal(SubstitutionTokens.hasTokens('select !bbox! from wadus'), true);
+        assert.equal(SubstitutionTokens.hasTokens('select !wadus! from wadus'), false);
+    });
+});