Release 2.9.0

Merge pull request #324 from CartoDB/memory-stats
Send memory usage stats
2015-08-06 18:02:09 +02:00 · 2015-08-06 16:12:18 +02:00 · 2015-08-06 16:06:42 +02:00 · 2015-07-15 11:44:59 +02:00 · 2015-07-15 11:43:54 +02:00 · 2015-07-15 11:43:09 +02:00
42 changed files with 2764 additions and 1092 deletions
--- a/.jshintignore
+++ b/.jshintignore
@@ -0,0 +1,4 @@
+test/results/
+test/monkey/
+test/benchmark.js
+test/support/
--- a/2
+++ b/2
@@ -29,7 +29,7 @@ test: config/environments/test.js

 jshint:
 	@echo "***jshint***"
-	@./node_modules/.bin/jshint lib/ app.js
+	@./node_modules/.bin/jshint lib/ test/ app.js

 test-all: jshint test

--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,137 @@
 # Changelog

+## 2.9.0
+
+Released 2015-08-06
+
+New features:
+ - Send memory usage stats
+
+
+## 2.8.0
+
+Released 2015-07-15
+
+Announcements:
+ - Upgrades windshaft to [0.48.0](https://github.com/CartoDB/Windshaft/releases/tag/0.48.0)
+
+
+## 2.7.2
+
+Released 2015-07-14
+
+Enhancements:
+ - Replaces `CDB_QueryTables` with `CDB_QueryTablesText` to avoid issues with long schema+table names
+
+
+## 2.7.1
+
+Released 2015-07-06
+
+Bug fixes:
+ - redis-mpool `noReadyCheck` and `unwatchOnRelease` options from config and defaulted
+
+
+## 2.7.0
+
+Released 2015-07-06
+
+Announcements:
+ - Upgrades windshaft to [0.47.0](https://github.com/CartoDB/Windshaft/releases/tag/0.47.0)
+ - Upgrades redis-mpool to [0.4.0](https://github.com/CartoDB/node-redis-mpool/releases/tag/0.4.0)
+
+New features:
+ - Exposes redis `noReadyCheck` config
+
+Bug fixes:
+ - Fixes `unwatchOnRelease` redis config
+
+
+## 2.6.1
+
+Released 2015-07-02
+
+Announcements:
+ - Upgrades windshaft to [0.46.1](https://github.com/CartoDB/Windshaft/releases/tag/0.46.1)
+
+
+## 2.6.0
+
+Released 2015-07-02
+
+Announcements:
+ - Upgrades windshaft to [0.46.0](https://github.com/CartoDB/Windshaft/releases/tag/0.46.0)
+ - New config to set metatile by format
+
+
+## 2.5.0
+
+Released 2015-06-18
+
+New features:
+ - Named maps names can start with numbers and can contain dashes (-).
+ - Adds layergroupid header in map instantiations
+
+Bug fixes:
+ - Named maps error responses with `{ "errors": ["message"] }` format (#305)
+
+Announcements:
+ - Upgrades windshaft to [0.45.0](https://github.com/CartoDB/Windshaft/releases/tag/0.45.0)
+
+Enhancements:
+ - Fix documentation style and error examples
+
+
+## 2.4.1
+
+Released 2015-06-01
+
+Announcements:
+ - Upgrades windshaft to [0.44.1](https://github.com/CartoDB/Windshaft/releases/tag/0.44.1)
+
+
+## 2.4.0
+
+Released 2015-05-26
+
+Announcements:
+ - Upgrades windshaft to [0.44.0](https://github.com/CartoDB/Windshaft/releases/tag/0.44.0)
+
+
+## 2.3.0
+
+Released 2015-05-18
+
+Announcements:
+ - Upgrades cartodb-redis for `global` map stats
+
+
+## 2.2.0
+
+Released 2015-04-29
+
+Enhancements:
+ - jshint is run against tests
+ - tests moved to mocha's `describe`
+
+New features:
+ - Fastly surrogate keys invalidation for named maps
+   * **New configuration entry**: `fastly`. Check example configurations for more information.
+ - `PgQueryRunner` extracted from `QueryTablesApi` so it can be reused in new `TablesExtentApi`
+ - New top level element, `view`, in templates that holds attributes to identify the map scene.
+ - Named maps static preview in /api/v1/map/static/named/:name/:width/:height.:format endpoint
+   * It will be invalidated if the named map changes
+   * But have a Cache-Control header with a 2 hours max-age, won't be invalidated on data changes
+
+
+## 2.1.3
+
+Released 2015-04-16
+
+Announcements:
+ - Upgrades windshaft to [0.42.2](https://github.com/CartoDB/Windshaft/releases/tag/0.42.2)
+
+
 ## 2.1.2

 Released 2015-04-15
--- a/README.md
+++ b/README.md
@@ -59,6 +59,14 @@ happen to have startup errors you may need to force rebuilding those
 modules. At any time just wipe out the node_modules/ directory and run
 ```npm install``` again.

+Upgrading
+---------
+
+Checkout your commit/branch. If you need to reinstall dependencies (you can check [NEWS](NEWS.md)) do the following:
+
+```
+rm -rf node_modules; npm install
+```

 Run
 ---
--- a/app.js
+++ b/app.js
@@ -65,8 +65,12 @@ if ( global.environment.log_filename ) {
 global.log4js.configure(log4js_config, { cwd: __dirname });
 global.logger = global.log4js.getLogger();

-var redisOpts = _.extend(global.environment.redis, { name: 'windshaft' }),
-    redisPool = new RedisPool(redisOpts);
+var redisOpts = _.defaults(global.environment.redis, {
+    name: 'windshaft',
+    unwatchOnRelease: false,
+    noReadyCheck: true
+});
+var redisPool = new RedisPool(redisOpts);

 // Include cartodb_windshaft only _after_ the "global" variable is set
 // See https://github.com/Vizzuality/Windshaft-cartodb/issues/28
@@ -82,6 +86,13 @@ if (global.statsClient) {
        global.statsClient.gauge(keyPrefix + 'unused', status.unused);
        global.statsClient.gauge(keyPrefix + 'waiting', status.waiting);
    });
+
+    setInterval(function() {
+        var memoryUsage = process.memoryUsage();
+        Object.keys(memoryUsage).forEach(function(k) {
+            global.statsClient.gauge('windshaft.memory.' + k, memoryUsage[k]);
+        });
+    }, 5000);
 }

 // Maximum number of connections for one process
--- a/config/environments/development.js.example
+++ b/config/environments/development.js.example
@@ -2,6 +2,9 @@ var config = {
     environment: 'development'
    ,port: 8181
    ,host: '127.0.0.1'
+    // Size of the threadpool which can be used to run user code and get notified in the loop thread
+    // Its default size is 4, but it can be changed at startup time (the absolute maximum is 128).
+    // See http://docs.libuv.org/en/latest/threadpool.html
    ,uv_threadpool_size: undefined
    // Regular expression pattern to extract username
    // from hostname. Must have a single grabbing block.
@@ -86,8 +89,10 @@ var config = {
      cache_ttl: 60000,
      statsInterval: 5000, // milliseconds between each report to statsd about number of renderers and mapnik pool status
      mapnik: {
-          // The size of the pool of internal mapnik renderers
-          // Check the configuration of uv_threadpool_size to use suitable value
+          // The size of the pool of internal mapnik backend
+          // This pool size is per mapnik renderer created in Windshaft's RendererFactory
+          // See https://github.com/CartoDB/Windshaft/blob/master/lib/windshaft/renderers/renderer_factory.js
+          // Important: check the configuration of uv_threadpool_size to use suitable value
          poolSize: 8,

          // Metatile is the number of tiles-per-side that are going
@@ -96,6 +101,12 @@ var config = {
          // wasted time.
          metatile: 2,

+          // Override metatile behaviour depending on the format
+          formatMetatile: {
+              png: 2,
+              'grid.json': 1
+          },
+
          // Buffer size is the tickness in pixel of a buffer
          // around the rendered (meta?)tile.
          //
@@ -131,6 +142,7 @@ var config = {
          timeout: 2000, // the timeout in ms for a http tile request
          proxy: undefined, // the url for a proxy server
          whitelist: [ // the whitelist of urlTemplates that can be used
+              '.*', // will enable any URL
              'http://{s}.example.com/{z}/{x}/{y}.png'
          ],
          // image to use as placeholder when urlTemplate is not in the whitelist
@@ -169,7 +181,9 @@ var config = {
        },
        emitter: {
            statusInterval: 5000 // time, in ms, between each status report is emitted from the pool, status is sent to statsd
-        }
+        },
+        unwatchOnRelease: false, // Send unwatch on release, see http://github.com/CartoDB/Windshaft-cartodb/issues/161
+        noReadyCheck: true // Check `no_ready_check` at https://github.com/mranney/node_redis/tree/v0.12.1#overloading
    }
    ,varnish: {
        host: 'localhost',
@@ -180,6 +194,15 @@ var config = {
        ttl: 86400,
        layergroupTtl: 86400 // the max-age for cache-control header in layergroup responses
    }
+    // this [OPTIONAL] configuration enables invalidating by surrogate key in fastly
+    ,fastly: {
+        // whether the invalidation is enabled or not
+        enabled: false,
+        // the fastly api key
+        apiKey: 'wadus_api_key',
+        // the service that will get surrogate key invalidation
+        serviceId: 'wadus_service_id'
+    }
    // If useProfiler is true every response will be served with an
    // X-Tiler-Profile header containing elapsed timing for various 
    // steps taken for producing the response.
--- a/config/environments/production.js.example
+++ b/config/environments/production.js.example
@@ -2,6 +2,9 @@ var config = {
    environment: 'production'
    ,port: 8181
    ,host: '127.0.0.1'
+    // Size of the threadpool which can be used to run user code and get notified in the loop thread
+    // Its default size is 4, but it can be changed at startup time (the absolute maximum is 128).
+    // See http://docs.libuv.org/en/latest/threadpool.html
    ,uv_threadpool_size: undefined
    // Regular expression pattern to extract username
    // from hostname. Must have a single grabbing block.
@@ -80,8 +83,10 @@ var config = {
      cache_ttl: 60000,
      statsInterval: 5000, // milliseconds between each report to statsd about number of renderers and mapnik pool status
      mapnik: {
-          // The size of the pool of internal mapnik renderers
-          // Check the configuration of uv_threadpool_size to use suitable value
+          // The size of the pool of internal mapnik backend
+          // This pool size is per mapnik renderer created in Windshaft's RendererFactory
+          // See https://github.com/CartoDB/Windshaft/blob/master/lib/windshaft/renderers/renderer_factory.js
+          // Important: check the configuration of uv_threadpool_size to use suitable value
          poolSize: 8,

          // Metatile is the number of tiles-per-side that are going
@@ -90,6 +95,12 @@ var config = {
          // wasted time.
          metatile: 2,

+          // Override metatile behaviour depending on the format
+          formatMetatile: {
+              png: 2,
+              'grid.json': 1
+          },
+
          // Buffer size is the tickness in pixel of a buffer
          // around the rendered (meta?)tile.
          //
@@ -125,6 +136,7 @@ var config = {
          timeout: 2000, // the timeout in ms for a http tile request
          proxy: undefined, // the url for a proxy server
          whitelist: [ // the whitelist of urlTemplates that can be used
+              '.*', // will enable any URL
              'http://{s}.example.com/{z}/{x}/{y}.png'
          ],
          // image to use as placeholder when urlTemplate is not in the whitelist
@@ -163,7 +175,9 @@ var config = {
        },
        emitter: {
            statusInterval: 5000 // time, in ms, between each status report is emitted from the pool, status is sent to statsd
-        }
+        },
+        unwatchOnRelease: false, // Send unwatch on release, see http://github.com/CartoDB/Windshaft-cartodb/issues/161
+        noReadyCheck: true // Check `no_ready_check` at https://github.com/mranney/node_redis/tree/v0.12.1#overloading
    }
    ,varnish: {
        host: 'localhost',
@@ -174,6 +188,15 @@ var config = {
        ttl: 86400,
        layergroupTtl: 86400 // the max-age for cache-control header in layergroup responses
    }
+    // this [OPTIONAL] configuration enables invalidating by surrogate key in fastly
+    ,fastly: {
+        // whether the invalidation is enabled or not
+        enabled: false,
+        // the fastly api key
+        apiKey: 'wadus_api_key',
+        // the service that will get surrogate key invalidation
+        serviceId: 'wadus_service_id'
+    }
    // If useProfiler is true every response will be served with an
    // X-Tiler-Profile header containing elapsed timing for various 
    // steps taken for producing the response.
--- a/config/environments/staging.js.example
+++ b/config/environments/staging.js.example
@@ -2,6 +2,9 @@ var config = {
    environment: 'production'
    ,port: 8181
    ,host: '127.0.0.1'
+    // Size of the threadpool which can be used to run user code and get notified in the loop thread
+    // Its default size is 4, but it can be changed at startup time (the absolute maximum is 128).
+    // See http://docs.libuv.org/en/latest/threadpool.html
    ,uv_threadpool_size: undefined
    // Regular expression pattern to extract username
    // from hostname. Must have a single grabbing block.
@@ -80,8 +83,10 @@ var config = {
      cache_ttl: 60000,
      statsInterval: 5000, // milliseconds between each report to statsd about number of renderers and mapnik pool status
      mapnik: {
-          // The size of the pool of internal mapnik renderers
-          // Check the configuration of uv_threadpool_size to use suitable value
+          // The size of the pool of internal mapnik backend
+          // This pool size is per mapnik renderer created in Windshaft's RendererFactory
+          // See https://github.com/CartoDB/Windshaft/blob/master/lib/windshaft/renderers/renderer_factory.js
+          // Important: check the configuration of uv_threadpool_size to use suitable value
          poolSize: 8,

          // Metatile is the number of tiles-per-side that are going
@@ -90,6 +95,12 @@ var config = {
          // wasted time.
          metatile: 2,

+          // Override metatile behaviour depending on the format
+          formatMetatile: {
+              png: 2,
+              'grid.json': 1
+          },
+
          // Buffer size is the tickness in pixel of a buffer
          // around the rendered (meta?)tile.
          //
@@ -125,6 +136,7 @@ var config = {
          timeout: 2000, // the timeout in ms for a http tile request
          proxy: undefined, // the url for a proxy server
          whitelist: [ // the whitelist of urlTemplates that can be used
+              '.*', // will enable any URL
              'http://{s}.example.com/{z}/{x}/{y}.png'
          ],
          // image to use as placeholder when urlTemplate is not in the whitelist
@@ -163,7 +175,9 @@ var config = {
        },
        emitter: {
            statusInterval: 5000 // time, in ms, between each status report is emitted from the pool, status is sent to statsd
-        }
+        },
+        unwatchOnRelease: false, // Send unwatch on release, see http://github.com/CartoDB/Windshaft-cartodb/issues/161
+        noReadyCheck: true // Check `no_ready_check` at https://github.com/mranney/node_redis/tree/v0.12.1#overloading
    }
    ,varnish: {
        host: 'localhost',
@@ -174,6 +188,15 @@ var config = {
        ttl: 86400,
        layergroupTtl: 86400 // the max-age for cache-control header in layergroup responses
    }
+    // this [OPTIONAL] configuration enables invalidating by surrogate key in fastly
+    ,fastly: {
+        // whether the invalidation is enabled or not
+        enabled: false,
+        // the fastly api key
+        apiKey: 'wadus_api_key',
+        // the service that will get surrogate key invalidation
+        serviceId: 'wadus_service_id'
+    }
    // If useProfiler is true every response will be served with an
    // X-Tiler-Profile header containing elapsed timing for various 
    // steps taken for producing the response.
--- a/config/environments/test.js.example
+++ b/config/environments/test.js.example
@@ -2,6 +2,9 @@ var config = {
     environment: 'test'
    ,port: 8888
    ,host: '127.0.0.1'
+    // Size of the threadpool which can be used to run user code and get notified in the loop thread
+    // Its default size is 4, but it can be changed at startup time (the absolute maximum is 128).
+    // See http://docs.libuv.org/en/latest/threadpool.html
    ,uv_threadpool_size: undefined
    // Regular expression pattern to extract username
    // from hostname. Must have a single grabbing block.
@@ -80,8 +83,10 @@ var config = {
      cache_ttl: 60000,
      statsInterval: 5000, // milliseconds between each report to statsd about number of renderers and mapnik pool status
      mapnik: {
-          // The size of the pool of internal mapnik renderers
-          // Check the configuration of uv_threadpool_size to use suitable value
+          // The size of the pool of internal mapnik backend
+          // This pool size is per mapnik renderer created in Windshaft's RendererFactory
+          // See https://github.com/CartoDB/Windshaft/blob/master/lib/windshaft/renderers/renderer_factory.js
+          // Important: check the configuration of uv_threadpool_size to use suitable value
          poolSize: 8,

          // Metatile is the number of tiles-per-side that are going
@@ -90,6 +95,12 @@ var config = {
          // wasted time.
          metatile: 2,

+          // Override metatile behaviour depending on the format
+          formatMetatile: {
+              png: 2,
+              'grid.json': 1
+          },
+
          // Buffer size is the tickness in pixel of a buffer
          // around the rendered (meta?)tile.
          //
@@ -125,6 +136,7 @@ var config = {
          timeout: 2000, // the timeout in ms for a http tile request
          proxy: undefined, // the url for a proxy server
          whitelist: [ // the whitelist of urlTemplates that can be used
+              '.*', // will enable any URL
              'http://{s}.example.com/{z}/{x}/{y}.png',
              // for testing purposes
              'http://{s}.basemaps.cartocdn.com/dark_nolabels/{z}/{x}/{y}.png'
@@ -165,7 +177,9 @@ var config = {
        },
        emitter: {
            statusInterval: 5000 // time, in ms, between each status report is emitted from the pool, status is sent to statsd
-        }
+        },
+        unwatchOnRelease: false, // Send unwatch on release, see http://github.com/CartoDB/Windshaft-cartodb/issues/161
+        noReadyCheck: true // Check `no_ready_check` at https://github.com/mranney/node_redis/tree/v0.12.1#overloading
    }
    ,varnish: {
        host: '',
@@ -176,6 +190,15 @@ var config = {
        ttl: 86400,
        layergroupTtl: 86400 // the max-age for cache-control header in layergroup responses
    }
+    // this [OPTIONAL] configuration enables invalidating by surrogate key in fastly
+    ,fastly: {
+        // whether the invalidation is enabled or not
+        enabled: false,
+        // the fastly api key
+        apiKey: 'wadus_api_key',
+        // the service that will get surrogate key invalidation
+        serviceId: 'wadus_service_id'
+    }
    // If useProfiler is true every response will be served with an
    // X-Tiler-Profile header containing elapsed timing for various 
    // steps taken for producing the response.
--- a/docs/Map-API.md
+++ b/docs/Map-API.md
@@ -18,7 +18,7 @@ Here is an example of how to create an anonymous map with JavaScript:

 ```javascript
 var mapconfig = {
-  "version": "1.0.1",
+  "version": "1.3.1",
  "layers": [{
    "type": "cartodb",
    "options": {
@@ -57,7 +57,7 @@ The following map config sets up a map of European countries that have a white f
  },
  "layergroup": {
    "layers": [{
-      "type": "cartodb",
+      "type": "mapnik",
      "options": {
        "cartocss_version": "2.1.1",
        "cartocss": "#layer { polygon-fill: #FFF; }",
@@ -82,14 +82,23 @@ To get the `URL` to fetch the tiles you need to instantiate the map, where `temp
 curl -X POST 'https://{account}.cartodb.com/api/v1/map/named/:template_id' -H 'Content-Type: application/json'
 ```

-The response will return JSON with properties for the `layergroupid` and the timestamp (`last_updated`) of the last data modification. 
+The response will return JSON with properties for the `layergroupid`, the timestamp (`last_updated`) of the last data modification and some key/value pairs with `metadata` for the `layers`.
+Note: all `layers` in `metadata` will always have a `type` string and a `meta` dictionary with the key/value pairs.

 Here is an example response:

 ```javascript
 {
  "layergroupid": "c01a54877c62831bb51720263f91fb33:0",
-  "last_updated": "1970-01-01T00:00:00.000Z"
+  "last_updated": "1970-01-01T00:00:00.000Z",
+  "metadata": {
+    "layers": [
+      {
+        "type": "mapnik",
+        "meta": {}
+      }
+    ]
+  }
 }
 ```

@@ -144,9 +153,9 @@ POST /api/v1/map

 ```javascript
 {
-  "version": "1.0.1",
+  "version": "1.3.0",
  "layers": [{
-    "type": "cartodb",
+    "type": "mapnik",
    "options": {
      "cartocss_version": "2.1.1", 
      "cartocss": "#layer { polygon-fill: #FFF; }",
@@ -157,7 +166,7 @@ POST /api/v1/map
 }
 ```

-Should be a [Mapconfig](https://github.com/CartoDB/Windshaft/blob/0.19.1/doc/MapConfig-1.1.0.md).
+Should be a [Mapconfig](https://github.com/CartoDB/Windshaft/blob/0.44.1/doc/MapConfig-1.3.0.md).

 #### Response

@@ -173,8 +182,9 @@ The response includes:
 - **updated_at**  
  The ISO date of the last time the data involved in the query was updated.

- **metadata** *(optional)*  
-  Includes information about the layers. Some layers may not have metadata.
+- **metadata**
+  Includes information about the layers.
+  -

 - **cdn_url**  
  URLs to fetch the data using the best CDN for your zone.
@@ -189,8 +199,16 @@ curl 'https://documentation.cartodb.com/api/v1/map' -H 'Content-Type: applicatio
 <div class="code-title">RESPONSE</div>
 ```javascript
 {
-  "layergroupid":"c01a54877c62831bb51720263f91fb33:0",
-  "last_updated":"1970-01-01T00:00:00.000Z"
+  "layergroupid": "c01a54877c62831bb51720263f91fb33:0",
+  "last_updated": "1970-01-01T00:00:00.000Z",
+  "metadata": {
+    "layers": [
+      {
+        "type": "mapnik",
+        "meta": {}
+      }
+    ]
+  },
  "cdn_url": {
    "http": "http://cdb.com",
    "https": "https://cdb.com"
@@ -198,19 +216,35 @@ curl 'https://documentation.cartodb.com/api/v1/map' -H 'Content-Type: applicatio
 }
 ```

-The tiles can be accessed using:
+##### Retrieve resources from the layergroup
+
+###### Mapnik tiles can be accessed using:
+
+These tiles will get just the mapnik layers. To get individual layers see next section.

 ```bash
 https://documentation.cartodb.com/api/v1/map/c01a54877c62831bb51720263f91fb33:0/{z}/{x}/{y}.png
 ```

-For UTF grid tiles:
+###### Individual layers
+
+The MapConfig specification holds the layers definition in a 0-based index. Layers can be requested individually in different formats depending on the layer type.
+
+Individual layers can be accessed using that 0-based index. For UTF grid tiles:

 ```bash
 https://documentation.cartodb.com/api/v1/map/c01a54877c62831bb51720263f91fb33:0/:layer/{z}/{x}/{y}.grid.json
 ```

-For attributes defined in `attributes` section:
+In this case, `:layer` as 0 returns the UTF grid tiles/attributes for layer 0, the only layer in the example MapConfig.
+
+If the MapConfig had a Torque layer at index 1 it could be possible to request it with:
+
+```bash
+https://documentation.cartodb.com/api/v1/map/c01a54877c62831bb51720263f91fb33:0/1/{z}/{x}/{y}.torque.json
+```
+
+###### Attributes defined in `attributes` section:

 ```bash
 https://documentation.cartodb.com/api/v1/map/c01a54877c62831bb51720263f91fb33:0/:layer/attributes/:feature_id
@@ -219,10 +253,44 @@ https://documentation.cartodb.com/api/v1/map/c01a54877c62831bb51720263f91fb33:0/
 Which returns JSON with the attributes defined, like:

 ```javascript
-{ c: 1, d: 2 }
+{ "c": 1, "d": 2 }
 ```

-Notice UTF Grid and attributes endpoints need an integer parameter, ``layer``. That number is the 0-based index of the layer inside the mapconfig. In this case, 0 returns the UTF grid tiles/attributes for layer 0, the only layer in the example mapconfig. If a second layer was available it could be returned with 1, a third layer with 2, etc.
+###### Blending and layer selection
+
+```bash
+https://documentation.cartodb.com/api/v1/map/c01a54877c62831bb51720263f91fb33:0/:layer_filter/{z}/{x}/{y}.png
+```
+
+Note: currently format is limited to `png`.
+
+`:layer_filter` can be used to select some layers to be rendered together. `:layer_filter` supports two formats:
+
+- `all` alias
+
+Using `all` as `:layer_filter` will blend all layers in the layergroup
+
+```bash
+https://documentation.cartodb.com/api/v1/map/c01a54877c62831bb51720263f91fb33:0/all/{z}/{x}/{y}.png
+```
+
+- Filter by layer index
+
+A list of comma separated layer indexes can be used to just render a subset of layers. For example `0,3,4` will filter and blend layers with indexes 0, 3, and 4.
+
+```bash
+https://documentation.cartodb.com/api/v1/map/c01a54877c62831bb51720263f91fb33:0/0,3,4/{z}/{x}/{y}.png
+```
+
+Some notes about filtering:
+
+  - Invalid index values or out of bounds indexes will end in `Invalid layer filtering` errors.
+  - Once a mapnik layer is selected, all mapnik layers will get blended. As this may change in the future **it is
+  recommended** to always select all mapnik layers if you want to select at least one so you will get a consistent
+  behavior in the future.
+  - Ordering is not considered. So right now filtering layers 0,3,4 is the very same thing as filtering 3,4,0. As this
+  may change in the future **it is recommended** to always select the layers in ascending order so you will get a
+  consistent behavior in the future.

 ### Create JSONP

@@ -272,7 +340,7 @@ Anonymous maps cannot be removed by an API call. They will expire after about fi

 ## Named Maps

-Named maps are essentially the same as anonymous maps except the mapconfig is stored on the server and the map is given a unique name. Two other big differences are: you can create named maps from private data and that users without an API Key can see them even though they are from that private data.
+Named maps are essentially the same as anonymous maps except the MapConfig is stored on the server and the map is given a unique name. Two other big differences are: you can create named maps from private data and that users without an API Key can see them even though they are from that private data.

 The main two differences compared to anonymous maps are:

@@ -280,7 +348,7 @@ The main two differences compared to anonymous maps are:
  This allows you to control who is able to see the map based on a token auth

 - **templates**  
-  Since the mapconfig is static it can contain some variables so the client can modify the map's appearance using those variables.
+  Since the MapConfig is static it can contain some variables so the client can modify the map's appearance using those variables.

 Template maps are persistent with no preset expiration. They can only be created or deleted by a CartoDB user with a valid API_KEY (see auth section).

@@ -331,18 +399,41 @@ POST /api/v1/map/named
        }
      }
    ]
+  },
+  "view": {
+    "zoom": 4,
+    "center": {
+      "lng": 0,
+      "lat": 0
+    },
+    "bounds": {
+      "west": -45,
+      "south": -45,
+      "east": 45,
+      "north": 45
+    }
  }
 }
 ```

 ##### Arguments

- **name**: There can be at most _one_ template with the same name for any user. Valid names start with a letter, and only contain letters, numbers, or underscores (_).
+- **name**: There can be at most _one_ template with the same name for any user. Valid names start with a letter or a number, and only contain letters, numbers, dashes (-) or underscores (_).
 - **auth**:
  - **method** `"token"` or `"open"` (the default if no `"method"` is given).
  - **valid_tokens** when `"method"` is set to `"token"`, the values listed here allow you to instantiate the named map.
 - **placeholders**: Variables not listed here are not substituted. Variables not provided at instantiation time trigger an error. A default is required for optional variables. Type specification is used for quoting, to avoid injections see template format section below.
- **layergroup**: the layer list definition. This is the MapConfig explained in anonymous maps. See [MapConfig documentation](https://github.com/CartoDB/Windshaft/blob/master/doc/MapConfig-1.1.0.md) for more info.
+- **layergroup**: the layer list definition. This is the MapConfig explained in anonymous maps. See [MapConfig documentation](https://github.com/CartoDB/Windshaft/blob/0.44.1/doc/MapConfig-1.3.0.md) for more info.
+- **view** (optional): extra keys to specify the compelling area for the map. It can be used to have a static preview of a named map without having to instantiate it. It is possible to specify it with `center` + `zoom` or with a bounding box `bbox`. Center+zoom takes precedence over bounding box.
+  - **zoom** The zoom level to use
+  - **center**
+    - **lng** The longitude to use for the center
+    - **lat** The latitude to use for the center
+  - **bounds**
+    - **west**: LowerCorner longitude for the bounding box, in decimal degrees (aka most western)
+    - **south**: LowerCorner latitude for the bounding box, in decimal degrees (aka most southern)
+    - **east**: UpperCorner longitude for the bounding box, in decimal degrees (aka most eastern)
+    - **north**: UpperCorner latitude for the bounding box, in decimal degrees (aka most northern)

 #### Template Format

@@ -438,7 +529,7 @@ curl -X POST \
 <div class="code-title">Error</div>
 ```javascript
 {
-  "error": "Some error string here"
+  "errors" : ["Some error string here"]
 }
 ```

@@ -539,7 +630,7 @@ If a template with the same name does NOT exist, a 400 HTTP response is generate

 ```javascript
 {
-  "error": "error string here"
+  "errors" : ["error string here"]
 }
 ```

@@ -568,7 +659,7 @@ curl -X DELETE 'https://documentation.cartodb.com/api/v1/map/named/:template_nam
 <div class="code-title">RESPONSE</div>
 ```javascript
 {
-  "error": "Some error string here"
+  "errors" : ["Some error string here"]
 }
 ```

@@ -606,7 +697,7 @@ curl -X GET 'https://documentation.cartodb.com/api/v1/map/named?api_key=APIKEY'
 <div class="code-title">ERROR</div>
 ```javascript
 {
-   "error": "Some error string here"
+   "errors" : ["Some error string here"]
 }
 ```

@@ -642,7 +733,7 @@ curl -X GET 'https://documentation.cartodb.com/api/v1/map/named/:template_name?a
 <div class="code-title">ERROR</div>
 ```javascript
 {
-  "error": "Some error string here"
+  "errors" : ["Some error string here"]
 }
 ```

@@ -672,13 +763,15 @@ cartodb.createLayer('map_dom_id',layerSource)
 1. [layer.setParams()](http://docs.cartodb.com/cartodb-platform/cartodb-js.html#layersetparamskey-value) allows you to change the template variables (in the placeholders object) via JavaScript 
 2. [layer.setAuthToken()](http://docs.cartodb.com/cartodb-platform/cartodb-js.html#layersetauthtokenauthtoken) allows you to set the auth tokens to create the layer

-##Static Maps API
+## Static Maps API

 The Static Maps API can be initiated using both named and anonymous maps using the 'layergroupid' token. The API can be used to create static images of parts of maps and thumbnails for use in web design, graphic design, print, field work, and many other applications that require standard image formats.

 ### Maps API endpoints

-Begin by instantiating either a named or anonymous map using the `layergroupid token` as demonstrated in the Maps API documentation above. The `layergroupsid token` calls to the map and allows for parameters in the definition to generate static images. 
+Begin by instantiating either a named or anonymous map using the `layergroupid token` as demonstrated in the Maps API documentation above. The `layergroupid` token calls to the map and allows for parameters in the definition to generate static images.
+
+#### Zoom + center

 ##### Definition

@@ -726,6 +819,25 @@ Note: you can see this endpoint as:
 GET /api/v1/map/static/bbox/:token/:west,:south,:east,:north/:width/:height.:format`
 ```

+#### Named map
+
+##### Definition
+
+<div class="code-title notitle code-request"></div>
+```bash
+GET /api/v1/map/static/named/:name/:width/:height.:format
+```
+
+##### Params
+
+* **:name**: the name of the named map
+* **:width**: the width in pixels for the output image
+* **:height**: the height in pixels for the output image
+* **:format**: the format for the image, supported types: `png`, `jpg`
+  * **jpg** will have a default quality of 85.
+
+A named maps static image will get its constraints from the [view in the template](#Arguments), if `view` is not present it will estimate the extent based on the involved tables otherwise it fallback to `"zoom": 1`, `"lng": 0` and `"lat": 0`.
+
 ####Layers

 The Static Maps API allows for multiple layers of incorporation into the `MapConfig` to allow for maximum versatility in creating a static map. The examples below were used to generate the static image example in the next section, and appear in the specific order designated.
@@ -768,6 +880,8 @@ By manipulating the `"urlTemplate"` custom basemaps can be used in generating st

 **CartoDB**

+As described in the [Mapconfig documentation](https://github.com/CartoDB/Windshaft/blob/0.44.1/doc/MapConfig-1.3.0.md), a "cartodb" type layer is now just an alias to a "mapnik" type layer as above, intended for backwards compatibility.
+
 ```javascript
    {
      "type": "cartodb",
@@ -779,14 +893,14 @@ By manipulating the `"urlTemplate"` custom basemaps can be used in generating st
    },
 ```

-Additoinally, static images from Torque maps and other map layers can be used together to generate highly customizable and versatile static maps.
+Additionally, static images from Torque maps and other map layers can be used together to generate highly customizable and versatile static maps.


-####Caching
+#### Caching

 It is important to note that generated images are cached from the live data referenced with the `layergroupid token` on the specified CartoDB account. This means that if the data changes, the cached image will also change. When linking dynamically, it is important to take into consideration the state of the data and longevity of the static image to avoid broken images or changes in how the image is displayed. To obtain a static snapshot of the map as it is today and preserve the image long-term regardless of changes in data, the image must be saved and stored locally.

-####Limits
+#### Limits

 * While images can encompass an entirety of a map, the default limit for pixel range is 8192 x 8192.
 * Image resolution by default is set to 72 DPI
@@ -803,16 +917,17 @@ After instantiating a map from a CartoDB account:
 GET /api/v1/map/static/center/4b615ff367e498e770e7d05e99181873:1420231989550.8699/14/40.71502926732618/-73.96039009094238/600/400.png
 ```

-####Response
-<div clas="wrap"><p class="wrap-border"><img src="https://raw.githubusercontent.com/namessanti/Pictures/master/static_api.png" alt="static-api"/></p>,</div>
+#### Response

-####MapConfig
+<p class="wrap-border"><img src="https://raw.githubusercontent.com/namessanti/Pictures/master/static_api.png" alt="static-api"/></p>
+
+#### MapConfig

 For this map, the multiple layers, order, and stylings are defined by the MapConfig.

 ```javascript
 {
-  "version": "1.3.0-alpha",
+  "version": "1.3.0",
  "layers": [
    {
      "type": "http",
--- a/docs/MultiLayer-API.md
+++ b/docs/MultiLayer-API.md
@@ -1,4 +1,4 @@
-The Windshaft-CartoDB MultiLayer API extends the [Windshaft MultiLayer API](https://github.com/Vizzuality/Windshaft/wiki/Multilayer-API) in a few ways.
+The Windshaft-CartoDB MultiLayer API extends the [Windshaft MultiLayer API](https://github.com/CartoDB/Windshaft/blob/master/doc/Multilayer-API.md) in a few ways.

 ## Last modification timestamp embedded in the token

--- a/docs/Routes.md
+++ b/docs/Routes.md
@@ -38,6 +38,9 @@ This document list all routes available in Windshaft-cartodb Maps API server.
 1. `GET (?:/api/v1/map/named|/user/:user/api/v1/map/named|/tiles/template) {:user(f)} (1)`
 <br/>Notes: List named maps (w/ API KEY) [1]

+1. `GET (?:/api/v1/map|/user/:user/api/v1/map|/tiles/layergroup)/static/named/:template_id/:width/:height.:format {:user(f),:template_id(f),:width(f),:height(f),:format(f)} (1)`
+<br/>Notes: Static map for named maps
+
 1. `GET /health {} (1)`
 <br/>Notes: Healt check

@@ -73,10 +76,10 @@ Something like the following patch should do the trick

 ```javascript
 diff --git a/lib/cartodb/cartodb_windshaft.js b/lib/cartodb/cartodb_windshaft.js
-index 477a4c2..f69eebb 100644
+index b9429a2..e6cc5f9 100644
 --- a/lib/cartodb/cartodb_windshaft.js
 +++ b/lib/cartodb/cartodb_windshaft.js
-@@ -242,6 +242,20 @@ var CartodbWindshaft = function(serverOptions) {
+@@ -212,6 +212,20 @@ var CartodbWindshaft = function(serverOptions) {
         }
     });

--- a/lib/cartodb/api/query_tables_api.js
+++ b/lib/cartodb/api/query_tables_api.js
@@ -1,9 +1,5 @@
-var PSQL = require('cartodb-psql');
-var step = require('step');
-
-function QueryTablesApi(pgConnection, metadataBackend) {
-    this.pgConnection = pgConnection;
-    this.metadataBackend = metadataBackend;
+function QueryTablesApi(pgQueryRunner) {
+    this.pgQueryRunner = pgQueryRunner;
 }

 var affectedTableRegexCache = {
@@ -18,9 +14,9 @@ module.exports = QueryTablesApi;

 QueryTablesApi.prototype.getAffectedTablesInQuery = function (username, sql, callback) {

-    var query = 'SELECT CDB_QueryTables($windshaft$' + prepareSql(sql) + '$windshaft$)';
+    var query = 'SELECT CDB_QueryTablesText($windshaft$' + prepareSql(sql) + '$windshaft$)';

-    this.runQuery(username, query, handleAffectedTablesInQueryRows, callback);
+    this.pgQueryRunner.run(username, query, handleAffectedTablesInQueryRows, callback);
 };

 function handleAffectedTablesInQueryRows(err, rows, callback) {
@@ -29,9 +25,9 @@ function handleAffectedTablesInQueryRows(err, rows, callback) {
        callback(new Error('could not fetch source tables: ' + msg));
        return;
    }
-    var qtables = rows[0].cdb_querytables;
-    var tableNames = qtables.split(/^\{(.*)\}$/)[1];
-    tableNames = tableNames ? tableNames.split(',') : [];
+
+    // This is an Array, so no need to split into parts
+    var tableNames = rows[0].cdb_querytablestext;
    callback(null, tableNames);
 }

@@ -39,14 +35,14 @@ QueryTablesApi.prototype.getAffectedTablesAndLastUpdatedTime = function (usernam

    var query = [
        'WITH querytables AS (',
-            'SELECT * FROM CDB_QueryTables($windshaft$' + prepareSql(sql) + '$windshaft$) as tablenames',
+            'SELECT * FROM CDB_QueryTablesText($windshaft$' + prepareSql(sql) + '$windshaft$) as tablenames',
        ')',
        'SELECT (SELECT tablenames FROM querytables), EXTRACT(EPOCH FROM max(updated_at)) as max',
        'FROM CDB_TableMetadata m',
        'WHERE m.tabname = any ((SELECT tablenames from querytables)::regclass[])'
    ].join(' ');

-    this.runQuery(username, query, handleAffectedTablesAndLastUpdatedTimeRows, callback);
+    this.pgQueryRunner.run(username, query, handleAffectedTablesAndLastUpdatedTimeRows, callback);
 };

 function handleAffectedTablesAndLastUpdatedTimeRows(err, rows, callback) {
@@ -58,8 +54,8 @@ function handleAffectedTablesAndLastUpdatedTimeRows(err, rows, callback) {

    var result = rows[0];

-    var tableNames = result.tablenames.split(/^\{(.*)\}$/)[1];
-    tableNames = tableNames ? tableNames.split(',') : [];
+    // This is an Array, so no need to split into parts
+    var tableNames = result.tablenames;

    var lastUpdatedTime = result.max || 0;

@@ -69,43 +65,6 @@ function handleAffectedTablesAndLastUpdatedTimeRows(err, rows, callback) {
    });
 }

-
-QueryTablesApi.prototype.runQuery = function(username, query, queryHandler, callback) {
-    var self = this;
-
-    var params = {};
-
-    step(
-        function setAuth() {
-            self.pgConnection.setDBAuth(username, params, this);
-        },
-        function setConn(err) {
-            if (err) {
-                throw err;
-            }
-            self.pgConnection.setDBConn(username, params, this);
-        },
-        function executeQuery(err) {
-            if (err) {
-                throw err;
-            }
-            var psql = new PSQL({
-                user: params.dbuser,
-                pass: params.dbpass,
-                host: params.dbhost,
-                port: params.dbport,
-                dbname: params.dbname
-            });
-            psql.query(query, function(err, resultSet) {
-                resultSet = resultSet || {};
-                var rows = resultSet.rows || [];
-                queryHandler(err, rows, callback);
-            });
-        }
-    );
-};
-
-
 function prepareSql(sql) {
    return sql
        .replace(affectedTableRegexCache.bbox, 'ST_MakeEnvelope(0,0,0,0)')
--- a/lib/cartodb/api/tables_extent_api.js
+++ b/lib/cartodb/api/tables_extent_api.js
@@ -0,0 +1,54 @@
+function TablesExtentApi(pgQueryRunner) {
+    this.pgQueryRunner = pgQueryRunner;
+}
+
+module.exports = TablesExtentApi;
+
+/**
+ * Given a username and a list of tables it will return the estimated extent in SRID 4326 for all the tables based on
+ * the_geom_webmercator (SRID 3857) column.
+ *
+ * @param {String} username
+ * @param {Array} tableNames The named can be schema qualified, so this accepts both `schema_name.table_name` and
+ *  `table_name` format as valid input
+ * @param {Function} callback function(err, result) {Object} result with `west`, `south`, `east`, `north`
+ */
+TablesExtentApi.prototype.getBounds = function (username, tableNames, callback) {
+    var estimatedExtentSQLs = tableNames.map(function(tableName) {
+        var schemaTable = tableName.split('.');
+        if (schemaTable.length > 1) {
+            return "ST_EstimatedExtent('" + schemaTable[0] + "', '" + schemaTable[1] + "', 'the_geom_webmercator')";
+        }
+        return "ST_EstimatedExtent('" + schemaTable[0] + "', 'the_geom_webmercator')";
+    });
+
+    var query = [
+        "WITH ext as (" +
+            "SELECT ST_Transform(ST_SetSRID(ST_Extent(ST_Union(ARRAY[",
+                estimatedExtentSQLs.join(','),
+            "])), 3857), 4326) geom)",
+        "SELECT",
+            "ST_XMin(geom) west,",
+            "ST_YMin(geom) south,",
+            "ST_XMax(geom) east,",
+            "ST_YMax(geom) north",
+        "FROM ext"
+    ].join(' ');
+
+    this.pgQueryRunner.run(username, query, handleBoundsResult, callback);
+};
+
+function handleBoundsResult(err, rows, callback) {
+    if (err){
+        var msg = err.message ? err.message : err;
+        callback(new Error('could not fetch source tables: ' + msg));
+        return;
+    }
+    var result = null;
+    if (rows.length > 0) {
+        result = {
+            bounds: rows[0]
+        };
+    }
+    callback(null, result);
+}
--- a/lib/cartodb/backends/pg_query_runner.js
+++ b/lib/cartodb/backends/pg_query_runner.js
@@ -0,0 +1,44 @@
+var PSQL = require('cartodb-psql');
+var step = require('step');
+
+function PgQueryRunner(pgConnection) {
+    this.pgConnection = pgConnection;
+}
+
+module.exports = PgQueryRunner;
+
+
+PgQueryRunner.prototype.run = function(username, query, queryHandler, callback) {
+    var self = this;
+
+    var params = {};
+
+    step(
+        function setAuth() {
+            self.pgConnection.setDBAuth(username, params, this);
+        },
+        function setConn(err) {
+            if (err) {
+                throw err;
+            }
+            self.pgConnection.setDBConn(username, params, this);
+        },
+        function executeQuery(err) {
+            if (err) {
+                throw err;
+            }
+            var psql = new PSQL({
+                user: params.dbuser,
+                pass: params.dbpass,
+                host: params.dbhost,
+                port: params.dbport,
+                dbname: params.dbname
+            });
+            psql.query(query, function(err, resultSet) {
+                resultSet = resultSet || {};
+                var rows = resultSet.rows || [];
+                queryHandler(err, rows, callback);
+            });
+        }
+    );
+};
--- a/lib/cartodb/cache/backend/fastly.js
+++ b/lib/cartodb/cache/backend/fastly.js
@@ -0,0 +1,16 @@
+var FastlyPurge = require('fastly-purge');
+
+function FastlyCacheBackend(apiKey, serviceId, softPurge) {
+    this.serviceId = serviceId;
+    this.fastlyPurge = new FastlyPurge(apiKey, { softPurge: softPurge || true });
+}
+
+module.exports = FastlyCacheBackend;
+
+/**
+ * @param cacheObject should respond to `key() -> String` method
+ * @param {Function} callback
+ */
+FastlyCacheBackend.prototype.invalidate = function(cacheObject, callback) {
+    this.fastlyPurge.key(this.serviceId, cacheObject.key(), callback);
+};
--- a/lib/cartodb/cache/backend/varnish_http.js
+++ b/lib/cartodb/cache/backend/varnish_http.js
@@ -28,5 +28,3 @@ VarnishHttpCacheBackend.prototype.invalidate = function(cacheObject, callback) {
        }
    );
 };
-
-module.exports = VarnishHttpCacheBackend;
--- a/lib/cartodb/cache/surrogate_keys_cache.js
+++ b/lib/cartodb/cache/surrogate_keys_cache.js
@@ -1,9 +1,11 @@
+var queue = require('queue-async');
+
 /**
- * @param cacheBackend should respond to `invalidate(cacheObject, callback)` method
+ * @param {Array|Object} cacheBackends each backend backend should respond to `invalidate(cacheObject, callback)` method
 * @constructor
 */
-function SurrogateKeysCache(cacheBackend) {
-    this.cacheBackend = cacheBackend;
+function SurrogateKeysCache(cacheBackends) {
+    this.cacheBackends = Array.isArray(cacheBackends) ? cacheBackends : [cacheBackends];
 }

 module.exports = SurrogateKeysCache;
@@ -22,5 +24,18 @@ SurrogateKeysCache.prototype.tag = function(response, cacheObject) {
 * @param {Function} callback
 */
 SurrogateKeysCache.prototype.invalidate = function(cacheObject, callback) {
-    this.cacheBackend.invalidate(cacheObject, callback);
+    var invalidationQueue = queue(this.cacheBackends.length);
+
+    this.cacheBackends.forEach(function(cacheBackend) {
+        invalidationQueue.defer(function(cacheBackend, done) {
+            cacheBackend.invalidate(cacheObject, done);
+        }, cacheBackend);
+    });
+
+    invalidationQueue.awaitAll(function(err, result) {
+        if (err) {
+            return callback(err);
+        }
+        callback(null, result);
+    });
 };
--- a/lib/cartodb/cartodb_windshaft.js
+++ b/lib/cartodb/cartodb_windshaft.js
@@ -4,6 +4,11 @@ var Windshaft = require('windshaft');
 var os = require('os');
 var HealthCheck = require('./monitoring/health_check');

+var SurrogateKeysCache = require('./cache/surrogate_keys_cache');
+var NamedMapsCacheEntry = require('./cache/model/named_maps_entry');
+var VarnishHttpCacheBackend = require('./cache/backend/varnish_http');
+var FastlyCacheBackend = require('./cache/backend/fastly');
+
 if ( ! process.env.PGAPPNAME )
  process.env.PGAPPNAME='cartodb_tiler';

@@ -30,28 +35,41 @@ var CartodbWindshaft = function(serverOptions) {
    //
    var template_baseurl = global.environment.base_url_templated || '(?:/maps/named|/tiles/template)';

-    var SurrogateKeysCache = require('./cache/surrogate_keys_cache'),
-        NamedMapsCacheEntry = require('./cache/model/named_maps_entry'),
-        VarnishHttpCacheBackend = require('./cache/backend/varnish_http'),
-        varnishHttpCacheBackend = new VarnishHttpCacheBackend(
-            serverOptions.varnish_host,
-            serverOptions.varnish_http_port
-        ),
-        surrogateKeysCache = new SurrogateKeysCache(varnishHttpCacheBackend);
+    var surrogateKeysCacheBackends = [];
+
+    if (serverOptions.varnish_purge_enabled) {
+        surrogateKeysCacheBackends.push(
+            new VarnishHttpCacheBackend(serverOptions.varnish_host, serverOptions.varnish_http_port)
+        );
+    }
+
+    if (!!serverOptions.fastly.enabled && !!serverOptions.fastly.apiKey && !!serverOptions.fastly.serviceId) {
+        surrogateKeysCacheBackends.push(
+            new FastlyCacheBackend(serverOptions.fastly.apiKey, serverOptions.fastly.serviceId)
+        );
+    }
+
+    var surrogateKeysCache = new SurrogateKeysCache(surrogateKeysCacheBackends);

    function invalidateNamedMap (owner, templateName) {
+        var startTime = Date.now();
        surrogateKeysCache.invalidate(new NamedMapsCacheEntry(owner, templateName), function(err) {
+            var logMessage = JSON.stringify({
+                username: owner,
+                type: 'named_map_invalidation',
+                elapsed: Date.now() - startTime,
+                error: !!err ? JSON.stringify(err.message) : undefined
+            });
            if (err) {
-                console.warn('Cache: surrogate key invalidation failed');
+                console.warn(logMessage);
+            } else {
+                console.info(logMessage);
            }
        });
    }
-
-    if (serverOptions.varnish_purge_enabled) {
-        ['update', 'delete'].forEach(function(eventType) {
-            templateMaps.on(eventType, invalidateNamedMap);
-        });
-    }
+    ['update', 'delete'].forEach(function(eventType) {
+        templateMaps.on(eventType, invalidateNamedMap);
+    });

    // boot
    var ws = new Windshaft.Server(serverOptions);
@@ -72,6 +90,7 @@ var CartodbWindshaft = function(serverOptions) {
      '/version',
      // See https://github.com/CartoDB/Windshaft-cartodb/issues/176
      serverOptions.base_url_mapconfig,
+      serverOptions.base_url_mapconfig + '/static/named/:template_id/:width/:height.:format',
      template_baseurl,
      template_baseurl + '/:template_id',
      template_baseurl + '/:template_id/jsonp'
@@ -139,18 +158,30 @@ var CartodbWindshaft = function(serverOptions) {
     * Routing
     ******************************************************************************************************************/

-    var TemplateMapsController = require('./controllers/template_maps'),
-        templateMapsController = new TemplateMapsController(
+    var NamedMapsController = require('./controllers/named_maps'),
+        namedMapsController = new NamedMapsController(
            ws,
            serverOptions,
            templateMaps,
            cartoData,
            template_baseurl,
-            surrogateKeysCache,
-            NamedMapsCacheEntry,
-            serverOptions.pgConnection
+            surrogateKeysCache
        );
-    templateMapsController.register(ws);
+    namedMapsController.register(ws);
+
+    var TablesExtentApi = require('./api/tables_extent_api');
+    var tablesExtentApi = new TablesExtentApi(serverOptions.pgQueryRunner);
+
+    var NamedStaticMapsController = require('./controllers/named_static_maps');
+    var namedStaticMapsController = new NamedStaticMapsController(
+        ws,
+        serverOptions,
+        templateMaps,
+        ws.staticMapBackend,
+        surrogateKeysCache,
+        tablesExtentApi
+    );
+    namedStaticMapsController.register(ws);

    /*******************************************************************************************************************
     * END Routing
--- a/lib/cartodb/controllers/template_maps.js
+++ b/lib/cartodb/controllers/template_maps.js
@@ -1,24 +1,24 @@
 var step = require('step');
+var assert = require('assert');
 var _ = require('underscore');
+var templateName = require('../template_maps').templateName;
 var CdbRequest = require('../models/cdb_request');
+var NamedMapsCacheEntry = require('../cache/model/named_maps_entry');

-function TemplateMapsController(app, serverOptions, templateMaps, metadataBackend, templateBaseUrl, surrogateKeysCache,
-                                NamedMapsCacheEntry, pgConnection) {
+function NamedMapsController(app, serverOptions, templateMaps, metadataBackend, templateBaseUrl, surrogateKeysCache) {
    this.app = app;
    this.serverOptions = serverOptions;
    this.templateMaps = templateMaps;
    this.metadataBackend = metadataBackend;
    this.templateBaseUrl = templateBaseUrl;
    this.surrogateKeysCache = surrogateKeysCache;
-    this.NamedMapsCacheEntry = NamedMapsCacheEntry;
-    this.pgConnection = pgConnection;
 }

-module.exports = TemplateMapsController;
+module.exports = NamedMapsController;

 var cdbRequest = new CdbRequest();

-TemplateMapsController.prototype.register = function(app) {
+NamedMapsController.prototype.register = function(app) {
    app.get(this.templateBaseUrl + '/:template_id/jsonp', this.jsonp.bind(this));
    app.post(this.templateBaseUrl, this.create.bind(this));
    app.put(this.templateBaseUrl + '/:template_id', this.update.bind(this));
@@ -30,7 +30,7 @@ TemplateMapsController.prototype.register = function(app) {
 };

 // Add a template
-TemplateMapsController.prototype.create = function(req, res) {
+NamedMapsController.prototype.create = function(req, res) {
    var self = this;

    this.app.doCORS(res);
@@ -42,39 +42,22 @@ TemplateMapsController.prototype.create = function(req, res) {
            self.serverOptions.authorizedByAPIKey(req, this);
        },
        function addTemplate(err, authenticated) {
-            if ( err ) throw err;
-            if (authenticated !== 1) {
-                err = new Error("Only authenticated user can create templated maps");
-                err.http_status = 403;
-                throw err;
-            }
-            if ( ! req.headers['content-type'] || req.headers['content-type'].split(';')[0] != 'application/json' )
-                throw new Error('template POST data must be of type application/json');
+            assert.ifError(err);
+            ifUnauthenticated(authenticated, 'Only authenticated users can get template maps');
+            ifInvalidContentType(req, 'template POST data must be of type application/json');
            var cfg = req.body;
            self.templateMaps.addTemplate(cdbuser, cfg, this);
        },
        function prepareResponse(err, tpl_id){
-            if ( err ) throw err;
-            // NOTE: might omit "cdbuser" if == dbowner ...
-            return { template_id: cdbuser + '@' + tpl_id };
+            assert.ifError(err);
+            return { template_id: tpl_id };
        },
-        function finish(err, response){
-            if (err){
-                response = { error: ''+err };
-                var statusCode = 400;
-                if ( ! _.isUndefined(err.http_status) ) {
-                    statusCode = err.http_status;
-                }
-                self.app.sendError(res, response, statusCode, 'POST TEMPLATE', err);
-            } else {
-                self.app.sendResponse(res, [response, 200]);
-            }
-        }
+        finishFn(self.app, res, 'POST TEMPLATE')
    );
 };

 // Update a template
-TemplateMapsController.prototype.update = function(req, res) {
+NamedMapsController.prototype.update = function(req, res) {
    var self = this;

    this.app.doCORS(res);
@@ -87,47 +70,25 @@ TemplateMapsController.prototype.update = function(req, res) {
            self.serverOptions.authorizedByAPIKey(req, this);
        },
        function updateTemplate(err, authenticated) {
-            if ( err ) throw err;
-            if (authenticated !== 1) {
-                err = new Error("Only authenticated user can list templated maps");
-                err.http_status = 403;
-                throw err;
-            }
-            if ( ! req.headers['content-type'] || req.headers['content-type'].split(';')[0] != 'application/json' )
-                throw new Error('template PUT data must be of type application/json');
+            assert.ifError(err);
+            ifUnauthenticated(authenticated, 'Only authenticated user can update templated maps');
+            ifInvalidContentType(req, 'template PUT data must be of type application/json');
+
            template = req.body;
-            tpl_id = req.params.template_id.split('@');
-            if ( tpl_id.length > 1 ) {
-                if ( tpl_id[0] != cdbuser ) {
-                    err = new Error("Invalid template id '" + req.params.template_id + "' for user '" + cdbuser + "'");
-                    err.http_status = 404;
-                    throw err;
-                }
-                tpl_id = tpl_id[1];
-            }
+            tpl_id = templateName(req.params.template_id);
            self.templateMaps.updTemplate(cdbuser, tpl_id, template, this);
        },
        function prepareResponse(err){
-            if ( err ) throw err;
-            return { template_id: cdbuser + '@' + tpl_id };
+            assert.ifError(err);
+
+            return { template_id: tpl_id };
        },
-        function finish(err, response){
-            if (err){
-                var statusCode = 400;
-                response = { error: ''+err };
-                if ( ! _.isUndefined(err.http_status) ) {
-                    statusCode = err.http_status;
-                }
-                self.app.sendError(res, response, statusCode, 'PUT TEMPLATE', err);
-            } else {
-                self.app.sendResponse(res, [response, 200]);
-            }
-        }
+        finishFn(self.app, res, 'PUT TEMPLATE')
    );
 };

 // Get a specific template
-TemplateMapsController.prototype.retrieve = function(req, res) {
+NamedMapsController.prototype.retrieve = function(req, res) {
    var self = this;

    if (req.profiler) {
@@ -143,25 +104,13 @@ TemplateMapsController.prototype.retrieve = function(req, res) {
            self.serverOptions.authorizedByAPIKey(req, this);
        },
        function updateTemplate(err, authenticated) {
-            if ( err ) throw err;
-            if (authenticated !== 1) {
-                err = new Error("Only authenticated users can get template maps");
-                err.http_status = 403;
-                throw err;
-            }
-            tpl_id = req.params.template_id.split('@');
-            if ( tpl_id.length > 1 ) {
-                if ( tpl_id[0] != cdbuser ) {
-                    var templateNotFoundErr = new Error("Cannot get template id '" + req.params.template_id +
-                        "' for user '" + cdbuser + "'");
-                    templateNotFoundErr.http_status = 404;
-                    throw templateNotFoundErr;
-                }
-                tpl_id = tpl_id[1];
-            }
+            assert.ifError(err);
+            ifUnauthenticated(authenticated, 'Only authenticated users can get template maps');
+
+            tpl_id = templateName(req.params.template_id);
            self.templateMaps.getTemplate(cdbuser, tpl_id, this);
        },
-        function prepareResponse(err, tpl_val){
+        function prepareResponse(err, tpl_val) {
            if ( err ) throw err;
            if ( ! tpl_val ) {
                err = new Error("Cannot find template '" + tpl_id + "' of user '" + cdbuser + "'");
@@ -173,23 +122,12 @@ TemplateMapsController.prototype.retrieve = function(req, res) {
            delete tpl_val.auth_id;
            return { template: tpl_val };
        },
-        function finish(err, response){
-            if (err){
-                var statusCode = 400;
-                response = { error: ''+err };
-                if ( ! _.isUndefined(err.http_status) ) {
-                    statusCode = err.http_status;
-                }
-                self.app.sendError(res, response, statusCode, 'GET TEMPLATE', err);
-            } else {
-                self.app.sendResponse(res, [response, 200]);
-            }
-        }
+        finishFn(self.app, res, 'GET TEMPLATE')
    );
 };

 // Delete a specific template
-TemplateMapsController.prototype.destroy = function(req, res) {
+NamedMapsController.prototype.destroy = function(req, res) {
    var self = this;

    if (req.profiler) {
@@ -204,45 +142,22 @@ TemplateMapsController.prototype.destroy = function(req, res) {
            self.serverOptions.authorizedByAPIKey(req, this);
        },
        function updateTemplate(err, authenticated) {
-            if ( err ) throw err;
-            if (authenticated !== 1) {
-                err = new Error("Only authenticated users can delete template maps");
-                err.http_status = 403;
-                throw err;
-            }
-            tpl_id = req.params.template_id.split('@');
-            if ( tpl_id.length > 1 ) {
-                if ( tpl_id[0] != cdbuser ) {
-                    var templateNotFoundErr = new Error("Cannot find template id '" + req.params.template_id +
-                        "' for user '" + cdbuser + "'");
-                    templateNotFoundErr.http_status = 404;
-                    throw templateNotFoundErr;
-                }
-                tpl_id = tpl_id[1];
-            }
+            assert.ifError(err);
+            ifUnauthenticated(authenticated, 'Only authenticated users can delete template maps');
+
+            tpl_id = templateName(req.params.template_id);
            self.templateMaps.delTemplate(cdbuser, tpl_id, this);
        },
        function prepareResponse(err/*, tpl_val*/){
            if ( err ) throw err;
            return { status: 'ok' };
        },
-        function finish(err, response){
-            if (err){
-                var statusCode = 400;
-                response = { error: ''+err };
-                if ( ! _.isUndefined(err.http_status) ) {
-                    statusCode = err.http_status;
-                }
-                self.app.sendError(res, response, statusCode, 'DELETE TEMPLATE', err);
-            } else {
-                self.app.sendResponse(res, ['', 204]);
-            }
-        }
+        finishFn(self.app, res, 'DELETE TEMPLATE', ['', 204])
    );
 };

 // Get a list of owned templates
-TemplateMapsController.prototype.list = function(req, res) {
+NamedMapsController.prototype.list = function(req, res) {
    var self = this;
    if ( req.profiler ) {
        req.profiler.start('windshaft-cartodb.get_template_list');
@@ -256,36 +171,20 @@ TemplateMapsController.prototype.list = function(req, res) {
            self.serverOptions.authorizedByAPIKey(req, this);
        },
        function listTemplates(err, authenticated) {
-            if ( err ) throw err;
-            if (authenticated !== 1) {
-                err = new Error("Only authenticated user can list templated maps");
-                err.http_status = 403;
-                throw err;
-            }
+            assert.ifError(err);
+            ifUnauthenticated(authenticated, 'Only authenticated user can list templated maps');
+
            self.templateMaps.listTemplates(cdbuser, this);
        },
        function prepareResponse(err, tpl_ids){
-            if ( err ) throw err;
-            // NOTE: might omit "cbduser" if == dbowner ...
-            var ids = _.map(tpl_ids, function(id) { return cdbuser + '@' + id; });
-            return { template_ids: ids };
+            assert.ifError(err);
+            return { template_ids: tpl_ids };
        },
-        function finish(err, response){
-            var statusCode = 200;
-            if (err){
-                response = { error: ''+err };
-                if ( ! _.isUndefined(err.http_status) ) {
-                    statusCode = err.http_status;
-                }
-                self.app.sendError(res, response, statusCode, 'GET TEMPLATE LIST', err);
-            } else {
-                self.app.sendResponse(res, [response, statusCode]);
-            }
-        }
+        finishFn(self.app, res, 'GET TEMPLATE LIST')
    );
 };

-TemplateMapsController.prototype.instantiate = function(req, res) {
+NamedMapsController.prototype.instantiate = function(req, res) {
    var self = this;

    if (req.profiler) {
@@ -293,9 +192,8 @@ TemplateMapsController.prototype.instantiate = function(req, res) {
    }
    step(
        function() {
-            if ( ! req.headers['content-type'] || req.headers['content-type'].split(';')[0] != 'application/json') {
-                throw new Error('template POST data must be of type application/json, it is instead ');
-            }
+            ifInvalidContentType(req, 'template POST data must be of type application/json');
+
            self.instantiateTemplate(req, res, req.body, this);
        }, function(err, response) {
            self.finish_instantiation(err, response, res);
@@ -303,7 +201,7 @@ TemplateMapsController.prototype.instantiate = function(req, res) {
    );
 };

-TemplateMapsController.prototype.options = function(req, res, next) {
+NamedMapsController.prototype.options = function(req, res, next) {
    this.app.doCORS(res, "Content-Type");
    return next();
 };
@@ -312,7 +210,7 @@ TemplateMapsController.prototype.options = function(req, res, next) {
 * jsonp endpoint, allows to instantiate a template with a json call.
 * callback query argument is mandatory
 */
-TemplateMapsController.prototype.jsonp = function(req, res) {
+NamedMapsController.prototype.jsonp = function(req, res) {
    var self = this;

    if (req.profiler) {
@@ -340,7 +238,7 @@ TemplateMapsController.prototype.jsonp = function(req, res) {


 // Instantiate a template
-TemplateMapsController.prototype.instantiateTemplate = function(req, res, template_params, callback) {
+NamedMapsController.prototype.instantiateTemplate = function(req, res, template_params, callback) {
    var self = this;

    this.app.doCORS(res);
@@ -350,17 +248,7 @@ TemplateMapsController.prototype.instantiateTemplate = function(req, res, templa
    var fakereq; // used for call to createLayergroup
    var cdbuser = cdbRequest.userByReq(req);
    // Format of template_id: [<template_owner>]@<template_id>
-    var tpl_id = req.params.template_id.split('@');
-    if ( tpl_id.length > 1 ) {
-        if ( tpl_id[0] && tpl_id[0] != cdbuser ) {
-            var err = new Error('Cannot instanciate map of user "' + tpl_id[0] + '" on database of user "' + cdbuser +
-                '"');
-            err.http_status = 403;
-            callback(err);
-            return;
-        }
-        tpl_id = tpl_id[1];
-    }
+    var tpl_id = templateName(req.params.template_id);
    var auth_token = req.query.auth_token;
    step(
        function getTemplate(){
@@ -412,7 +300,7 @@ TemplateMapsController.prototype.instantiateTemplate = function(req, res, templa
                res: res,
                profiler: req.profiler
            };
-            self.setDBParams(cdbuser, fakereq.params, this);
+            self.serverOptions.setDBParams(cdbuser, fakereq.params, this);
        },
        function setApiKey(err){
            if ( req.profiler ) req.profiler.done('setDBParams');
@@ -427,23 +315,23 @@ TemplateMapsController.prototype.instantiateTemplate = function(req, res, templa
        },
        function prepareResponse(err, layergroup) {
            if ( err ) {
-                throw err;
+                return callback(err, { errors: [''+err] });
            }
            var tplhash = self.templateMaps.fingerPrint(template).substring(0,8);
            layergroup.layergroupid = cdbuser + '@' + tplhash + '@' + layergroup.layergroupid;
+            res.header('X-Layergroup-Id', layergroup.layergroupid);

-            self.surrogateKeysCache.tag(res, new self.NamedMapsCacheEntry(cdbuser, template.name));
+            self.surrogateKeysCache.tag(res, new NamedMapsCacheEntry(cdbuser, template.name));

-            return layergroup;
-        },
-        callback
+            callback(null, layergroup);
+        }
    );
 };

-TemplateMapsController.prototype.finish_instantiation = function(err, response, res) {
+NamedMapsController.prototype.finish_instantiation = function(err, response, res) {
    if (err) {
        var statusCode = 400;
-        response = { error: ''+err };
+        response = { errors: [''+err] };
        if ( ! _.isUndefined(err.http_status) ) {
            statusCode = err.http_status;
        }
@@ -453,18 +341,32 @@ TemplateMapsController.prototype.finish_instantiation = function(err, response,
    }
 };

-TemplateMapsController.prototype.setDBParams = function(cdbuser, params, callback) {
-    var self = this;
-    step(
-        function setAuth() {
-            self.pgConnection.setDBAuth(cdbuser, params, this);
-        },
-        function setConn(err) {
-            if ( err ) throw err;
-            self.pgConnection.setDBConn(cdbuser, params, this);
-        },
-        function finish(err) {
-            callback(err);
+function finishFn(app, res, description, okResponse) {
+    return function finish(err, response){
+        var statusCode = 200;
+        if (err) {
+            statusCode = 400;
+            response = { errors: ['' + err] };
+            if ( ! _.isUndefined(err.http_status) ) {
+                statusCode = err.http_status;
+            }
+            app.sendError(res, response, statusCode, description, err);
+        } else {
+            app.sendResponse(res, okResponse || [response, statusCode]);
        }
-    );
-};
+    };
+}
+
+function ifUnauthenticated(authenticated, description) {
+    if (authenticated !== 1) {
+        var err = new Error(description);
+        err.http_status = 403;
+        throw err;
+    }
+}
+
+function ifInvalidContentType(req, description) {
+    if ( ! req.headers['content-type'] || req.headers['content-type'].split(';')[0] != 'application/json' ) {
+        throw new Error(description);
+    }
+}
--- a/lib/cartodb/controllers/named_static_maps.js
+++ b/lib/cartodb/controllers/named_static_maps.js
@@ -0,0 +1,248 @@
+var step = require('step');
+var assert = require('assert');
+var templateName = require('../template_maps').templateName;
+var CdbRequest = require('../models/cdb_request');
+var NamedMapsCacheEntry = require('../cache/model/named_maps_entry');
+var _ = require('underscore');
+
+function NamedStaticMapsController(app, serverOptions, templateMaps, staticMapBackend, surrogateKeysCache,
+                                   tablesExtentApi) {
+    this.app = app;
+    this.serverOptions = serverOptions;
+    this.templateMaps = templateMaps;
+    this.staticMapBackend = staticMapBackend;
+    this.surrogateKeysCache = surrogateKeysCache;
+    this.tablesExtentApi = tablesExtentApi;
+}
+
+module.exports = NamedStaticMapsController;
+
+var cdbRequest = new CdbRequest();
+
+NamedStaticMapsController.prototype.register = function(app) {
+    app.get(app.base_url_mapconfig + '/static/named/:template_id/:width/:height.:format', this.named.bind(this));
+};
+
+NamedStaticMapsController.prototype.named = function(req, res) {
+    var self = this;
+
+    this.app.doCORS(res);
+    var cdbUser = cdbRequest.userByReq(req);
+
+    var format = req.params.format === 'jpg' ? 'jpeg' : 'png';
+
+    var template;
+    var layergroupConfig;
+    var layergroupId;
+    var fakeReq;
+    var cacheChannel;
+
+    step(
+        function reqParams() {
+            self.app.req2params(req, this);
+        },
+        function getTemplate(err) {
+            assert.ifError(err);
+            self.templateMaps.getTemplate(cdbUser, templateName(req.params.template_id), this);
+        },
+        function checkExists(err, tpl) {
+            assert.ifError(err);
+            if (!tpl) {
+                var notFoundErr = new Error(
+                        "Template '" + templateName(req.params.template_id) + "' of user '" + cdbUser + "' not found"
+                );
+                notFoundErr.http_status = 404;
+                throw notFoundErr;
+            }
+            return tpl;
+        },
+        function checkAuthorized(err, tpl) {
+            assert.ifError(err);
+
+            var authorized = false;
+            try {
+                authorized = self.templateMaps.isAuthorized(tpl, req.query.auth_token);
+            } catch (err) {
+                // we catch to add http_status
+                var authorizationFailedErr = new Error('Failed to authorize template');
+                authorizationFailedErr.http_status = 403;
+                throw authorizationFailedErr;
+            }
+            if ( ! authorized ) {
+                var unauthorizedErr = new Error('Unauthorized template instantiation');
+                unauthorizedErr.http_status = 403;
+                throw unauthorizedErr;
+            }
+
+            return tpl;
+        },
+        function prepareParams(err, tpl) {
+            assert.ifError(err);
+
+            template = tpl;
+
+            var templateParams = {};
+            if (req.query.config) {
+                try {
+                    templateParams = JSON.parse(req.query.config);
+                } catch (e) {
+                    throw new Error('malformed config parameter, should be a valid JSON');
+                }
+            }
+
+            return templateParams;
+        },
+        function instantiateTemplate(err, templateParams) {
+            assert.ifError(err);
+            return self.templateMaps.instance(template, templateParams);
+        },
+        function prepareLayergroup(err, layergroup) {
+            assert.ifError(err);
+            layergroupConfig = layergroup;
+            fakeReq = {
+                query: {},
+                params: {
+                    user: req.params.user
+                },
+                headers: _.clone(req.headers),
+                context: _.clone(req.context),
+                method: req.method,
+                res: res,
+                profiler: req.profiler
+            };
+            self.serverOptions.setDBParams(cdbUser, fakeReq.params, this);
+        },
+        function setApiKey(err){
+            assert.ifError(err);
+            self.app.createLayergroup(layergroupConfig, fakeReq, this);
+        },
+        function prepareResponse(err, layergroup) {
+            assert.ifError(err);
+
+            // added by createLayergroup
+            cacheChannel = res.header('X-Cache-Channel');
+            res.removeHeader('X-Cache-Channel');
+            self.surrogateKeysCache.tag(res, new NamedMapsCacheEntry(cdbUser, template.name));
+
+            layergroupId = layergroup.layergroupid.split(":")[0];
+
+            return null;
+        },
+        function staticImageOptions(err) {
+            assert.ifError(err);
+            getStaticImageOptions(template, this);
+        },
+        function estimateBounds(err, imageOpts) {
+            assert.ifError(err);
+            if (imageOpts) {
+                return imageOpts;
+            }
+
+            var defaultZoomCenter = {
+                zoom: 1,
+                center: {
+                    lng: 0,
+                    lat: 0
+                }
+            };
+
+            var dbTables = cacheChannel.split(':');
+            if (dbTables.length <= 1 || dbTables[1].length === 0) {
+                return defaultZoomCenter;
+            }
+
+            var tableNames = dbTables[1].split(',');
+            if (tableNames.length === 0) {
+                return defaultZoomCenter;
+            }
+
+            var next = this;
+            self.tablesExtentApi.getBounds(cdbUser, tableNames, function(err, result) {
+                next(null, result || defaultZoomCenter);
+            });
+        },
+        function getImage(err, imageOpts) {
+            assert.ifError(err);
+
+            var staticImageReq = {
+                headers: _.clone(fakeReq.headers),
+                params: _.extend(_.clone(fakeReq.params), {
+                    token: layergroupId,
+                    format: req.params.format
+                })
+            };
+
+            var width = +req.params.width;
+            var height = +req.params.height;
+
+            if (!_.isUndefined(imageOpts.zoom) && imageOpts.center) {
+                self.staticMapBackend.getImage(staticImageReq, width, height, imageOpts.zoom, imageOpts.center, this);
+            } else {
+                self.staticMapBackend.getImage(staticImageReq, width, height, imageOpts.bounds, this);
+            }
+        },
+        function handleImage(err, image, headers, stats) {
+            if (req.profiler) {
+                req.profiler.done('render-' + format);
+                req.profiler.add(stats || {});
+            }
+
+            if (err) {
+                if (!err.error) {
+                    err.error = err.message;
+                }
+                self.app.sendError(res, err, self.app.findStatusCode(err), 'STATIC_VIZ_MAP', err);
+            } else {
+                res.setHeader('Content-Type', headers['Content-Type'] || 'image/' + format);
+                res.setHeader('Cache-Control', 'public,max-age=7200,must-revalidate');
+                self.app.sendResponse(res, [image, 200]);
+            }
+        }
+    );
+};
+
+function getStaticImageOptions(template, callback) {
+    if (template.view) {
+        var zoomCenter = templateZoomCenter(template.view);
+        if (zoomCenter) {
+            return callback(null, zoomCenter);
+        }
+
+        var bounds = templateBounds(template.view);
+        if (bounds) {
+            return callback(null, bounds);
+        }
+    }
+    return callback(null, null);
+}
+
+function templateZoomCenter(view) {
+    if (!_.isUndefined(view.zoom) && view.center) {
+        return {
+            zoom: view.zoom,
+            center: view.center
+        };
+    }
+    return false;
+}
+
+function templateBounds(view) {
+    if (view.bounds) {
+        var hasAllBounds = _.every(['west', 'south', 'east', 'north'], function(prop) {
+            return !!view.bounds[prop];
+        });
+        if (hasAllBounds) {
+            return {
+                bounds: {
+                    west: view.bounds.west,
+                    south: view.bounds.south,
+                    east: view.bounds.east,
+                    north: view.bounds.north
+                }
+            };
+        } else {
+            return false;
+        }
+    }
+    return false;
+}
--- a/lib/cartodb/server_options.js
+++ b/lib/cartodb/server_options.js
@@ -5,6 +5,7 @@ var assert = require('assert');
 var RedisPool = require('redis-mpool');

 var QueryTablesApi = require('./api/query_tables_api');
+var PgQueryRunner = require('./backends/pg_query_runner');
 var PgConnection = require('./backends/pg_connection');
 var TemplateMaps = require('./template_maps.js');
 var MapConfigNamedLayersAdapter = require('./models/mapconfig_named_layers_adapter');
@@ -25,11 +26,12 @@ var REQUEST_QUERY_PARAMS_WHITELIST = [
 module.exports = function(redisPool) {
    redisPool = redisPool || new RedisPool(_.extend(global.environment.redis, {name: 'windshaft:server_options'}));

-    var cartoData = require('cartodb-redis')({ pool: redisPool }),
-        lzmaWorker = new LZMA(),
-        pgConnection = new PgConnection(cartoData),
-        queryTablesApi = new QueryTablesApi(pgConnection, cartoData),
-        cdbRequest = new CdbRequest();
+    var cartoData = require('cartodb-redis')({ pool: redisPool });
+    var lzmaWorker = new LZMA();
+    var pgConnection = new PgConnection(cartoData);
+    var pgQueryRunner = new PgQueryRunner(pgConnection);
+    var queryTablesApi = new QueryTablesApi(pgQueryRunner);
+    var cdbRequest = new CdbRequest();

    var rendererConfig = _.defaults(global.environment.renderer || {}, {
        cache_ttl: 60000, // milliseconds
@@ -86,6 +88,7 @@ module.exports = function(redisPool) {
        varnish_http_port: global.environment.varnish.http_port,
        varnish_secret: global.environment.varnish.secret,
        varnish_purge_enabled: global.environment.varnish.purge_enabled,
+        fastly: global.environment.fastly || {},
        cache_enabled: global.environment.cache_enabled,
        log_format: global.environment.log_format,
        useProfiler: global.environment.useProfiler
@@ -100,6 +103,8 @@ module.exports = function(redisPool) {

    // Re-use pgConnection
    me.pgConnection = pgConnection;
+    // Re-use pgQueryRunner
+    me.pgQueryRunner = pgQueryRunner;

    var templateMaps = new TemplateMaps(redisPool, {
        max_user_templates: global.environment.maxUserTemplates
@@ -357,17 +362,22 @@ module.exports = function(redisPool) {
                var cacheChannel = me.buildCacheChannel(dbName, result.affectedTables);
                me.channelCache[cacheKey] = cacheChannel;

-                if (req.res && req.method == 'GET') {
-                    var res = req.res;
-                    var ttl = global.environment.varnish.layergroupTtl || 86400;
-                    res.header('Cache-Control', 'public,max-age='+ttl+',must-revalidate');
-                    res.header('Last-Modified', (new Date()).toUTCString());
-                    res.header('X-Cache-Channel', cacheChannel);
-                }
-
                // last update for layergroup cache buster
                response.layergroupid = response.layergroupid + ':' + result.lastUpdatedTime;
                response.last_updated = new Date(result.lastUpdatedTime).toISOString();
+
+                var res = req.res;
+                if (res) {
+                    if (req.method === 'GET') {
+                        var ttl = global.environment.varnish.layergroupTtl || 86400;
+                        res.header('Cache-Control', 'public,max-age='+ttl+',must-revalidate');
+                        res.header('Last-Modified', (new Date()).toUTCString());
+                        res.header('X-Cache-Channel', cacheChannel);
+                    }
+
+                    res.header('X-Layergroup-Id', response.layergroupid);
+                }
+
                return null;
            },
            function finish(err) {
@@ -400,7 +410,9 @@ module.exports = function(redisPool) {
        }

        mapStore.load(layergroup_id, function(err, mapConfig) {
-            assert.ifError(err);
+            if (err) {
+                return callback(err);
+            }

            var authorized = me.templateMaps.isAuthorized(mapConfig.obj().template, auth_token);

@@ -475,7 +487,9 @@ module.exports = function(redisPool) {
                });
            },
            function checkSignAuthorized(err, signed_by){
-                assert.ifError(err);
+                if (err) {
+                    return callback(err);
+                }

                if ( ! signed_by ) {
                  // request not authorized by signer.
@@ -503,6 +517,21 @@ module.exports = function(redisPool) {
        );
    };

+    me.setDBParams = function(cdbuser, params, callback) {
+        step(
+            function setAuth() {
+                pgConnection.setDBAuth(cdbuser, params, this);
+            },
+            function setConn(err) {
+                if ( err ) throw err;
+                pgConnection.setDBConn(cdbuser, params, this);
+            },
+            function finish(err) {
+                callback(err);
+            }
+        );
+    };
+
    // jshint maxcomplexity:10
    /**
     * Whitelist input and get database name & default geometry type from
--- a/lib/cartodb/template_maps.js
+++ b/lib/cartodb/template_maps.js
@@ -88,7 +88,8 @@ o._redisCmd = function(redisFunc, redisArgs, callback) {
  );
 };

-var _reValidIdentifier = /^[a-zA-Z][0-9a-zA-Z_]*$/;
+var _reValidNameIdentifier = /^[a-z0-9][0-9a-z_\-]*$/i;
+var _reValidPlaceholderIdentifier = /^[a-z][0-9a-z_]*$/i;
 // jshint maxcomplexity:15
 o._checkInvalidTemplate = function(template) {
  if ( template.version != '0.0.1' ) {
@@ -98,7 +99,7 @@ o._checkInvalidTemplate = function(template) {
  if ( ! tplname ) {
    return new Error("Missing template name");
  }
-  if ( ! tplname.match(_reValidIdentifier) ) {
+  if ( ! tplname.match(_reValidNameIdentifier) ) {
    return new Error("Invalid characters in template name '" + tplname + "'");
  }

@@ -113,7 +114,7 @@ o._checkInvalidTemplate = function(template) {
  for (var i = 0, len = placeholderKeys.length; i < len; i++) {
      var placeholderKey = placeholderKeys[i];

-      if (!placeholderKey.match(_reValidIdentifier)) {
+      if (!placeholderKey.match(_reValidPlaceholderIdentifier)) {
          return new Error("Invalid characters in placeholder name '" + placeholderKey + "'");
      }
      if ( ! placeholders[placeholderKey].hasOwnProperty('default') ) {
@@ -492,3 +493,14 @@ o.fingerPrint = function(template) {
    .digest('hex')
  ;
 };
+
+module.exports.templateName = function templateName(templateId) {
+    var templateIdTokens = templateId.split('@');
+    var name = templateIdTokens[0];
+
+    if (templateIdTokens.length > 1) {
+        name = templateIdTokens[1];
+    }
+
+    return name;
+};
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
    "private": true,
    "name": "windshaft-cartodb",
-    "version": "2.1.2",
+    "version": "2.9.0",
    "description": "A map tile server for CartoDB",
    "keywords": [
      "cartodb"
@@ -24,13 +24,14 @@
    "dependencies": {
        "underscore"  : "~1.6.0",
        "dot": "~1.0.2",
-        "windshaft": "0.42.1",
+        "windshaft": "0.48.0",
        "step": "~0.0.5",
        "queue-async": "~1.0.7",
        "request": "~2.9.203",
-        "cartodb-redis": "~0.12.1",
+        "cartodb-redis": "~0.13.0",
        "cartodb-psql": "~0.4.0",
-        "redis-mpool": "~0.3.0",
+        "fastly-purge": "~1.0.0",
+        "redis-mpool": "~0.4.0",
        "lzma": "~1.3.7",
        "log4js": "https://github.com/CartoDB/log4js-node/tarball/cdb"
    },
--- a/test/acceptance/cache/surrogate_keys_invalidation.js
+++ b/test/acceptance/cache/surrogate_keys_invalidation.js
@@ -3,6 +3,7 @@ require(__dirname + '/../../support/test_helper');
 var assert      = require('../../support/assert');
 var redis       = require('redis');
 var step        = require('step');
+var FastlyPurge = require('fastly-purge');

 var NamedMapsCacheEntry = require(__dirname + '/../../../lib/cartodb/cache/model/named_maps_entry');
 var CartodbWindshaft = require(__dirname + '/../../../lib/cartodb/cartodb_windshaft');
@@ -18,12 +19,23 @@ describe('templates surrogate keys', function() {
    var varnishPurgeEnabled = global.environment.varnish.purge_enabled;
    global.environment.varnish.purge_enabled = true;

+    var fastlyConfig = global.environment.fastly;
+    var FAKE_FASTLY_API_KEY = 'fastly-api-key';
+    var FAKE_FASTLY_SERVICE_ID = 'fake-service-id';
+    global.environment.fastly = {
+        enabled: true,
+        // the fastly api key
+        apiKey: FAKE_FASTLY_API_KEY,
+        // the service that will get surrogate key invalidation
+        serviceId: FAKE_FASTLY_SERVICE_ID
+    };
+
    var serverOptions = require('../../../lib/cartodb/server_options')();
    var server = new CartodbWindshaft(serverOptions);

    var templateOwner = 'localhost',
        templateName = 'acceptance',
-        expectedTemplateId = templateOwner + '@' + templateName,
+        expectedTemplateId = templateName,
        template = {
            version: '0.0.1',
            name: templateName,
@@ -51,6 +63,7 @@ describe('templates surrogate keys', function() {

    var cacheEntryKey = new NamedMapsCacheEntry(templateOwner, templateName).key();
    var invalidationMatchHeader = '\\b' + cacheEntryKey + '\\b';
+    var fastlyPurgePath = '/service/' + FAKE_FASTLY_SERVICE_ID + '/purge/' + encodeURIComponent(cacheEntryKey);

    var nock = require('nock');
    nock.enableNetConnect(/(127.0.0.1:5555|cartocdn.com)/);
@@ -60,6 +73,8 @@ describe('templates surrogate keys', function() {
        global.environment.varnish.host = varnishHost;
        global.environment.varnish.purge_enabled = varnishPurgeEnabled;

+        global.environment.fastly = fastlyConfig;
+
        nock.restore();
        done();
    });
@@ -109,6 +124,15 @@ describe('templates surrogate keys', function() {
            .matchHeader('Invalidation-Match', invalidationMatchHeader)
            .reply(204, '');

+        var fastlyScope = nock(FastlyPurge.FASTLY_API_ENDPOINT)
+            .post(fastlyPurgePath)
+            .matchHeader('Fastly-Key', FAKE_FASTLY_API_KEY)
+            .matchHeader('Fastly-Soft-Purge', 1)
+            .matchHeader('Accept', 'application/json')
+            .reply(200, {
+                status:'ok'
+            });
+
        step(
            function createTemplateToUpdate() {
                createTemplate(this);
@@ -145,6 +169,7 @@ describe('templates surrogate keys', function() {
                assert.deepEqual(parsedBody, expectedBody);

                assert.equal(scope.pendingMocks().length, 0);
+                assert.equal(fastlyScope.pendingMocks().length, 0);

                return null;
            },
@@ -171,6 +196,15 @@ describe('templates surrogate keys', function() {
            .matchHeader('Invalidation-Match', invalidationMatchHeader)
            .reply(204, '');

+        var fastlyScope = nock(FastlyPurge.FASTLY_API_ENDPOINT)
+            .post(fastlyPurgePath)
+            .matchHeader('Fastly-Key', FAKE_FASTLY_API_KEY)
+            .matchHeader('Fastly-Soft-Purge', 1)
+            .matchHeader('Accept', 'application/json')
+            .reply(200, {
+                status:'ok'
+            });
+
        step(
            function createTemplateToDelete() {
                createTemplate(this);
@@ -204,6 +238,7 @@ describe('templates surrogate keys', function() {
                }

                assert.equal(scope.pendingMocks().length, 0);
+                assert.equal(fastlyScope.pendingMocks().length, 0);

                return null;
            },
--- a/test/acceptance/health_check.js
+++ b/test/acceptance/health_check.js
@@ -1,4 +1,4 @@
-var helper = require(__dirname + '/../support/test_helper');
+require(__dirname + '/../support/test_helper');

 var assert      = require('../support/assert');
 var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/cartodb_windshaft');
@@ -10,7 +10,7 @@ var tilelive = {};
 var HealthCheck = require('../../lib/cartodb/monitoring/health_check');
 var healthCheck = new HealthCheck(metadataBackend, tilelive);

-suite('health checks', function () {
+describe('health checks', function () {

    function resetHealthConfig() {
        global.environment.health = {
@@ -30,7 +30,7 @@ suite('health checks', function () {
        }
    };

-    test('returns 200 and ok=true with enabled configuration', function (done) {
+    it('returns 200 and ok=true with enabled configuration', function (done) {
        resetHealthConfig();

        assert.response(server,
@@ -51,15 +51,15 @@ suite('health checks', function () {
        );
    });

-    test('error if disabled file exists', function(done) {
+    it('error if disabled file exists', function(done) {
      var fs = require('fs');

-      var readFileFn = fs.readFile
+      var readFileFn = fs.readFile;
      fs.readFile = function(filename, callback) {
        callback(null, "Maintenance");
-      }   
+      };
      
-      healthCheck.check(null, function(err, result) {
+      healthCheck.check(null, function(err/*, result*/) {
        assert.equal(err.message, "Maintenance");
        assert.equal(err.http_status, 503);
        done();
@@ -68,7 +68,7 @@ suite('health checks', function () {
      
    }); 

-    test('not err if disabled file does not exists', function(done) {
+    it('not err if disabled file does not exists', function(done) {
      resetHealthConfig();

      global.environment.disabled_file = '/tmp/ftreftrgtrccre';
--- a/test/acceptance/limits.js
+++ b/test/acceptance/limits.js
@@ -174,7 +174,7 @@ describe('render limits', function() {
                            },
                            function(res) {
                                var parsed = JSON.parse(res.body);
-                                assert.deepEqual(parsed, { error: 'Render timed out' });
+                                assert.deepEqual(parsed, { errors: ['Render timed out'] });
                                done();
                            }
                        );
--- a/test/acceptance/multilayer.js
+++ b/test/acceptance/multilayer.js
@@ -69,6 +69,7 @@ suite(suiteName, function() {
              assert.equal(parsedBody.last_updated, expected_last_updated);
              if ( expected_token ) {
                assert.equal(parsedBody.layergroupid, expected_token + ':' + expected_last_updated_epoch);
+                assert.equal(res.headers['x-layergroup-id'], parsedBody.layergroupid);
              }
              else expected_token = parsedBody.layergroupid.split(':')[0];
              next(null, res);
@@ -131,7 +132,7 @@ suite(suiteName, function() {
          }, {}, function(res) {
              assert.equal(res.statusCode, 403, res.statusCode + ':' + res.body);
              var parsed = JSON.parse(res.body);
-              var msg = parsed.error; // TODO: should it be "errors" ?
+              var msg = parsed.errors[0];
              assert.ok(msg.match(/permission denied/i), msg);
              next(err);
          });
@@ -1011,6 +1012,7 @@ suite(suiteName, function() {
              var parsedBody = JSON.parse(res.body);
              if ( expected_token ) {
                assert.equal(parsedBody.layergroupid, expected_token + ':' + expected_last_updated_epoch);
+                assert.equal(res.headers['x-layergroup-id'], parsedBody.layergroupid);
              }
              else {
                var token_components = parsedBody.layergroupid.split(':');
@@ -1091,6 +1093,7 @@ suite(suiteName, function() {
          var parsedBody = JSON.parse(res.body);
          if ( expected_token ) {
            assert.equal(parsedBody.layergroupid, expected_token + ':' + expected_last_updated_epoch);
+            assert.equal(res.headers['x-layergroup-id'], parsedBody.layergroupid);
          }
          else {
            var token_components = parsedBody.layergroupid.split(':');
--- a/test/acceptance/multilayer_server.js
+++ b/test/acceptance/multilayer_server.js
@@ -6,7 +6,7 @@ var redis = require('redis');
 var _ = require('underscore');


-var QueryTablesApi = require('../../lib/cartodb/api/query_tables_api');
+var PgQueryRunner = require('../../lib/cartodb/backends/pg_query_runner');
 var CartodbWindshaft = require('../../lib/cartodb/cartodb_windshaft');
 var serverOptions = require('../../lib/cartodb/server_options')();
 var server = new CartodbWindshaft(serverOptions);
@@ -108,6 +108,7 @@ describe('tests from old api translated to multilayer', function() {
            function(res) {
                var parsed = JSON.parse(res.body);
                assert.ok(parsed.layergroupid);
+                assert.equal(res.headers['x-layergroup-id'], parsed.layergroupid);
                done();
            }
        );
@@ -128,6 +129,7 @@ describe('tests from old api translated to multilayer', function() {
            function(res) {
                var parsed = JSON.parse(res.body);
                assert.ok(parsed.layergroupid);
+                assert.equal(res.headers['x-layergroup-id'], parsed.layergroupid);

                global.environment.postgres.host = backupDBHost;
                done();
@@ -150,6 +152,7 @@ describe('tests from old api translated to multilayer', function() {
            function(res) {
                var parsed = JSON.parse(res.body);
                assert.ok(parsed.layergroupid);
+                assert.equal(res.headers['x-layergroup-id'], parsed.layergroupid);

                global.environment.postgres_auth_pass = backupDBPass;
                done();
@@ -246,6 +249,43 @@ describe('tests from old api translated to multilayer', function() {
                assert.ok(res.headers.hasOwnProperty('x-cache-channel'));
                assert.equal(res.headers['x-cache-channel'], expectedCacheChannel);

+                assert.equal(res.headers['x-layergroup-id'], parsed.layergroupid);
+
+                done();
+            }
+        );
+    });
+
+    // https://github.com/CartoDB/cartodb-postgresql/issues/86
+    it.skip("should not fail with long table names because table name length limit",  function(done) {
+        var tableName = 'long_table_name_with_enough_chars_to_break_querytables_function';
+        var expectedCacheChannel = _.template('<%= databaseName %>:public.<%= tableName %>', {
+            databaseName: _.template(global.environment.postgres_auth_user, {user_id:1}) + '_db',
+            tableName: tableName
+        });
+
+        var layergroup =  singleLayergroupConfig('select * from ' + tableName, '#layer { marker-fill: red; }');
+
+        assert.response(server,
+            {
+                url: layergroupUrl + '?config=' + encodeURIComponent(JSON.stringify(layergroup)),
+                method: 'GET',
+                headers: {
+                    host: 'localhost'
+                }
+            },
+            {
+                status: 200
+            },
+            function(res) {
+                var parsed = JSON.parse(res.body);
+                assert.ok(parsed.layergroupid);
+
+                assert.ok(res.headers.hasOwnProperty('x-cache-channel'));
+                assert.equal(res.headers['x-cache-channel'], expectedCacheChannel);
+
+                assert.equal(res.headers['x-layergroup-id'], parsed.layergroupid);
+
                done();
            }
        );
@@ -253,8 +293,8 @@ describe('tests from old api translated to multilayer', function() {

    it("creates layergroup fails when postgresql queries fail to figure affected tables in query",  function(done) {

-        var runQueryFn = QueryTablesApi.prototype.runQuery;
-        QueryTablesApi.prototype.runQuery = function(username, query, queryHandler, callback) {
+        var runQueryFn = PgQueryRunner.prototype.run;
+        PgQueryRunner.prototype.run = function(username, query, queryHandler, callback) {
            return queryHandler(new Error('fake error message'), [], callback);
        };

@@ -272,7 +312,7 @@ describe('tests from old api translated to multilayer', function() {
                status: 400
            },
            function(res) {
-                QueryTablesApi.prototype.runQuery = runQueryFn;
+                PgQueryRunner.prototype.run = runQueryFn;

                assert.ok(!res.headers.hasOwnProperty('x-cache-channel'));

@@ -300,8 +340,8 @@ describe('tests from old api translated to multilayer', function() {
                status: 200
            },
            function(res) {
-                var runQueryFn = QueryTablesApi.prototype.runQuery;
-                QueryTablesApi.prototype.runQuery = function(username, query, queryHandler, callback) {
+                var runQueryFn = PgQueryRunner.prototype.run;
+                PgQueryRunner.prototype.run = function(username, query, queryHandler, callback) {
                    return queryHandler(new Error('failed to query database for affected tables'), [], callback);
                };

@@ -327,7 +367,7 @@ describe('tests from old api translated to multilayer', function() {
                    },
                    function(res) {
                        assert.ok(!res.headers.hasOwnProperty('x-cache-channel'));
-                        QueryTablesApi.prototype.runQuery = runQueryFn;
+                        PgQueryRunner.prototype.run = runQueryFn;
                        done();
                    }
                );
--- a/test/acceptance/named_layers.js
+++ b/test/acceptance/named_layers.js
@@ -8,12 +8,11 @@ var server = new CartodbWindshaft(serverOptions);
 var RedisPool = require('redis-mpool');
 var TemplateMaps = require('../../lib/cartodb/template_maps.js');

-var Step = require('step');
-var _ = require('underscore');
+var step = require('step');

-suite('named_layers', function() {
+describe('named_layers', function() {
    // configure redis pool instance to use in tests
-    var redisPool = RedisPool(global.environment.redis);
+    var redisPool = new RedisPool(global.environment.redis);

    var templateMaps = new TemplateMaps(redisPool, {
        max_user_templates: global.environment.maxUserTemplates
@@ -45,6 +44,7 @@ suite('named_layers', function() {
        },
        layergroup: {
            layers: [
+                wadusLayer,
                wadusLayer
            ]
        }
@@ -95,7 +95,7 @@ suite('named_layers', function() {
        }
    };

-    suiteSetup(function(done) {
+    before(function(done) {
        global.environment.enabledFeatures = {cdbQueryTablesFromPostgres: true};
        templateMaps.addTemplate(username, nestedNamedMapTemplate, function(err) {
            if (err) {
@@ -112,7 +112,7 @@ suite('named_layers', function() {
        });
    });

-    test('should fail for non-existing template name', function(done) {
+    it('should fail for non-existing template name', function(done) {
        var layergroup =  {
            version: '1.3.0',
            layers: [
@@ -125,7 +125,7 @@ suite('named_layers', function() {
            ]
        };

-        Step(
+        step(
            function createLayergroup() {
                var next = this;
                assert.response(server,
@@ -162,7 +162,7 @@ suite('named_layers', function() {
        );
    });

-    test('should return 403 if not properly authorized', function(done) {
+    it('should return 403 if not properly authorized', function(done) {

        var layergroup =  {
            version: '1.3.0',
@@ -178,7 +178,7 @@ suite('named_layers', function() {
            ]
        };

-        Step(
+        step(
            function createLayergroup() {
                var next = this;
                assert.response(server,
@@ -219,7 +219,7 @@ suite('named_layers', function() {

    });

-    test('should return 200 and layergroup if properly authorized', function(done) {
+    it('should return 200 and layergroup if properly authorized', function(done) {

        var layergroup =  {
            version: '1.3.0',
@@ -235,7 +235,7 @@ suite('named_layers', function() {
            ]
        };

-        Step(
+        step(
            function createLayergroup() {
                var next = this;
                assert.response(server,
@@ -274,7 +274,7 @@ suite('named_layers', function() {

    });

-    test('should return 400 for nested named map layers', function(done) {
+    it('should return 400 for nested named map layers', function(done) {

        var layergroup =  {
            version: '1.3.0',
@@ -288,7 +288,7 @@ suite('named_layers', function() {
            ]
        };

-        Step(
+        step(
            function createLayergroup() {
                var next = this;
                assert.response(server,
@@ -326,7 +326,7 @@ suite('named_layers', function() {

    });

-    test('should return 200 and layergroup with private tables', function(done) {
+    it('should return 200 and layergroup with private tables', function(done) {

        var privateTableTemplateName = 'private_table_template';
        var privateTableTemplate = {
@@ -361,7 +361,7 @@ suite('named_layers', function() {
            ]
        };

-        Step(
+        step(
            function createTemplate() {
                templateMaps.addTemplate(username, privateTableTemplate, this);
            },
@@ -447,7 +447,7 @@ suite('named_layers', function() {

    });

-    test('should return 200 and layergroup with private tables and interactivity', function(done) {
+    it('should return 200 and layergroup with private tables and interactivity', function(done) {

        var privateTableTemplateNameInteractivity = 'private_table_template_interactivity';
        var privateTableTemplate = {
@@ -489,7 +489,7 @@ suite('named_layers', function() {
            ]
        };

-        Step(
+        step(
            function createTemplate() {
                templateMaps.addTemplate(username, privateTableTemplate, this);
            },
@@ -575,7 +575,7 @@ suite('named_layers', function() {

    });

-    test('should return 403 when private table is accessed from non named layer', function(done) {
+    it('should return 403 when private table is accessed from non named layer', function(done) {

        var layergroup =  {
            version: '1.3.0',
@@ -597,7 +597,7 @@ suite('named_layers', function() {
            ]
        };

-        Step(
+        step(
            function createLayergroup() {
                var next = this;
                assert.response(server,
@@ -635,8 +635,90 @@ suite('named_layers', function() {

    });

+    it('should return metadata for named layers', function(done) {

-    suiteTeardown(function(done) {
+        var layergroup =  {
+            version: '1.3.0',
+            layers: [
+                {
+                    type: 'plain',
+                    options: {
+                        color: '#fabada'
+                    }
+                },
+                {
+                    type: 'cartodb',
+                    options: {
+                        sql: 'select * from test_table',
+                        cartocss: '#layer { marker-fill: #cc3300; }',
+                        cartocss_version: '2.3.0'
+                    }
+                },
+                {
+                    type: 'named',
+                    options: {
+                        name: templateName
+                    }
+                },
+                {
+                    type: 'torque',
+                    options: {
+                        sql: "select * from test_table LIMIT 0",
+                        cartocss: "Map { -torque-frame-count:1; -torque-resolution:1; " +
+                        "-torque-aggregation-function:'count(*)'; -torque-time-attribute:'updated_at'; }"
+                    }
+                }
+            ]
+        };
+
+        step(
+            function createLayergroup() {
+                var next = this;
+                assert.response(server,
+                    {
+                        url: '/api/v1/map',
+                        method: 'POST',
+                        headers: {
+                            host: 'localhost',
+                            'Content-Type': 'application/json'
+                        },
+                        data: JSON.stringify(layergroup)
+                    },
+                    {
+                        status: 200
+                    },
+                    function(res, err) {
+                        next(err, res);
+                    }
+                );
+            },
+            function checkLayergroup(err, response) {
+                if (err) {
+                    throw err;
+                }
+
+                var parsedBody = JSON.parse(response.body);
+                assert.ok(parsedBody.metadata);
+                assert.ok(parsedBody.metadata.layers);
+                assert.equal(parsedBody.metadata.layers.length, 5);
+                assert.equal(parsedBody.metadata.layers[0].type, 'plain');
+                assert.equal(parsedBody.metadata.layers[1].type, 'mapnik');
+                assert.equal(parsedBody.metadata.layers[2].type, 'mapnik');
+                assert.equal(parsedBody.metadata.layers[3].type, 'mapnik');
+                assert.equal(parsedBody.metadata.layers[4].type, 'torque');
+
+                return null;
+            },
+            function finish(err) {
+                done(err);
+            }
+        );
+
+    });
+
+
+
+    after(function(done) {
        global.environment.enabledFeatures = {cdbQueryTablesFromPostgres: false};
        templateMaps.delTemplate(username, nestedNamedMapTemplateName, function(err) {
            if (err) {
--- a/test/acceptance/named_static_maps.js
+++ b/test/acceptance/named_static_maps.js
@@ -0,0 +1,189 @@
+var test_helper = require('../support/test_helper');
+var RedisPool = require('redis-mpool');
+var querystring = require('querystring');
+
+var assert = require('../support/assert');
+var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/cartodb_windshaft');
+var serverOptions = require(__dirname + '/../../lib/cartodb/server_options')();
+var server = new CartodbWindshaft(serverOptions);
+var TemplateMaps = require('../../lib/cartodb/template_maps.js');
+var NamedMapsCacheEntry = require('../../lib/cartodb/cache/model/named_maps_entry');
+
+describe('named static maps', function() {
+    // configure redis pool instance to use in tests
+    var redisPool = new RedisPool(global.environment.redis);
+
+    var templateMaps = new TemplateMaps(redisPool, {
+        max_user_templates: global.environment.maxUserTemplates
+    });
+
+    var wadusLayer = {
+        type: 'cartodb',
+        options: {
+            sql: 'select 1 cartodb_id, null::geometry the_geom_webmercator',
+            cartocss: '#layer { marker-fill: <%= color %>; }',
+            cartocss_version: '2.3.0'
+        }
+    };
+
+    var username = 'localhost';
+
+    var templateName = 'valid_template';
+    var template = {
+        version: '0.0.1',
+        name: templateName,
+        auth: {
+            method: 'open'
+        },
+        "placeholders": {
+            "color": {
+                "type": "css_color",
+                "default": "#cc3300"
+            }
+        },
+        layergroup: {
+            layers: [
+                wadusLayer
+            ]
+        }
+    };
+
+    var tokenAuthTemplateName = 'auth_valid_template';
+    var tokenAuthTemplate = {
+        version: '0.0.1',
+        name: tokenAuthTemplateName,
+        auth: {
+            method: 'token',
+            valid_tokens: ['valid1', 'valid2']
+        },
+        placeholders: {
+            color: {
+                "type": "css_color",
+                "default": "#cc3300"
+            }
+        },
+        layergroup: {
+            layers: [
+                wadusLayer
+            ]
+        }
+    };
+
+
+    var namedMapLayer = {
+        type: 'named',
+        options: {
+            name: templateName,
+            config: {},
+            auth_tokens: []
+        }
+    };
+
+    var nestedNamedMapTemplateName = 'nested_template';
+    var nestedNamedMapTemplate = {
+        version: '0.0.1',
+        name: nestedNamedMapTemplateName,
+        auth: {
+            method: 'open'
+        },
+        layergroup: {
+            layers: [
+                namedMapLayer
+            ]
+        }
+    };
+
+    before(function (done) {
+        templateMaps.addTemplate(username, nestedNamedMapTemplate, function (err) {
+            if (err) {
+                return done(err);
+            }
+            templateMaps.addTemplate(username, tokenAuthTemplate, function (err) {
+                if (err) {
+                    return done(err);
+                }
+                templateMaps.addTemplate(username, template, function (err) {
+                    return done(err);
+                });
+            });
+        });
+    });
+
+    after(function (done) {
+        templateMaps.delTemplate(username, nestedNamedMapTemplateName, function (err) {
+            if (err) {
+                return done(err);
+            }
+            templateMaps.delTemplate(username, tokenAuthTemplateName, function (err) {
+                if (err) {
+                    return done(err);
+                }
+                templateMaps.delTemplate(username, templateName, function (err) {
+                    return done(err);
+                });
+            });
+        });
+    });
+
+    function getStaticMap(name, options, callback) {
+
+        var url = '/api/v1/map/static/named/' + name + '/640/480.png';
+        if (options.params) {
+            url = url + '?' + querystring.stringify(options.params);
+        }
+        var requestOptions = {
+            url: url,
+            method: 'GET',
+            headers: {
+                host: username
+            }
+        };
+
+        console.log(url);
+
+        var statusCode = options.status || 200;
+
+        var expectedResponse = {
+            status: statusCode,
+            headers: {
+                'Content-Type': statusCode === 200 ? 'image/png' : 'application/json; charset=utf-8'
+            }
+        };
+
+        assert.response(server,
+            requestOptions,
+            expectedResponse,
+            function (res, err) {
+                return callback(err, res);
+            }
+        );
+    }
+
+    it('should return a 404 error for nonexistent template name', function (done) {
+        var nonexistentName = 'nonexistent';
+        getStaticMap(nonexistentName, { status: 404 }, function(err, res) {
+            assert.ok(!err);
+            var parsed = JSON.parse(res.body);
+            assert.equal(parsed.error, "Template '" + nonexistentName + "' of user '" + username + "' not found");
+            done();
+        });
+    });
+
+    it('should return 403 if not properly authorized', function(done) {
+        getStaticMap(tokenAuthTemplateName, { status: 403 }, function(err, res) {
+            assert.ok(!err);
+            var parsed = JSON.parse(res.body);
+            assert.equal(parsed.error, 'Unauthorized template instantiation');
+            done();
+        });
+    });
+
+    it('should return 200 if properly authorized', function(done) {
+        getStaticMap(tokenAuthTemplateName, { params: { auth_token: 'valid1' } }, function(err, res) {
+            assert.ok(!err);
+            test_helper.checkSurrogateKey(res, new NamedMapsCacheEntry(username, tokenAuthTemplateName).key());
+            done();
+        });
+    });
+
+});
--- a/test/acceptance/templates.js
+++ b/test/acceptance/templates.js
--- a/test/integration/mapconfig_named_layers_datasource.js
+++ b/test/integration/mapconfig_named_layers_datasource.js
@@ -1,4 +1,4 @@
-var test_helper = require('../support/test_helper');
+require('../support/test_helper');

 var assert = require('assert');
 var RedisPool = require('redis-mpool');
@@ -6,11 +6,8 @@ var TemplateMaps = require('../../lib/cartodb/template_maps.js');
 var PgConnection = require(__dirname + '/../../lib/cartodb/backends/pg_connection');
 var MapConfigNamedLayersAdapter = require('../../lib/cartodb/models/mapconfig_named_layers_adapter');

-var Step = require('step');
-var _ = require('underscore');
-
 // configure redis pool instance to use in tests
-var redisPool = RedisPool(global.environment.redis);
+var redisPool = new RedisPool(global.environment.redis);
 var pgConnection = new PgConnection(require('cartodb-redis')({ pool: redisPool }));

 var templateMaps = new TemplateMaps(redisPool, {
@@ -97,8 +94,8 @@ var multipleLayersTemplate = {
    }
 };

-suite('named_layers datasources', function() {
-    suiteSetup(function(done) {
+describe('named_layers datasources', function() {
+    before(function(done) {
        templateMaps.addTemplate(username, template, function(err) {
            if (err) {
                return done(err);
@@ -224,7 +221,14 @@ suite('named_layers datasources', function() {

        {
            desc: 'with a mix of datasource and no datasource depending if layers are named or not',
-            config: makeNamedMapLayerConfig([simpleNamedLayer, multipleLayersNamedLayer, wadusLayer, simpleNamedLayer, wadusLayer, multipleLayersNamedLayer]),
+            config: makeNamedMapLayerConfig([
+                simpleNamedLayer,
+                multipleLayersNamedLayer,
+                wadusLayer,
+                simpleNamedLayer,
+                wadusLayer,
+                multipleLayersNamedLayer
+            ]),
            test: function(err, layers, datasource, done) {

                assert.ok(!err);
@@ -280,14 +284,16 @@ suite('named_layers datasources', function() {
    ];

    testScenarios.forEach(function(testScenario) {
-        test('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);
-            });
+        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);
+                }
+            );
        });
    });

-    suiteTeardown(function(done) {
+    after(function(done) {
        templateMaps.delTemplate(username, templateName, function(err) {
            if (err) {
                return done(err);
--- a/test/integration/mapconfig_named_layers_expanded.js
+++ b/test/integration/mapconfig_named_layers_expanded.js
@@ -1,4 +1,4 @@
-var testHelper = require('../support/test_helper');
+require('../support/test_helper');

 var assert = require('assert');
 var RedisPool = require('redis-mpool');
@@ -6,13 +6,10 @@ var TemplateMaps = require('../../lib/cartodb/template_maps.js');
 var PgConnection = require(__dirname + '/../../lib/cartodb/backends/pg_connection');
 var MapConfigNamedLayersAdapter = require('../../lib/cartodb/models/mapconfig_named_layers_adapter');

-var Step = require('step');
-var _ = require('underscore');
-
-suite('mapconfig_named_layers_adapter', function() {
+describe('mapconfig_named_layers_adapter', function() {

    // configure redis pool instance to use in tests
-    var redisPool = RedisPool(global.environment.redis);
+    var redisPool = new RedisPool(global.environment.redis);
    var pgConnection = new PgConnection(require('cartodb-redis')({ pool: redisPool }));

    var templateMaps = new TemplateMaps(redisPool, {
@@ -138,40 +135,46 @@ suite('mapconfig_named_layers_adapter', function() {
    }


-    suiteSetup(function(done) {
+    before(function(done) {
        templateMaps.addTemplate(username, template, done);
    });

-    test('should fail for named map layer with missing name', function(done) {
+    it('should fail for named map layer with missing name', function(done) {
        var missingNamedMapLayerConfig = makeNamedMapLayerConfig({
            config: {}
        });
-        mapConfigNamedLayersAdapter.getLayers(username, missingNamedMapLayerConfig.layers, pgConnection, function(err, layers, datasource) {
-            assert.ok(err);
-            assert.ok(!layers);
-            assert.ok(!datasource);
-            assert.equal(err.message, 'Missing Named Map `name` in layer options');
+        mapConfigNamedLayersAdapter.getLayers(username, missingNamedMapLayerConfig.layers, pgConnection,
+            function(err, layers, datasource) {
+                assert.ok(err);
+                assert.ok(!layers);
+                assert.ok(!datasource);
+                assert.equal(err.message, 'Missing Named Map `name` in layer options');

-            done();
-        });
+                done();
+            }
+        );
    });

-    test('should fail for non-existing template name', function(done) {
+    it('should fail for non-existing template name', function(done) {
        var missingTemplateName = 'wadus';
        var nonExistentNamedMapLayerConfig = makeNamedMapLayerConfig({
            name: missingTemplateName
        });
-        mapConfigNamedLayersAdapter.getLayers(username, nonExistentNamedMapLayerConfig.layers, pgConnection, function(err, layers, datasource) {
-            assert.ok(err);
-            assert.ok(!layers);
-            assert.ok(!datasource);
-            assert.equal(err.message, "Template '" + missingTemplateName + "' of user '" + username + "' not found");
+        mapConfigNamedLayersAdapter.getLayers(username, nonExistentNamedMapLayerConfig.layers, pgConnection,
+            function(err, layers, datasource) {
+                assert.ok(err);
+                assert.ok(!layers);
+                assert.ok(!datasource);
+                assert.equal(
+                    err.message, "Template '" + missingTemplateName + "' of user '" + username + "' not found"
+                );

-            done();
-        });
+                done();
+            }
+        );
    });

-    test('should fail if not properly authorized', function(done) {
+    it('should fail if not properly authorized', function(done) {
        templateMaps.addTemplate(username, tokenAuthTemplate, function(err) {
            if (err) {
                return done(err);
@@ -180,18 +183,20 @@ suite('mapconfig_named_layers_adapter', function() {
            var nonAuthTokensNamedMapLayerConfig = makeNamedMapLayerConfig({
                name: tokenAuthTemplateName
            });
-            mapConfigNamedLayersAdapter.getLayers(username, nonAuthTokensNamedMapLayerConfig.layers, pgConnection, function(err, layers, datasource) {
-                assert.ok(err);
-                assert.ok(!layers);
-                assert.ok(!datasource);
-                assert.equal(err.message, "Unauthorized '" + tokenAuthTemplateName + "' template instantiation");
+            mapConfigNamedLayersAdapter.getLayers(username, nonAuthTokensNamedMapLayerConfig.layers, pgConnection,
+                function(err, layers, datasource) {
+                    assert.ok(err);
+                    assert.ok(!layers);
+                    assert.ok(!datasource);
+                    assert.equal(err.message, "Unauthorized '" + tokenAuthTemplateName + "' template instantiation");

-                templateMaps.delTemplate(username, tokenAuthTemplateName, done);
-            });
+                    templateMaps.delTemplate(username, tokenAuthTemplateName, done);
+                }
+            );
        });
    });

-    test('should fail for nested named map layers', function(done) {
+    it('should fail for nested named map layers', function(done) {
        templateMaps.addTemplate(username, nestedNamedMapTemplate, function(err) {
            if (err) {
                return done(err);
@@ -200,32 +205,36 @@ suite('mapconfig_named_layers_adapter', function() {
            var nestedNamedMapLayerConfig = makeNamedMapLayerConfig({
                name: nestedNamedMapTemplateName
            });
-            mapConfigNamedLayersAdapter.getLayers(username, nestedNamedMapLayerConfig.layers, pgConnection, function(err, layers, datasource) {
-                assert.ok(err);
-                assert.ok(!layers);
-                assert.ok(!datasource);
-                assert.equal(err.message, 'Nested named layers are not allowed');
+            mapConfigNamedLayersAdapter.getLayers(username, nestedNamedMapLayerConfig.layers, pgConnection,
+                function(err, layers, datasource) {
+                    assert.ok(err);
+                    assert.ok(!layers);
+                    assert.ok(!datasource);
+                    assert.equal(err.message, 'Nested named layers are not allowed');

-                templateMaps.delTemplate(username, nestedNamedMapTemplateName, done);
-            });
+                    templateMaps.delTemplate(username, nestedNamedMapTemplateName, done);
+                }
+            );
        });
    });

-    test('should return an expanded list of layers for a named map layer', function(done) {
+    it('should return an expanded list of layers for a named map layer', function(done) {
        var validNamedMapMapLayerConfig = makeNamedMapLayerConfig({
            name: templateName
        });
-        mapConfigNamedLayersAdapter.getLayers(username, validNamedMapMapLayerConfig.layers, pgConnection, function(err, layers, datasource) {
-            assert.ok(!err);
-            assert.ok(layers.length, 1);
-            assert.ok(layers[0].type, 'cartodb');
-            assert.notEqual(datasource.getLayerDatasource(0), undefined);
+        mapConfigNamedLayersAdapter.getLayers(username, validNamedMapMapLayerConfig.layers, pgConnection,
+            function(err, layers, datasource) {
+                assert.ok(!err);
+                assert.ok(layers.length, 1);
+                assert.ok(layers[0].type, 'cartodb');
+                assert.notEqual(datasource.getLayerDatasource(0), undefined);

-            done();
-        });
+                done();
+            }
+        );
    });

-    test('should return on auth=token with valid tokens provided', function(done) {
+    it('should return on auth=token with valid tokens provided', function(done) {
        templateMaps.addTemplate(username, tokenAuthTemplate, function(err) {
            if (err) {
                return done(err);
@@ -235,17 +244,19 @@ suite('mapconfig_named_layers_adapter', function() {
                name: tokenAuthTemplateName,
                auth_tokens: ['valid1']
            });
-            mapConfigNamedLayersAdapter.getLayers(username, validAuthTokensNamedMapLayerConfig.layers, pgConnection, function(err, layers, datasource) {
-                assert.ok(!err);
-                assert.equal(layers.length, 1);
-                assert.notEqual(datasource.getLayerDatasource(0), undefined);
+            mapConfigNamedLayersAdapter.getLayers(username, validAuthTokensNamedMapLayerConfig.layers, pgConnection,
+                function(err, layers, datasource) {
+                    assert.ok(!err);
+                    assert.equal(layers.length, 1);
+                    assert.notEqual(datasource.getLayerDatasource(0), undefined);

-                templateMaps.delTemplate(username, tokenAuthTemplateName, done);
-            });
+                    templateMaps.delTemplate(username, tokenAuthTemplateName, done);
+                }
+            );
        });
    });

-    test('should return an expanded list of layers for a named map layer, multiple layers version', function(done) {
+    it('should return an expanded list of layers for a named map layer, multiple layers version', function(done) {
        templateMaps.addTemplate(username, multipleLayersTemplate, function(err) {
            if (err) {
                return done(err);
@@ -255,24 +266,26 @@ suite('mapconfig_named_layers_adapter', function() {
                name: multipleLayersTemplateName,
                auth_tokens: ['valid2']
            });
-            mapConfigNamedLayersAdapter.getLayers(username, multipleLayersNamedMapLayerConfig.layers, pgConnection, function(err, layers, datasource) {
-                assert.ok(!err);
-                assert.equal(layers.length, 2);
+            mapConfigNamedLayersAdapter.getLayers(username, multipleLayersNamedMapLayerConfig.layers, pgConnection,
+                function(err, layers, datasource) {
+                    assert.ok(!err);
+                    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.equal(layers[0].type, 'mapnik');
+                    assert.equal(layers[0].options.cartocss, '#layer { polygon-fill: green; }');
+                    assert.notEqual(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.equal(layers[1].type, 'cartodb');
+                    assert.equal(layers[1].options.cartocss, '#layer { marker-fill: red; }');
+                    assert.notEqual(datasource.getLayerDatasource(1), undefined);

-                templateMaps.delTemplate(username, multipleLayersTemplateName, done);
-            });
+                    templateMaps.delTemplate(username, multipleLayersTemplateName, done);
+                }
+            );
        });
    });

-    test('should replace template params with the given config', function(done) {
+    it('should replace template params with the given config', function(done) {
        templateMaps.addTemplate(username, multipleLayersTemplate, function(err) {
            if (err) {
                return done(err);
@@ -289,24 +302,26 @@ suite('mapconfig_named_layers_adapter', function() {
                },
                auth_tokens: ['valid2']
            });
-            mapConfigNamedLayersAdapter.getLayers(username, multipleLayersNamedMapLayerConfig.layers, pgConnection, function(err, layers, datasource) {
-                assert.ok(!err);
-                assert.equal(layers.length, 2);
+            mapConfigNamedLayersAdapter.getLayers(username, multipleLayersNamedMapLayerConfig.layers, pgConnection,
+                function(err, layers, datasource) {
+                    assert.ok(!err);
+                    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.equal(layers[0].type, 'mapnik');
+                    assert.equal(layers[0].options.cartocss, '#layer { polygon-fill: ' + polygonColor + '; }');
+                    assert.notEqual(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.equal(layers[1].type, 'cartodb');
+                    assert.equal(layers[1].options.cartocss, '#layer { marker-fill: ' + color + '; }');
+                    assert.notEqual(datasource.getLayerDatasource(1), undefined);

-                templateMaps.delTemplate(username, multipleLayersTemplateName, done);
-            });
+                    templateMaps.delTemplate(username, multipleLayersTemplateName, done);
+                }
+            );
        });
    });

-    suiteTeardown(function(done) {
+    after(function(done) {
        templateMaps.delTemplate(username, templateName, done);
    });
 });
--- a/test/support/sql/CDB_QueryTables.sql
+++ b/test/support/sql/CDB_QueryTables.sql
@@ -2,12 +2,12 @@
 --
 -- Requires PostgreSQL 9.x+
 --
-CREATE OR REPLACE FUNCTION CDB_QueryTables(query text)
-RETURNS name[]
+CREATE OR REPLACE FUNCTION CDB_QueryTablesText(query text)
+RETURNS text[]
 AS $$
 DECLARE
  exp XML;
-  tables NAME[];
+  tables text[];
  rec RECORD;
  rec2 RECORD;
 BEGIN
@@ -41,11 +41,11 @@ BEGIN
          xpath('//x:Relation-Name/text()', exp, ARRAY[ARRAY['x', 'http://www.postgresql.org/2009/explain']]) as x,
          xpath('//x:Relation-Name/../x:Schema/text()', exp, ARRAY[ARRAY['x', 'http://www.postgresql.org/2009/explain']]) as s
      )
-      SELECT unnest(x)::name as p, unnest(s)::name as sc from inp
+      SELECT unnest(x) as p, unnest(s) as sc from inp
    LOOP
      -- RAISE DEBUG 'tab: %', rec2.p;
      -- RAISE DEBUG 'sc: %', rec2.sc;
-      tables := array_append(tables, (rec2.sc || '.' || rec2.p)::name);
+      tables := array_append(tables, (rec2.sc || '.' || rec2.p));
    END LOOP;

    -- RAISE DEBUG 'Tables: %', tables;
@@ -65,3 +65,14 @@ BEGIN
  return tables;
 END
 $$ LANGUAGE 'plpgsql' VOLATILE STRICT;
+
+
+-- Keep CDB_QueryTables with same signature for backwards compatibility.
+-- It should probably be removed in the future.
+CREATE OR REPLACE FUNCTION CDB_QueryTables(query text)
+RETURNS name[]
+AS $$
+BEGIN
+  RETURN CDB_QueryTablesText(query)::name[];
+END
+$$ LANGUAGE 'plpgsql' VOLATILE STRICT;
--- a/test/support/sql/windshaft.test.sql
+++ b/test/support/sql/windshaft.test.sql
@@ -189,3 +189,31 @@ INSERT INTO CDB_TableMetadata (tabname, updated_at) VALUES ('test_table_private_

 -- GRANT SELECT ON CDB_TableMetadata TO :PUBLICUSER;
 GRANT SELECT ON CDB_TableMetadata TO :TESTUSER;
+
+-- long name table
+CREATE TABLE
+long_table_name_with_enough_chars_to_break_querytables_function
+(
+    updated_at timestamp without time zone DEFAULT now(),
+    created_at timestamp without time zone DEFAULT now(),
+    cartodb_id integer NOT NULL,
+    name character varying,
+    address character varying,
+    the_geom geometry,
+    the_geom_webmercator geometry
+);
+
+INSERT INTO long_table_name_with_enough_chars_to_break_querytables_function SELECT * from test_table;
+
+ALTER TABLE ONLY long_table_name_with_enough_chars_to_break_querytables_function
+    ADD CONSTRAINT long_table_name_with_enough_chars_to_break_querytables_func_pkey PRIMARY KEY (cartodb_id);
+
+CREATE INDEX long_table_name_the_geom_idx
+    ON long_table_name_with_enough_chars_to_break_querytables_function USING gist (the_geom);
+CREATE INDEX long_table_name_the_geom_webmercator_idx
+    ON long_table_name_with_enough_chars_to_break_querytables_function USING gist (the_geom_webmercator);
+
+GRANT ALL ON TABLE long_table_name_with_enough_chars_to_break_querytables_function TO :TESTUSER;
+GRANT SELECT ON TABLE long_table_name_with_enough_chars_to_break_querytables_function TO :PUBLICUSER;
+
+INSERT INTO CDB_TableMetadata (tabname, updated_at) VALUES ('long_table_name_with_enough_chars_to_break_querytables_function'::regclass, '2009-02-13T23:31:30.123Z');
--- a/test/unit/cartodb/template_maps.test.js
+++ b/test/unit/cartodb/template_maps.test.js
@@ -1,16 +1,15 @@
-var assert = require('assert')
-  //, _ = require('underscore')
-  , RedisPool = require('redis-mpool')
-  , TemplateMaps = require('../../../lib/cartodb/template_maps.js')
-  , test_helper = require('../../support/test_helper')
-  , Step = require('step')
-  , _ = require('underscore')
-  , tests = module.exports = {};
+require('../../support/test_helper');

-suite('template_maps', function() {
+var assert = require('assert');
+var RedisPool = require('redis-mpool');
+var TemplateMaps = require('../../../lib/cartodb/template_maps.js');
+var step = require('step');
+var _ = require('underscore');
+
+describe('template_maps', function() {

  // configure redis pool instance to use in tests
-  var redis_pool = RedisPool(global.environment.redis);
+  var redis_pool = new RedisPool(global.environment.redis);

    var wadusLayer = {
        options: {
@@ -20,24 +19,12 @@ suite('template_maps', function() {
        }
    };

-    var validTemplate = {
-        version:'0.0.1',
-        name: 'first',
-        auth: {},
-        layergroup: {
-            layers: [
-                wadusLayer
-            ]
-        }
-    };
-    var owner = 'me';
-    
-  test('does not accept template with unsupported version', function(done) {
+  it('does not accept template with unsupported version', function(done) {
    var tmap = new TemplateMaps(redis_pool);
    assert.ok(tmap);
    var tpl = { version:'6.6.6',
      name:'k', auth: {}, layergroup: {layers:[wadusLayer]} };
-    Step(
+    step(
      function() {
        tmap.addTemplate('me', tpl, this);
      },
@@ -52,12 +39,12 @@ suite('template_maps', function() {
    );
  });

-  test('does not accept template with missing name', function(done) {
+  it('does not accept template with missing name', function(done) {
    var tmap = new TemplateMaps(redis_pool);
    assert.ok(tmap);
    var tpl = { version:'0.0.1',
      auth: {}, layergroup: {layers:[wadusLayer]} };
-    Step(
+    step(
      function() {
        tmap.addTemplate('me', tpl, this);
      },
@@ -72,33 +59,52 @@ suite('template_maps', function() {
    );
  });

-  test('does not accept template with invalid name', function(done) {
-    var tmap = new TemplateMaps(redis_pool);
-    assert.ok(tmap);
-    var tpl = { version:'0.0.1',
-      auth: {}, layergroup: {layers:[wadusLayer]} };
-    var invalidnames = [ "ab|", "a b", "a@b", "1ab", "_x", "", " x", "x " ];
-    var testNext = function() {
-      if ( ! invalidnames.length ) { done(); return; }
-      var n = invalidnames.pop();
-      tpl.name = n;
-      tmap.addTemplate('me', tpl, function(err) {
-        if ( ! err ) {
-          done(new Error("Unexpected success with invalid name '" + n + "'"));
-        }
-        else if ( ! err.message.match(/template.*name/i) ) {
-          done(new Error("Unexpected error message with invalid name '" + n
-            + "': " + err));
-        }
-        else {
-          testNext();
-        }
-      });
-    };
-    testNext();
-  });
+    describe('naming', function() {

-  test('does not accept template with invalid placeholder name', function(done) {
+        function createTemplate(name) {
+            return {
+                version:'0.0.1',
+                name: name,
+                auth: {},
+                layergroup: {
+                    layers: [
+                        wadusLayer
+                    ]
+                }
+            };
+        }
+        var templateMaps = new TemplateMaps(redis_pool);
+
+        var invalidNames = [ "ab|", "a b", "a@b", "-1ab", "_x", "", " x", "x " ];
+        invalidNames.forEach(function(invalidName) {
+            it('should NOT accept template with invalid name: ' + invalidName, function(done) {
+                templateMaps.addTemplate('me', createTemplate(invalidName), function(err) {
+                    assert.ok(err, "Unexpected success with invalid name '" + invalidName + "'");
+                    assert.ok(
+                        err.message.match(/template.*name/i),
+                        "Unexpected error message with invalid name '" + invalidName + "': " + err.message
+                    );
+                    done();
+                });
+            });
+        });
+
+        var validNames = [
+            "AB", "1ab", "DFD19A1A-0AC6-11E5-B0CA-6476BA93D4F6", "25ad8300-0ac7-11e5-b93f-6476ba93d4f6"
+        ];
+        validNames.forEach(function(validName) {
+            it('should accept template with valid name: ' + validName, function(done) {
+                templateMaps.addTemplate('me', createTemplate(validName), function(err) {
+                    assert.ok(!err, "Unexpected error with valid name '" + validName + "': " + err);
+                    done();
+                });
+            });
+        });
+
+
+    });
+
+  it('does not accept template with invalid placeholder name', function(done) {
    var tmap = new TemplateMaps(redis_pool);
    assert.ok(tmap);
    var tpl = { version:'0.0.1',
@@ -115,8 +121,7 @@ suite('template_maps', function() {
          done(new Error("Unexpected success with invalid name '" + n + "'"));
        }
        else if ( ! err.message.match(/invalid.*name/i) ) {
-          done(new Error("Unexpected error message with invalid name '" + n
-            + "': " + err));
+          done(new Error("Unexpected error message with invalid name '" + n + "': " + err));
        }
        else {
          testNext();
@@ -126,7 +131,7 @@ suite('template_maps', function() {
    testNext();
  });

-  test('does not accept template with missing placeholder default', function(done) {
+  it('does not accept template with missing placeholder default', function(done) {
    var tmap = new TemplateMaps(redis_pool);
    assert.ok(tmap);
    var tpl = { version:'0.0.1',
@@ -137,8 +142,7 @@ suite('template_maps', function() {
          done(new Error("Unexpected success with missing placeholder default"));
        }
        else if ( ! err.message.match(/missing default/i) ) {
-          done(new Error("Unexpected error message with missing placeholder default: "
-            + err));
+          done(new Error("Unexpected error message with missing placeholder default: " + err));
        }
        else {
          done();
@@ -146,7 +150,7 @@ suite('template_maps', function() {
      });
  });

-  test('does not accept template with missing placeholder type', function(done) {
+  it('does not accept template with missing placeholder type', function(done) {
    var tmap = new TemplateMaps(redis_pool);
    assert.ok(tmap);
    var tpl = { version:'0.0.1',
@@ -157,8 +161,7 @@ suite('template_maps', function() {
          done(new Error("Unexpected success with missing placeholder type"));
        }
        else if ( ! err.message.match(/missing type/i) ) {
-          done(new Error("Unexpected error message with missing placeholder default: "
-            + err));
+          done(new Error("Unexpected error message with missing placeholder default: " + err));
        }
        else {
          done();
@@ -167,7 +170,7 @@ suite('template_maps', function() {
  });

  // See http://github.com/CartoDB/Windshaft-cartodb/issues/128
-  test('does not accept template with invalid token auth (undefined tokens)',
+  it('does not accept template with invalid token auth (undefined tokens)',
  function(done) {
    var tmap = new TemplateMaps(redis_pool);
    assert.ok(tmap);
@@ -179,8 +182,7 @@ suite('template_maps', function() {
          done(new Error("Unexpected success with invalid token auth (undefined tokens)"));
        }
        else if ( ! err.message.match(/invalid 'token' authentication/i) ) {
-          done(new Error("Unexpected error message with invalid token auth (undefined tokens): "
-            + err));
+          done(new Error("Unexpected error message with invalid token auth (undefined tokens): " + err));
        }
        else {
          done();
@@ -188,14 +190,14 @@ suite('template_maps', function() {
      });
  });

-  test('add, get and delete a valid template', function(done) {
+  it('add, get and delete a valid template', function(done) {
    var tmap = new TemplateMaps(redis_pool);
    assert.ok(tmap);
    var expected_failure = false;
    var tpl_id;
    var tpl = { version:'0.0.1',
      name: 'first', auth: {}, layergroup: {layers:[wadusLayer]} };
-    Step(
+    step(
      function() {
        tmap.addTemplate('me', tpl, this);
      },
@@ -224,15 +226,14 @@ suite('template_maps', function() {
    );
  });

-  test('add multiple templates, list them', function(done) {
+  it('add multiple templates, list them', function(done) {
    var tmap = new TemplateMaps(redis_pool);
    assert.ok(tmap);
-    var expected_failure = false;
    var tpl1 = { version:'0.0.1', name: 'first', auth: {}, layergroup: {layers:[wadusLayer]} };
    var tpl1_id;
    var tpl2 = { version:'0.0.1', name: 'second', auth: {}, layergroup: {layers:[wadusLayer]} };
    var tpl2_id;
-    Step(
+    step(
      function addTemplate1() {
        tmap.addTemplate('me', tpl1, this);
      },
@@ -283,7 +284,7 @@ suite('template_maps', function() {
    );
  });

-  test('update templates', function(done) {
+  it('update templates', function(done) {
    var tmap = new TemplateMaps(redis_pool);
    assert.ok(tmap);
    var expected_failure = false;
@@ -294,7 +295,7 @@ suite('template_maps', function() {
      layergroup: {layers:[wadusLayer]}
    };
    var tpl_id;
-    Step(
+    step(
      function addTemplate() {
        tmap.addTemplate(owner, tpl, this);
      },
@@ -323,7 +324,6 @@ suite('template_maps', function() {
      },
      function updateUnexistentTemplate(err) {
        if ( err && ! expected_failure) throw err;
-        expected_failure = false;
        assert.ok(err);
        assert.ok(err.message.match(/unsupported.*version/i), err);
        tpl.version = '0.0.1';
@@ -343,7 +343,7 @@ suite('template_maps', function() {
    );
  });

-  test('instanciate templates', function() {
+  it('instanciate templates', function() {
    var tmap = new TemplateMaps(redis_pool);
    assert.ok(tmap);

@@ -356,7 +356,7 @@ suite('template_maps', function() {
          color: { type: "css_color", default: "#a0fF9A" },
          name: { type: "sql_literal", default: "test" },
          zoom: { type: "number", default: "0" },
-          test_number: { type: "number", default: 23 },
+          test_number: { type: "number", default: 23 }
        },
        layergroup: {
          version: '1.0.0',
@@ -400,48 +400,48 @@ suite('template_maps', function() {

    // Invalid css_color
    var err = null;
-    try { inst = tmap.instance(tpl1, {color:'##ff00ff'}); }
+    try { tmap.instance(tpl1, {color:'##ff00ff'}); }
    catch (e) { err = e; }
    assert.ok(err);
    assert.ok(err.message.match(/invalid css_color/i), err);

    // Invalid css_color 2 (too few digits)
-    var err = null;
-    try { inst = tmap.instance(tpl1, {color:'#ff'}); }
+    err = null;
+    try { tmap.instance(tpl1, {color:'#ff'}); }
    catch (e) { err = e; }
    assert.ok(err);
    assert.ok(err.message.match(/invalid css_color/i), err);

    // Invalid css_color 3 (too many digits)
-    var err = null;
-    try { inst = tmap.instance(tpl1, {color:'#1234567'}); }
+    err = null;
+    try { tmap.instance(tpl1, {color:'#1234567'}); }
    catch (e) { err = e; }
    assert.ok(err);
    assert.ok(err.message.match(/invalid css_color/i), err);

    // Invalid number
-    var err = null;
-    try { inst = tmap.instance(tpl1, {zoom:'#'}); }
+    err = null;
+    try { tmap.instance(tpl1, {zoom:'#'}); }
    catch (e) { err = e; }
    assert.ok(err);
    assert.ok(err.message.match(/invalid number/i), err);

    // Invalid number 2
-    var err = null;
-    try { inst = tmap.instance(tpl1, {zoom:'23e'}); }
+    err = null;
+    try { tmap.instance(tpl1, {zoom:'23e'}); }
    catch (e) { err = e; }
    assert.ok(err);
    assert.ok(err.message.match(/invalid number/i), err);

    // Valid number
-    var err = null;
-    try { inst = tmap.instance(tpl1, {zoom:'-.23e10'}); }
+    err = null;
+    try { tmap.instance(tpl1, {zoom:'-.23e10'}); }
    catch (e) { err = e; }
    assert.ok(!err);
  });

  // Can set a limit on the number of user templates
-  test('can limit number of user templates', function(done) {
+  it('can limit number of user templates', function(done) {
    var tmap = new TemplateMaps(redis_pool, {
      max_user_templates: 2
    });
@@ -450,7 +450,7 @@ suite('template_maps', function() {
    var expectErr = false;
    var idMe = [];
    var idYou = [];
-    Step(
+    step(
      function oneForMe() {
        tpl.name = 'oneForMe';
        tmap.addTemplate('me', tpl, this);
@@ -470,7 +470,7 @@ suite('template_maps', function() {
        expectErr = true;
        tmap.addTemplate('me', tpl, this);
      },
-      function errForMe(err, id) {
+      function errForMe(err/*, id*/) {
        if ( err && ! expectErr ) throw err;
        expectErr = false;
        assert.ok(err);
@@ -508,7 +508,7 @@ suite('template_maps', function() {
        expectErr = true;
        tmap.addTemplate('you', tpl, this);
      },
-      function errForYou(err, id) {
+      function errForYou(err/*, id*/) {
        if ( err && ! expectErr ) throw err;
        expectErr = false;
        assert.ok(err);
--- a/test/unit/cartodb/template_maps_auth.test.js
+++ b/test/unit/cartodb/template_maps_auth.test.js
@@ -1,11 +1,11 @@
+require('../../support/test_helper');
+
 var assert = require('assert');
 var RedisPool = require('redis-mpool');
-var TemplateMaps = require('../../../lib/cartodb/template_maps');
-var test_helper = require('../../support/test_helper');
-var Step = require('step');
-var tests = module.exports = {};

-suite('template_maps_auth', function() {
+var TemplateMaps = require('../../../lib/cartodb/template_maps');
+
+describe('template_maps_auth', function() {

    // configure redis pool instance to use in tests
    var redisPool = new RedisPool(global.environment.redis),
@@ -84,15 +84,15 @@ suite('template_maps_auth', function() {
    ];

    authorizationTestScenarios.forEach(function(testScenario) {
-        test(testScenario.desc, function(done) {
+        it(testScenario.desc, function(done) {
            var debugMessage = testScenario.expected ? 'should be authorized' : 'unexpectedly authorized';
            var result = templateMaps.isAuthorized(testScenario.template, testScenario.token);
            assert.equal(result, testScenario.expected, debugMessage);
            done();
-        })
+        });
    });

-    test("auth as 'open' string is authorized", function(done) {
+    it("auth as 'open' string is authorized", function(done) {
        var template = {
            name: 'wadus_template',
            auth: 'open'
--- a/test/unit/cartodb/template_maps_defaults.test.js
+++ b/test/unit/cartodb/template_maps_defaults.test.js
@@ -1,10 +1,11 @@
+require('../../support/test_helper');
+
 var assert = require('assert');
 var RedisPool = require('redis-mpool');
 var TemplateMaps = require('../../../lib/cartodb/template_maps.js');
-var test_helper = require('../../support/test_helper');
 var _ = require('underscore');

-suite('template_maps', function() {
+describe('template_maps', function() {

    var redisPool = new RedisPool(global.environment.redis),
        templateMaps = new TemplateMaps(redisPool);
@@ -88,7 +89,7 @@ suite('template_maps', function() {
    ];

    testScenarios.forEach(function(testScenario) {
-        test('adding template returns a new instance with ' + testScenario.desc, function(done) {
+        it('adding template returns a new instance with ' + testScenario.desc, function(done) {

            templateMaps.addTemplate(owner, testScenario.template, function(err, templateId, template) {
                assert.ok(!err, 'Unexpected error adding template: ' + (err && err.message));
--- a/test/unit/cartodb/valid_template_maps.test.js
+++ b/test/unit/cartodb/valid_template_maps.test.js
@@ -1,10 +1,11 @@
+require('../../support/test_helper');
+
 var assert = require('assert');
 var RedisPool = require('redis-mpool');
 var TemplateMaps = require('../../../lib/cartodb/template_maps.js');
-var test_helper = require('../../support/test_helper');
 var _ = require('underscore');

-suite('template_maps', function() {
+describe('template_maps', function() {

    var redisPool = new RedisPool(global.environment.redis),
        templateMaps = new TemplateMaps(redisPool);
@@ -87,7 +88,7 @@ suite('template_maps', function() {
    ];

    testScenarios.forEach(function(testScenario) {
-        test(testScenario.desc, function(done) {
+        it(testScenario.desc, function(done) {

            templateMaps.addTemplate(owner, testScenario.template, function(err) {

--- a/tools/README.md
+++ b/tools/README.md
@@ -0,0 +1,8 @@
+Deprecated tools
+================
+
+All tools and scripts found in this directory are deprecated and no longer maintained.
+
+Use at your own peril.
+
+In future releases they might get removed.
Author	SHA1	Message	Date
Raul Ochoa	e3d5abc9a2	Release 2.9.0	2015-08-06 18:02:09 +02:00
Raul Ochoa	ea7a5da1c1	Merge pull request #324 from CartoDB/memory-stats Send memory usage stats	2015-08-06 16:12:18 +02:00
Raul Ochoa	2e063cc2d2	Send memory usage stats	2015-08-06 16:06:42 +02:00
Raul Ochoa	decd9077e4	Stubs next version	2015-07-15 11:44:59 +02:00
Raul Ochoa	f6c47bf85e	Release 2.8.0	2015-07-15 11:43:54 +02:00
Raul Ochoa	423191c13b	Merge pull request #319 from CartoDB/upgrade-windshaft Upgrades windshaft to 0.48.0	2015-07-15 11:43:09 +02:00
Raul Ochoa	7a5928d957	Upgrades windshaft to 0.48.0	2015-07-15 11:31:26 +02:00
Raul Ochoa	436c334f5a	Stubs next version	2015-07-14 16:33:12 +02:00
Raul Ochoa	4f84138ade	Release 2.7.2	2015-07-14 16:32:04 +02:00
Raul Ochoa	a0d86ac5dc	Update news	2015-07-14 16:28:51 +02:00
Raul Ochoa	e2be4f1275	Merge pull request #314 from CartoDB/use-cdb-query-tables-text Use CDB_QueryTablesText instead of CDB_QueryTables	2015-07-14 16:20:23 +02:00
Raul Ochoa	9a393fa793	Adds some notes about uv_threadpool_size and mapnik renderer pool size	2015-07-07 12:27:09 +02:00
Raul Ochoa	7614f72df6	Stubs next version	2015-07-06 11:58:08 +02:00
Raul Ochoa	ef2db78567	Release 2.7.1	2015-07-06 11:56:30 +02:00
Raul Ochoa	8708468444	fix 2.7.0 release date	2015-07-06 11:56:18 +02:00
Raul Ochoa	cd28a4fbcc	redis-mpool `noReadyCheck` and `unwatchOnRelease` options from config do not extend them as it disallows to pick from config	2015-07-06 11:52:34 +02:00
Raul Ochoa	19f488095b	Stubs next version	2015-07-06 01:07:30 +02:00
Raul Ochoa	cd65c6dd0e	Release 2.7.0	2015-07-06 01:05:28 +02:00
Raul Ochoa	0c670cfdfd	Merge pull request #318 from CartoDB/upgrade-windshaft Upgrades windshaft to 0.47.0	2015-07-05 21:51:34 +02:00
Raul Ochoa	27ff1ac4f6	Upgrades windshaft to 0.47.0	2015-07-05 21:16:12 +02:00
Raul Ochoa	3f06de93f7	Merge pull request #317 from CartoDB/improve-redis Improve redis	2015-07-05 21:11:34 +02:00
Raul Ochoa	0da6495330	Fixes `unwatchOnRelease` redis config	2015-07-05 21:00:25 +02:00
Raul Ochoa	bf24347328	Exposes redis `noReadyCheck` config	2015-07-05 20:59:52 +02:00
Raul Ochoa	7a5d73f9df	Upgrades redis-mpool	2015-07-05 20:58:39 +02:00
Raul Ochoa	0d9f34fd48	Stubs next version	2015-07-02 15:48:58 +02:00
Raul Ochoa	da55a3bdd2	Release 2.6.1	2015-07-02 15:47:40 +02:00
Raul Ochoa	333334e598	Upgrades windshaft	2015-07-02 15:41:48 +02:00
Raul Ochoa	7168e4410c	Stubs next version	2015-07-02 14:12:41 +02:00
Raul Ochoa	3ff8571f4a	Release 2.6.0	2015-07-02 14:11:39 +02:00
Raul Ochoa	75ddcbbd01	Updates windshaft to 0.46.0 and documents new config formatMetatile	2015-07-02 13:28:37 +02:00
Raul Ochoa	9b3e18f333	Merge pull request #315 from CartoDB/readme_update Update instructions	2015-07-01 09:37:57 +02:00
Juan Ignacio Sánchez Lara	fcb0a4a7e6	Less specific upgrade help	2015-07-01 07:22:37 +02:00
Juan Ignacio Sánchez Lara	94e38cef9d	Update instructions	2015-06-30 11:00:32 +02:00
Raul Ochoa	9e30f05e7d	Reverts to use cdb branch as is already published	2015-06-29 16:46:07 +02:00
Raul Ochoa	0df725112b	Update CDB_QueryTables function	2015-06-29 16:42:55 +02:00
Raul Ochoa	9ea2029f81	Deprecating scripts from tools directory	2015-06-25 18:07:48 +02:00
Raul Ochoa	2715f47a22	Points CDB_QueryTables script to the branch with CDB_QueryTablesText	2015-06-24 19:07:41 +02:00
Rafa de la Torre	90d0b23441	Use CDB_QueryTablesText instead of CDB_QueryTables This avoids trouble with len(schema.table_name) > 63 See https://github.com/CartoDB/cartodb-postgresql/issues/86	2015-06-24 15:43:04 +02:00
Raul Ochoa	b59e0a00a0	Merge pull request #313 from CartoDB/cartodb-layer-docs Update Map-API docs	2015-06-23 15:04:16 +02:00
Andrew Thompson	790571fd2c	Update Map-API docs It was not clear to me what the difference was between a mapnik layer and a cartodb layer until I read the comments in the Mapconfig spec! Let's save some users the extra step :)	2015-06-22 11:14:57 -04:00
Raul Ochoa	6ecebae110	Adds test to validate (once it is fixed) long table names do not fail	2015-06-18 16:29:59 +02:00
Raul Ochoa	849470a3c0	Stubs next version	2015-06-18 12:55:38 +02:00
Raul Ochoa	74d0a6f183	Release 2.5.0	2015-06-18 12:53:45 +02:00
Raul Ochoa	61c134215a	Bumps version and regenerates npm-shrinkwrap.json	2015-06-18 12:29:02 +02:00
Raul Ochoa	b7218d8832	Fix list style	2015-06-18 12:19:03 +02:00
Raul Ochoa	63e19427af	Fix documentation error examples to match 'General Concepts' guidelines	2015-06-18 12:17:17 +02:00
Raul Ochoa	d4f8578fd6	Merge pull request #312 from CartoDB/issue-311 Adds layergroupid header	2015-06-18 11:21:03 +02:00
Raul Ochoa	eaccd062d3	Adds layergroupid header Closes #311	2015-06-18 01:13:33 +02:00
Raul Ochoa	5f2d5931f4	Regenerate npm-shrinkwrap.json using master branch	2015-06-12 15:48:03 +02:00
Raul Ochoa	ce40fa608e	Clarify bounds meaning in template view	2015-06-08 14:31:04 -04:00
Raul Ochoa	0979c75852	Merge pull request #308 from CartoDB/issue-305 Named maps error responses with valid format	2015-06-08 10:49:22 -04:00
Raul Ochoa	f01e8e0866	Merge pull request #304 from CartoDB/docs-revamp Documentation for named maps static images + view option in templates	2015-06-08 10:49:08 -04:00
Raul Ochoa	a4e303ab63	Remove console.log from tests	2015-06-08 10:37:56 -04:00
Raul Ochoa	c5137c9c29	Update news	2015-06-05 13:41:46 -04:00
Raul Ochoa	9bce88f9b1	Fix tests	2015-06-05 13:39:25 -04:00
Raul Ochoa	68c70effec	Named maps returning `errors=>Array` instead of `error=>String`	2015-06-05 13:38:38 -04:00
Raul Ochoa	ebae218219	Use windshaft branch with unified error reponses format	2015-06-05 13:37:49 -04:00
Raul Ochoa	6685b759b2	Remove duplicated module.exports	2015-06-04 20:14:36 -04:00
Raul Ochoa	539b0496bf	Update news	2015-06-04 12:53:59 -04:00
Raul Ochoa	3c33fac8f4	Merge pull request #307 from CartoDB/template-names Changes rules for names in templates	2015-06-04 12:52:30 -04:00
Raul Ochoa	9613f76ef5	Keep placeholder key validation independent from name validation	2015-06-04 11:58:24 -04:00
Raul Ochoa	3f0d344313	Changes rules for names in templates Now valid names can start with numbers and can contain dashes (-). Closes #306	2015-06-04 10:41:40 -04:00
Raul Ochoa	823ee63c25	Merge branch 'master' into docs-revamp Conflicts: docs/Map-API.md	2015-06-03 17:11:01 -04:00
Raul Ochoa	d5d76f9c63	Adds information about named map static images endpoint	2015-06-03 17:09:10 -04:00
Raul Ochoa	dfc9a6fbb4	Documentation about `view` in named maps' templates Closes #287	2015-06-03 17:00:42 -04:00
Raul Ochoa	2bd9aece35	Add header for zoom + center in static maps	2015-06-03 17:00:05 -04:00
Raul Ochoa	21870c9fa2	Merge branch 'master' into docs-revamp	2015-06-03 16:57:24 -04:00
Raul Ochoa	7c315b3afd	Merge pull request #303 from CartoDB/links-to-map-config Updated links to MapConfig 1.3.0	2015-06-03 16:37:24 -04:00
Pablo Alonso Garcia	da0cdb081d	Updated links to MapConfig 1.3.0	2015-06-03 10:48:42 +02:00
Carlos Matallín	9bd0a3f1c9	Update Map-API.md	2015-06-01 17:00:53 +02:00
Raul Ochoa	83992895e4	Merge pull request #301 from CartoDB/layers-documentation Documentation about layers metadata and layer selection/filtering	2015-06-01 16:48:14 +02:00
Raul Ochoa	aa3b336e46	Stubs next version	2015-06-01 15:50:53 +02:00
Raul Ochoa	e17b374fde	Release 2.4.1	2015-06-01 15:49:30 +02:00
Raul Ochoa	61158b62f1	Update news	2015-06-01 15:46:32 +02:00
Raul Ochoa	88ed43a92e	Merge pull request #302 from CartoDB/upgrade-windshaft Upgrade windshaft	2015-06-01 14:28:28 +02:00
Raul Ochoa	e5fff6b452	Merge branch 'master' into upgrade-windshaft	2015-06-01 14:19:49 +02:00
Raul Ochoa	044d49c53a	Uses windshaft 0.44.1 from registry	2015-06-01 12:20:44 +02:00
Raul Ochoa	69abf8d9b1	uses windshaft's master branch	2015-06-01 11:35:57 +02:00
Andy Eschbacher	14e13899a6	made minor changes	2015-05-28 11:02:34 -04:00
Raul Ochoa	488c246222	Documentation about layers metadata and layer selection	2015-05-28 15:10:55 +02:00
Raul Ochoa	654905a79c	Stubs next version	2015-05-26 15:53:07 +02:00
Raul Ochoa	12cb199803	Release 2.4.0	2015-05-26 15:52:28 +02:00
Raul Ochoa	8759cf726b	Merge pull request #300 from CartoDB/upgrade-windshaft Bumps windshaft version to 0.44.0	2015-05-26 15:50:19 +02:00
Raul Ochoa	7a45c9e434	Bumps windshaft version to 0.44.0 - adds a test to validate metadata is returned for unrolled named layers	2015-05-26 15:39:21 +02:00
Raul Ochoa	9ee69dea55	Stubs next version	2015-05-18 18:11:48 +02:00
Raul Ochoa	ebe38e977f	Release 2.3.0	2015-05-18 18:10:47 +02:00
Raul Ochoa	40ad143c3e	Merge pull request #299 from CartoDB/upgrade-cartodb-redis Upgrades cartodb-redis for `global` map stats	2015-05-18 18:08:06 +02:00
Raul Ochoa	875159fa5f	Upgrades cartodb-redis for `global` map stats	2015-05-18 17:40:41 +02:00
Raul Ochoa	c97c65de34	Fixes multilayer link	2015-05-18 11:24:06 +02:00
Raul Ochoa	25ae09b2c5	Update patch to generate routes document	2015-04-29 17:18:36 +02:00
Raul Ochoa	853c2b4b85	Adds new route for named maps static previews	2015-04-29 17:17:46 +02:00
Raul Ochoa	682db1ca75	Stubs next version	2015-04-29 15:26:56 +02:00
Raul Ochoa	d56bd8de72	Release 2.2.0	2015-04-29 15:18:47 +02:00
Raul Ochoa	1df91aee6f	Merge pull request #293 from CartoDB/named-static-maps Named static maps	2015-04-29 12:48:02 +02:00
Raul Ochoa	b64eaed7ed	Enables any URL in HTTP renderer whitelist in example configurations	2015-04-29 12:15:26 +02:00
Raul Ochoa	03dae8a93a	changes about tests	2015-04-29 10:35:11 +02:00
Raul Ochoa	6b93fa0575	Update news	2015-04-29 10:31:47 +02:00
Raul Ochoa	5a9a2d7449	Use windshaft's registry version	2015-04-29 10:21:23 +02:00
Raul Ochoa	8d200686fd	regenerate npm-shrinkwrap.json	2015-04-29 09:59:36 +02:00
Raul Ochoa	1c2f84b0cb	Rely on windshaft master branch	2015-04-29 00:20:41 +02:00
Raul Ochoa	513fa2af01	Log all named map invalidation with context	2015-04-28 17:25:07 +02:00
Raul Ochoa	7580081a64	Append stats to profiler	2015-04-28 16:14:30 +02:00
Raul Ochoa	1a66f96379	Adds custom cache control header for named map static images	2015-04-28 16:14:19 +02:00
Raul Ochoa	fde680450f	Do not use headers from abaculus in combination with sendWithHeaders	2015-04-28 16:14:03 +02:00
Raul Ochoa	6843692f01	Pick format from user params	2015-04-28 16:10:50 +02:00
Raul Ochoa	1f3a073f21	Use headers from fake request	2015-04-28 16:10:30 +02:00
Raul Ochoa	7b4d41464f	tests for static named maps	2015-04-27 19:15:06 +02:00
Raul Ochoa	7ae2910061	adds tests as part of the jshint target	2015-04-27 18:08:55 +02:00
Raul Ochoa	ed3517e733	fix jshint	2015-04-27 18:08:40 +02:00
Raul Ochoa	6ac3b4c005	fix jshint	2015-04-27 18:05:39 +02:00
Raul Ochoa	26545af9ae	fix jshint	2015-04-27 18:03:15 +02:00
Raul Ochoa	1ee96f14ce	fix jshint	2015-04-27 18:02:15 +02:00
Raul Ochoa	2250e6d608	fix jshint	2015-04-27 18:00:47 +02:00
Raul Ochoa	5ad27e4bf5	fix jshint	2015-04-27 17:58:56 +02:00
Raul Ochoa	5f765712b4	fix jshint	2015-04-27 17:54:07 +02:00
Raul Ochoa	cb2e330e0b	Uses describe/it instead of suite/test	2015-04-27 17:49:15 +02:00
Raul Ochoa	6de911e5bb	Adds fastly invalidation expectations in surrogate key invalidation tests	2015-04-27 17:43:46 +02:00
Raul Ochoa	9edec8ef3f	Adds Fastly cache backend	2015-04-27 16:31:47 +02:00
Raul Ochoa	8e8ab09bec	Clarify fastly configuration is optional	2015-04-27 16:28:28 +02:00
Raul Ochoa	c06cba81f4	SurrogateKeysCache now accepts several cache backends - uses queue-async to parallelize the call to invalidate	2015-04-27 16:22:37 +02:00
Raul Ochoa	ad5514dd02	Pick fastly config for server options	2015-04-27 16:20:55 +02:00
Raul Ochoa	a5b9ca706c	Adds new fastly cache backend	2015-04-27 16:18:50 +02:00
Raul Ochoa	5a476f9354	Adds fastly-purge dependency	2015-04-27 16:18:03 +02:00
Raul Ochoa	403039b695	Adds new configuration examples for fastly surrogate keys invalidation	2015-04-27 16:17:13 +02:00
Raul Ochoa	5ee19cc2ed	Rename template maps controller to named maps to be more clear	2015-04-27 15:01:49 +02:00
Raul Ochoa	8c3f9c7ba0	Inject server options to use setDBParams	2015-04-27 14:59:41 +02:00
Raul Ochoa	b95a001e0b	New static maps controller/endpoint for named maps - loads a template - creates a layergroup on the fly - checks for view center+zoom or bounds - if not found it tries to estimate them - if fails it falls to default bounds value - returns an static image tagged with a surrogate key	2015-04-27 14:56:38 +02:00
Raul Ochoa	d180305e8b	Exposes pgQueryRunner in server options	2015-04-27 14:54:14 +02:00
Raul Ochoa	ef8fcf7e93	Do not inject NamedMapsCacheEntry as template controller knows about them Also do not inject pgConnection	2015-04-27 14:52:36 +02:00
Raul Ochoa	e7bd5dd644	Moves setDBParams to serverOptions so it can be reused	2015-04-27 14:47:58 +02:00
Raul Ochoa	8503a5c7c9	Tables extent API: returns estimated bounds for a list of tables	2015-04-27 12:55:20 +02:00
Raul Ochoa	2de0e5d52b	Extracts psql query run to its own class to be reusable	2015-04-27 12:48:34 +02:00
Raul Ochoa	b9e4b0a90c	Removes alpha version from example	2015-04-27 11:56:54 +02:00
Raul Ochoa	8fb3dc7529	Move templateName function to template maps model	2015-04-27 11:55:05 +02:00
Raul Ochoa	a897e36b91	Merge pull request #290 from CartoDB/simplify-template-names Simplify template names	2015-04-23 12:19:21 +02:00
Raul Ochoa	446c432484	dry content type validation	2015-04-23 12:05:52 +02:00
Raul Ochoa	c49f3aaba5	DRY ifUnauthenticated method	2015-04-23 12:01:53 +02:00
Raul Ochoa	fed29b3b50	Extract finish function	2015-04-23 11:47:01 +02:00
Raul Ochoa	e7d134d70c	No more {username}@{template_name} template id It's still backwards compatible	2015-04-23 11:29:55 +02:00
Raul Ochoa	62dbce4311	Merge pull request #289 from CartoDB/issue-267 Call callback on invalid map store token for named maps	2015-04-22 18:38:58 +02:00
Raul Ochoa	5b5f7fc700	Merge pull request #288 from CartoDB/clean-templates-suite cleans templates suite: uses describe+it instead of suite+test	2015-04-21 23:58:13 +02:00
Raul Ochoa	026a0750e3	Call callback on invalid map store token for named maps fixes #267	2015-04-21 18:59:52 +02:00
Raul Ochoa	7045f41252	cleans templates suite: uses describe+it instead of suite+test	2015-04-21 18:28:31 +02:00
Raul Ochoa	eaf6775d9d	Stubs next version	2015-04-16 18:06:55 +02:00
Raul Ochoa	ba2a9b81e9	Release 2.1.3	2015-04-16 18:02:36 +02:00
Raul Ochoa	5577600903	Upgrade windshaft and regenerate npm-shrinkwrap.json	2015-04-16 17:48:59 +02:00
Raul Ochoa	a0a455b225	Stubs next version	2015-04-15 16:13:40 +02:00