Release 2.39.0

Update news
Merge pull request #440 from CartoDB/node-status-cache-control-header
2016-05-05 18:09:44 +02:00 · 2016-05-05 18:09:15 +02:00 · 2016-05-05 18:07:16 +02:00 · 2016-05-05 17:52:37 +02:00 · 2016-05-05 16:06:52 +02:00 · 2016-05-05 16:05:46 +02:00
12 changed files with 557 additions and 146 deletions
--- a/.jshintrc
+++ b/.jshintrc
@@ -82,13 +82,14 @@
 //    "wsh"           : false,    // Windows Scripting Host
 //    "yui"           : false,    // Yahoo User Interface

-    // Custom Globals
-    "globals"       : { // additional predefined global variables
-        "describe": true,
-        "before": true,
-        "after": true,
-        "beforeEach": true,
-        "afterEach": true,
-        "it": true
-    }
+    // Custom predefined global variables
+    "predef": [
+        "-console", // disallows console, use debug
+        "beforeEach",
+        "afterEach",
+        "before",
+        "after",
+        "describe",
+        "it"
+    ]
 }
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,72 @@
 # Changelog

+## 2.39.0
+
+Released 2016-05-05
+
+Announcements:
+ - Upgrades step-profiler to 0.3.0 to avoid dots in json keys #438
+ - Use a more aggressive cache control header for node status endpoint
+
+
+## 2.38.1
+
+Released 2016-05-05
+
+Announcements:
+ - Fixes problem in turbo-carto dependency
+ - Removes console usages
+
+
+## 2.38.0
+
+Released 2016-05-05
+
+Announcements:
+ - Upgrades turbo-carto to [0.7.0](https://github.com/CartoDB/turbo-carto/releases/tag/0.7.0)
+
+
+## 2.37.0
+
+Released 2016-05-03
+
+Announcements:
+ - Upgrades camshaft to [0.6.0](https://github.com/CartoDB/camshaft/releases/tag/0.6.0)
+
+
+## 2.36.1
+
+Released 2016-04-29
+
+Announcements:
+ - Upgrades camshaft to [0.5.1](https://github.com/CartoDB/camshaft/releases/tag/0.5.1)
+
+
+## 2.36.0
+
+Released 2016-04-28
+
+Announcements:
+ - Upgrades windshaft to [1.19.0](https://github.com/CartoDB/Windshaft/releases/tag/1.19.0)
+
+
+## 2.35.0
+
+Released 2016-04-27
+
+Announcements:
+ - Upgrades windshaft to [1.18.0](https://github.com/CartoDB/Windshaft/releases/tag/1.18.0)
+ - Appends columns to layers from associated dataviews
+
+
+## 2.34.1
+
+Released 2016-04-27
+
+Announcements:
+ - Upgrades windshaft to [1.17.3](https://github.com/CartoDB/Windshaft/releases/tag/1.17.3)
+
+
 ## 2.34.0

 Released 2016-04-27
--- a/app.js
+++ b/app.js
@@ -14,6 +14,11 @@ if ( process.argv[2] ) {
    ENVIRONMENT = 'development';
 }

+// jshint undef:false
+var log = console.log.bind(console);
+var logError = console.error.bind(console);
+// jshint undef:true
+
 var availableEnvironments = {
    production: true,
    staging: true,
@@ -22,8 +27,8 @@ var availableEnvironments = {

 // sanity check
 if (!availableEnvironments[ENVIRONMENT]){
-    console.error('node app.js [environment]');
-    console.error('environments: %s', Object.keys(availableEnvironments).join(', '));
+    logError('node app.js [environment]');
+    logError('environments: %s', Object.keys(availableEnvironments).join(', '));
    process.exit(1);
 }

@@ -58,10 +63,10 @@ if ( global.environment.log_filename ) {
  // See cwd inlog4js.configure call below
  logdir = path.resolve(__dirname, logdir);
  if ( ! fs.existsSync(logdir) ) {
-    console.error("Log filename directory does not exist: " + logdir);
+    logError("Log filename directory does not exist: " + logdir);
    process.exit(1);
  }
-  console.log("Logs will be written to " + global.environment.log_filename);
+  log("Logs will be written to " + global.environment.log_filename);
  log4js_config.appenders.push(
    { type: "file", filename: global.environment.log_filename }
  );
@@ -94,7 +99,7 @@ var listener = server.listen(serverOptions.bind.port, serverOptions.bind.host, b
 var version = require("./package").version;

 listener.on('listening', function() {
-    console.log(
+    log(
        "Windshaft tileserver %s started on %s:%s PID=%d (%s)",
        version, serverOptions.bind.host, serverOptions.bind.port, process.pid, ENVIRONMENT
    );
@@ -111,7 +116,7 @@ process.on('SIGHUP', function() {
    global.log4js.clearAndShutdownAppenders(function() {
        global.log4js.configure(log4js_config);
        global.logger = global.log4js.getLogger();
-        console.log('Log files reloaded');
+        log('Log files reloaded');
    });
 });

--- a/lib/cartodb/controllers/layergroup.js
+++ b/lib/cartodb/controllers/layergroup.js
@@ -116,7 +116,10 @@ LayergroupController.prototype.analysisNodeStatus = function(req, res) {
            if (err) {
                self.sendError(req, res, err, 'GET NODE STATUS');
            } else {
-                self.sendResponse(req, res, nodeStatus, 200);
+                self.sendResponse(req, res, nodeStatus, 200, {
+                    'Cache-Control': 'public,max-age=5',
+                    'Last-Modified': new Date().toUTCString()
+                });
            }
        }
    );
--- a/lib/cartodb/models/analysis-mapconfig-adapter.js
+++ b/lib/cartodb/models/analysis-mapconfig-adapter.js
@@ -135,11 +135,15 @@ AnalysisMapConfigAdapter.prototype.getMapConfig = function(analysisConfiguration
        var missingNodesErrors = [];

        requestMapConfig.layers = requestMapConfig.layers.map(function(layer, layerIndex) {
-            if (layer.options.source && layer.options.source.id) {
-                var layerSourceId = layer.options.source.id;
+            if (getLayerSourceId(layer)) {
+                var layerSourceId = getLayerSourceId(layer);
                var layerNode = sourceId2Node[layerSourceId];
                if (layerNode) {
                    layer.options.sql = layerQuery(layerNode.getQuery(), layerNode.getColumns());
+                    var layerDataviews = getLayerDataviews(layer, dataviews);
+                    layer.options.columns = layerDataviews.reduce(function(columns, dataview) {
+                        return columns.concat(getDataviewColumns(dataview));
+                    }, []);
                } else {
                    missingNodesErrors.push(
                        new Error('Missing analysis node.id="' + layerSourceId +'" for layer='+layerIndex)
@@ -159,6 +163,45 @@ AnalysisMapConfigAdapter.prototype.getMapConfig = function(analysisConfiguration
    });
 };

+function getLayerSourceId(layer) {
+    return layer.options.source && layer.options.source.id;
+}
+
+function getDataviewSourceId(dataview) {
+    return dataview.source && dataview.source.id;
+}
+
+function getLayerDataviews(layer, dataviews) {
+    var layerDataviews = [];
+
+    var layerSourceId = getLayerSourceId(layer);
+    if (layerSourceId) {
+        var dataviewsList = getDataviewsList(dataviews);
+        dataviewsList.forEach(function(dataview) {
+            if (getDataviewSourceId(dataview) === layerSourceId) {
+                layerDataviews.push(dataview);
+            }
+        });
+    }
+
+    return layerDataviews;
+}
+
+function getDataviewColumns(dataview) {
+    var columns = [];
+    var options = dataview.options;
+    ['column', 'aggregationColumn'].forEach(function(opt) {
+        if (options.hasOwnProperty(opt)) {
+            columns.push(options[opt]);
+        }
+    });
+    return columns;
+}
+
+function getDataviewsList(dataviews) {
+    return Object.keys(dataviews).map(function(dataviewKey) { return dataviews[dataviewKey]; });
+}
+
 function getDataviewsErrors(dataviews) {
    var errors = [];

--- a/lib/cartodb/server.js
+++ b/lib/cartodb/server.js
@@ -3,6 +3,7 @@ var bodyParser = require('body-parser');
 var RedisPool = require('redis-mpool');
 var cartodbRedis = require('cartodb-redis');
 var _ = require('underscore');
+var debug = require('debug')('windshaft:cartodb');

 var controller = require('./controllers');

@@ -231,7 +232,7 @@ function validateOptions(opts) {

    // Be nice and warn if configured mapnik version is != instaled mapnik version
    if (mapnik.versions.mapnik !== opts.grainstore.mapnik_version) {
-        console.warn('WARNING: detected mapnik version (' + mapnik.versions.mapnik + ')' +
+        debug('WARNING: detected mapnik version (' + mapnik.versions.mapnik + ')' +
            ' != configured mapnik version (' + opts.grainstore.mapnik_version + ')');
    }
 }
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
  "name": "windshaft-cartodb",
-  "version": "2.34.0",
+  "version": "2.39.0",
  "dependencies": {
    "body-parser": {
      "version": "1.14.2",
@@ -34,7 +34,7 @@
            },
            "statuses": {
              "version": "1.2.1",
-              "from": "statuses@>=1.0.0 <2.0.0",
+              "from": "statuses@>=1.2.1 <1.3.0",
              "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz"
            }
          }
@@ -80,7 +80,7 @@
        },
        "type-is": {
          "version": "1.6.12",
-          "from": "type-is@>=1.6.10 <1.7.0",
+          "from": "type-is@>=1.6.6 <1.7.0",
          "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.12.tgz",
          "dependencies": {
            "media-typer": {
@@ -89,14 +89,14 @@
              "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"
            },
            "mime-types": {
-              "version": "2.1.10",
-              "from": "mime-types@>=2.1.2 <2.2.0",
-              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz",
+              "version": "2.1.11",
+              "from": "mime-types@>=2.1.10 <2.2.0",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz",
              "dependencies": {
                "mime-db": {
-                  "version": "1.22.0",
-                  "from": "mime-db@>=1.22.0 <1.23.0",
-                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.22.0.tgz"
+                  "version": "1.23.0",
+                  "from": "mime-db@>=1.23.0 <1.24.0",
+                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz"
                }
              }
            }
@@ -105,9 +105,9 @@
      }
    },
    "camshaft": {
-      "version": "0.5.0",
-      "from": "camshaft@0.5.0",
-      "resolved": "https://registry.npmjs.org/camshaft/-/camshaft-0.5.0.tgz",
+      "version": "0.6.0",
+      "from": "camshaft@0.6.0",
+      "resolved": "https://registry.npmjs.org/camshaft/-/camshaft-0.6.0.tgz",
      "dependencies": {
        "async": {
          "version": "1.5.2",
@@ -174,9 +174,9 @@
                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
                    },
                    "process-nextick-args": {
-                      "version": "1.0.6",
+                      "version": "1.0.7",
                      "from": "process-nextick-args@>=1.0.6 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
+                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"
                    },
                    "string_decoder": {
                      "version": "0.10.31",
@@ -395,9 +395,9 @@
                  }
                },
                "sshpk": {
-                  "version": "1.8.2",
+                  "version": "1.8.3",
                  "from": "sshpk@>=1.7.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.8.2.tgz",
+                  "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.8.3.tgz",
                  "dependencies": {
                    "asn1": {
                      "version": "0.2.3",
@@ -415,9 +415,9 @@
                      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.13.1.tgz"
                    },
                    "getpass": {
-                      "version": "0.1.5",
+                      "version": "0.1.6",
                      "from": "getpass@>=0.1.1 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.5.tgz"
+                      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz"
                    },
                    "jsbn": {
                      "version": "0.1.0",
@@ -459,14 +459,14 @@
              "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
            },
            "mime-types": {
-              "version": "2.1.10",
+              "version": "2.1.11",
              "from": "mime-types@>=2.1.7 <2.2.0",
-              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz",
              "dependencies": {
                "mime-db": {
-                  "version": "1.22.0",
-                  "from": "mime-db@>=1.22.0 <1.23.0",
-                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.22.0.tgz"
+                  "version": "1.23.0",
+                  "from": "mime-db@>=1.23.0 <1.24.0",
+                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz"
                }
              }
            },
@@ -476,9 +476,9 @@
              "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
            },
            "oauth-sign": {
-              "version": "0.8.1",
+              "version": "0.8.2",
              "from": "oauth-sign@>=0.8.1 <0.9.0",
-              "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.1.tgz"
+              "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"
            },
            "qs": {
              "version": "6.1.0",
@@ -496,9 +496,9 @@
              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz"
            },
            "tunnel-agent": {
-              "version": "0.4.2",
+              "version": "0.4.3",
              "from": "tunnel-agent@>=0.4.1 <0.5.0",
-              "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.2.tgz"
+              "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"
            }
          }
        }
@@ -602,14 +602,14 @@
          "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz",
          "dependencies": {
            "mime-types": {
-              "version": "2.1.10",
+              "version": "2.1.11",
              "from": "mime-types@>=2.1.6 <2.2.0",
-              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz",
              "dependencies": {
                "mime-db": {
-                  "version": "1.22.0",
-                  "from": "mime-db@>=1.22.0 <1.23.0",
-                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.22.0.tgz"
+                  "version": "1.23.0",
+                  "from": "mime-db@>=1.23.0 <1.24.0",
+                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz"
                }
              }
            },
@@ -667,7 +667,7 @@
          "dependencies": {
            "unpipe": {
              "version": "1.0.0",
-              "from": "unpipe@>=1.0.0 <1.1.0",
+              "from": "unpipe@1.0.0",
              "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"
            }
          }
@@ -782,7 +782,7 @@
        },
        "type-is": {
          "version": "1.6.12",
-          "from": "type-is@>=1.6.10 <1.7.0",
+          "from": "type-is@>=1.6.6 <1.7.0",
          "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.12.tgz",
          "dependencies": {
            "media-typer": {
@@ -791,14 +791,14 @@
              "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"
            },
            "mime-types": {
-              "version": "2.1.10",
+              "version": "2.1.11",
              "from": "mime-types@>=2.1.6 <2.2.0",
-              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz",
              "dependencies": {
                "mime-db": {
-                  "version": "1.22.0",
-                  "from": "mime-db@>=1.22.0 <1.23.0",
-                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.22.0.tgz"
+                  "version": "1.23.0",
+                  "from": "mime-db@>=1.23.0 <1.24.0",
+                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz"
                }
              }
            }
@@ -955,9 +955,9 @@
                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
                },
                "process-nextick-args": {
-                  "version": "1.0.6",
+                  "version": "1.0.7",
                  "from": "process-nextick-args@>=1.0.6 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
+                  "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"
                },
                "string_decoder": {
                  "version": "0.10.31",
@@ -995,7 +995,7 @@
          "dependencies": {
            "async": {
              "version": "1.5.2",
-              "from": "async@>=1.5.2 <2.0.0",
+              "from": "async@>=1.0.0 <2.0.0",
              "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz"
            }
          }
@@ -1006,14 +1006,14 @@
          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
        },
        "mime-types": {
-          "version": "2.1.10",
+          "version": "2.1.11",
          "from": "mime-types@>=2.1.2 <2.2.0",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz",
          "dependencies": {
            "mime-db": {
-              "version": "1.22.0",
-              "from": "mime-db@>=1.22.0 <1.23.0",
-              "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.22.0.tgz"
+              "version": "1.23.0",
+              "from": "mime-db@>=1.23.0 <1.24.0",
+              "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz"
            }
          }
        },
@@ -1028,9 +1028,9 @@
          "resolved": "https://registry.npmjs.org/qs/-/qs-5.1.0.tgz"
        },
        "tunnel-agent": {
-          "version": "0.4.2",
+          "version": "0.4.3",
          "from": "tunnel-agent@>=0.4.0 <0.5.0",
-          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.2.tgz"
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"
        },
        "tough-cookie": {
          "version": "2.2.2",
@@ -1060,9 +1060,9 @@
          }
        },
        "oauth-sign": {
-          "version": "0.8.1",
+          "version": "0.8.2",
          "from": "oauth-sign@>=0.8.0 <0.9.0",
-          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.1.tgz"
+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"
        },
        "hawk": {
          "version": "3.1.3",
@@ -1230,20 +1230,24 @@
      "resolved": "https://registry.npmjs.org/step/-/step-0.0.6.tgz"
    },
    "step-profiler": {
-      "version": "0.2.1",
-      "from": "step-profiler@>=0.2.1 <0.3.0",
-      "resolved": "https://registry.npmjs.org/step-profiler/-/step-profiler-0.2.1.tgz"
+      "version": "0.3.0",
+      "from": "step-profiler@>=0.3.0 <0.4.0"
    },
    "turbo-carto": {
-      "version": "0.6.0",
-      "from": "turbo-carto@0.6.0",
-      "resolved": "https://registry.npmjs.org/turbo-carto/-/turbo-carto-0.6.0.tgz",
+      "version": "0.7.1",
+      "from": "turbo-carto@0.7.1",
+      "resolved": "https://registry.npmjs.org/turbo-carto/-/turbo-carto-0.7.1.tgz",
      "dependencies": {
        "colorbrewer": {
          "version": "1.0.0",
          "from": "colorbrewer@1.0.0",
          "resolved": "https://registry.npmjs.org/colorbrewer/-/colorbrewer-1.0.0.tgz"
        },
+        "cartocolor": {
+          "version": "1.0.2",
+          "from": "cartocolor@1.0.2",
+          "resolved": "https://registry.npmjs.org/cartocolor/-/cartocolor-1.0.2.tgz"
+        },
        "es6-promise": {
          "version": "3.1.2",
          "from": "es6-promise@3.1.2",
@@ -1267,9 +1271,9 @@
              }
            },
            "source-map": {
-              "version": "0.5.5",
+              "version": "0.5.6",
              "from": "source-map@>=0.5.1 <0.6.0",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.5.tgz"
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
            },
            "js-base64": {
              "version": "2.1.9",
@@ -1291,9 +1295,9 @@
      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
    },
    "windshaft": {
-      "version": "1.17.2",
-      "from": "windshaft@1.17.2",
-      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-1.17.2.tgz",
+      "version": "1.19.0",
+      "from": "windshaft@1.19.0",
+      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-1.19.0.tgz",
      "dependencies": {
        "abaculus": {
          "version": "1.1.0-cdb4",
@@ -1314,8 +1318,8 @@
        },
        "carto": {
          "version": "0.15.1-cdb1",
-          "from": "https://github.com/CartoDB/carto/tarball/0.15.1-cdb1",
-          "resolved": "https://github.com/CartoDB/carto/tarball/0.15.1-cdb1",
+          "from": "https://github.com/CartoDB/carto/tarball/0.15.1-cdb2",
+          "resolved": "https://github.com/CartoDB/carto/tarball/0.15.1-cdb2",
          "dependencies": {
            "mapnik-reference": {
              "version": "6.0.5",
--- a/package.json
+++ b/package.json
@@ -1,61 +1,61 @@
 {
-    "private": true,
-    "name": "windshaft-cartodb",
-    "version": "2.34.0",
-    "description": "A map tile server for CartoDB",
-    "keywords": [
-      "cartodb"
-    ],
-    "url": "https://github.com/CartoDB/Windshaft-cartodb",
-    "license": "BSD-3-Clause",
-    "repository": {
-        "type": "git",
-        "url": "git://github.com/CartoDB/Windshaft-cartodb.git"
-    },
-    "author": "Vizzuality <contact@vizzuality.com> (http://vizzuality.com)",
-    "contributors": [
-      "Simon Tokumine <simon@vizzuality.com>",
-      "Javi Santana <jsantana@vizzuality.com>",
-      "Sandro Santilli <strk@vizzuality.com>"
-    ],
-    "dependencies": {
-        "express": "~4.13.3",
-        "body-parser": "~1.14.0",
-        "debug": "~2.2.0",
-        "step-profiler": "~0.2.1",
-        "node-statsd": "~0.0.7",
-        "underscore"  : "~1.6.0",
-        "dot": "~1.0.2",
-        "windshaft": "1.17.2",
-        "step": "~0.0.6",
-        "queue-async": "~1.0.7",
-        "request": "~2.62.0",
-        "cartodb-redis": "~0.13.0",
-        "cartodb-psql": "~0.6.1",
-        "camshaft": "0.5.0",
-        "fastly-purge": "~1.0.1",
-        "redis-mpool": "~0.4.0",
-        "lru-cache": "2.6.5",
-        "lzma": "~1.3.7",
-        "log4js": "https://github.com/CartoDB/log4js-node/tarball/cdb",
-        "cartodb-query-tables": "~0.1.0",
-        "turbo-carto": "0.6.0"
-    },
-    "devDependencies": {
-        "istanbul": "~0.3.6",
-        "mocha": "~1.21.4",
-        "nock": "~2.11.0",
-        "jshint": "~2.6.0",
-        "redis": "~0.8.6",
-        "strftime": "~0.8.2",
-        "semver": "~1.1.4"
-    },
-    "scripts": {
-        "preinstall": "make pre-install",
-        "test": "make test-all"
-    },
-    "engines": {
-        "node": ">=0.8 <0.11",
-        "npm": ">=2.14.16"
-    }
+  "private": true,
+  "name": "windshaft-cartodb",
+  "version": "2.39.0",
+  "description": "A map tile server for CartoDB",
+  "keywords": [
+    "cartodb"
+  ],
+  "url": "https://github.com/CartoDB/Windshaft-cartodb",
+  "license": "BSD-3-Clause",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/CartoDB/Windshaft-cartodb.git"
+  },
+  "author": "Vizzuality <contact@vizzuality.com> (http://vizzuality.com)",
+  "contributors": [
+    "Simon Tokumine <simon@vizzuality.com>",
+    "Javi Santana <jsantana@vizzuality.com>",
+    "Sandro Santilli <strk@vizzuality.com>"
+  ],
+  "dependencies": {
+    "body-parser": "~1.14.0",
+    "camshaft": "0.6.0",
+    "cartodb-psql": "~0.6.1",
+    "cartodb-query-tables": "~0.1.0",
+    "cartodb-redis": "~0.13.0",
+    "debug": "~2.2.0",
+    "dot": "~1.0.2",
+    "express": "~4.13.3",
+    "fastly-purge": "~1.0.1",
+    "log4js": "https://github.com/CartoDB/log4js-node/tarball/cdb",
+    "lru-cache": "2.6.5",
+    "lzma": "~1.3.7",
+    "node-statsd": "~0.0.7",
+    "queue-async": "~1.0.7",
+    "redis-mpool": "~0.4.0",
+    "request": "~2.62.0",
+    "step": "~0.0.6",
+    "step-profiler": "~0.3.0",
+    "turbo-carto": "0.7.1",
+    "underscore": "~1.6.0",
+    "windshaft": "1.19.0"
+  },
+  "devDependencies": {
+    "istanbul": "~0.4.3",
+    "jshint": "~2.6.0",
+    "mocha": "~1.21.4",
+    "nock": "~2.11.0",
+    "redis": "~0.8.6",
+    "semver": "~1.1.4",
+    "strftime": "~0.8.2"
+  },
+  "scripts": {
+    "preinstall": "make pre-install",
+    "test": "make test-all"
+  },
+  "engines": {
+    "node": ">=0.8 <0.11",
+    "npm": ">=2.14.16"
+  }
 }
--- a/test/acceptance/analysis/analysis-layers-geojson.js
+++ b/test/acceptance/analysis/analysis-layers-geojson.js
@@ -0,0 +1,81 @@
+require('../../support/test_helper');
+
+var assert = require('../../support/assert');
+var TestClient = require('../../support/test-client');
+
+describe('analysis-layers-dataviews-geojson', function() {
+
+    function createMapConfig(layers, dataviews, analysis) {
+        return {
+            version: '1.5.0',
+            layers: layers,
+            dataviews: dataviews || {},
+            analyses: analysis || []
+        };
+    }
+
+    var CARTOCSS = [
+        "#points {",
+        "  marker-fill-opacity: 1.0;",
+        "  marker-line-color: #FFF;",
+        "  marker-line-width: 0.5;",
+        "  marker-line-opacity: 1.0;",
+        "  marker-placement: point;",
+        "  marker-type: ellipse;",
+        "  marker-width: 8;",
+        "  marker-fill: red;",
+        "  marker-allow-overlap: true;",
+        "}"
+    ].join('\n');
+
+    var mapConfig = createMapConfig(
+        [
+            {
+                "type": "cartodb",
+                "options": {
+                    "source": {
+                        "id": "2570e105-7b37-40d2-bdf4-1af889598745"
+                    },
+                    "cartocss": CARTOCSS,
+                    "cartocss_version": "2.3.0"
+                }
+            }
+        ],
+        {
+            pop_max_histogram: {
+                source: {
+                    id: '2570e105-7b37-40d2-bdf4-1af889598745'
+                },
+                type: 'histogram',
+                options: {
+                    column: 'pop_max'
+                }
+            }
+        },
+        [
+            {
+                "id": "2570e105-7b37-40d2-bdf4-1af889598745",
+                "type": "source",
+                "params": {
+                    "query": "select * from populated_places_simple_reduced"
+                }
+            }
+        ]
+    );
+
+    it('should get pop_max column from dataview', function(done) {
+        var testClient = new TestClient(mapConfig, 1234);
+
+        testClient.getTile(0, 0, 0, {format: 'geojson', layers: 0}, function(err, res, geojson) {
+            assert.ok(!err, err);
+
+            assert.ok(Array.isArray(geojson.features));
+            assert.ok(geojson.features.length > 0);
+            var feature = geojson.features[0];
+            assert.ok(feature.properties.hasOwnProperty('pop_max'), 'Missing pop_max property');
+
+            testClient.drain(done);
+        });
+    });
+
+});
--- a/test/acceptance/analysis/analysis-layers-use-cases.js
+++ b/test/acceptance/analysis/analysis-layers-use-cases.js
@@ -3,6 +3,7 @@ require('../../support/test_helper');
 var assert = require('../../support/assert');
 var TestClient = require('../../support/test-client');
 var dot = require('dot');
+var debug = require('debug')('windshaft:cartodb:test');

 describe('analysis-layers use cases', function() {

@@ -649,7 +650,7 @@ describe('analysis-layers use cases', function() {

    useCases.forEach(function(useCase, imageIdx) {
        if (!!useCase.skip) {
-            console.log(JSON.stringify(useCase.mapConfig, null, 4));
+            debug(JSON.stringify(useCase.mapConfig, null, 4));
        }
        it.skip('should implement use case: "' + useCase.desc + '"', function(done) {

--- a/test/acceptance/analysis/analysis-layers.js
+++ b/test/acceptance/analysis/analysis-layers.js
@@ -213,4 +213,118 @@ describe('analysis-layers', function() {
            testClient.drain(done);
        });
    });
+
+    it('should have analysis metadata when dataviews point to source node', function(done) {
+        var useCase = {
+            desc: 'basic source-id mapnik layer',
+            fixture: 'basic-source-id-mapnik-layer.png',
+            mapConfig: mapConfig(
+                [
+                    {
+                        "type": "cartodb",
+                        "options": {
+                            "sql": "select * from populated_places_simple_reduced",
+                            "cartocss": DEFAULT_MULTITYPE_STYLE,
+                            "cartocss_version": "2.3.0"
+                        }
+                    },
+                    {
+                        "type": "cartodb",
+                        "options": {
+                            "source": {
+                                "id": "2570e105-7b37-40d2-bdf4-1af889598745"
+                            },
+                            "cartocss": DEFAULT_MULTITYPE_STYLE,
+                            "cartocss_version": "2.3.0"
+                        }
+                    },
+                    {
+                        "type": "cartodb",
+                        "options": {
+                            "sql": "select * from populated_places_simple_reduced",
+                            "cartocss": DEFAULT_MULTITYPE_STYLE,
+                            "cartocss_version": "2.3.0"
+                        }
+                    }
+                ],
+                {
+                    pop_max_histogram: {
+                        source: {
+                            id: '2570e105-7b37-40d2-bdf4-1af889598745'
+                        },
+                        type: 'histogram',
+                        options: {
+                            column: 'pop_max'
+                        }
+                    },
+                    scalerank_histogram: {
+                        source: {
+                            id: '2570e105-7b37-40d2-bdf4-1af889598745'
+                        },
+                        type: 'histogram',
+                        options: {
+                            column: 'scalerank'
+                        }
+                    }
+                },
+                [
+                    {
+                        "id": "2570e105-7b37-40d2-bdf4-1af889598745",
+                        "type": "source",
+                        "params": {
+                            "query": "select * from populated_places_simple_reduced"
+                        }
+                    }
+                ]
+            )
+        };
+
+        var testClient = new TestClient(useCase.mapConfig, 1234);
+
+        testClient.getLayergroup(function(err, layergroupResult) {
+            assert.ok(!err, err);
+
+            assert.ok(
+                Array.isArray(layergroupResult.metadata.analyses),
+                    'Missing "analyses" array metadata from: ' + JSON.stringify(layergroupResult)
+            );
+            var analyses = layergroupResult.metadata.analyses;
+            assert.equal(analyses.length, 1, 'Invalid number of analyses in metadata');
+            var nodes = analyses[0].nodes;
+
+            var nodesIds = Object.keys(nodes);
+            assert.deepEqual(nodesIds, ['2570e105-7b37-40d2-bdf4-1af889598745']);
+            nodesIds.forEach(function(nodeId) {
+                var node = nodes[nodeId];
+                assert.ok(node.hasOwnProperty('url'), 'Missing "url" attribute in node');
+                assert.ok(node.hasOwnProperty('status'), 'Missing "status" attribute in node');
+                assert.ok(node.hasOwnProperty('query'), 'Missing "status" attribute in node');
+            });
+
+            testClient.drain(done);
+        });
+    });
+
+    it('should response with custom cache headers for node status endpoints', function(done) {
+        var useCase = useCases[1];
+
+        // No API key here
+        var testClient = new TestClient(useCase.mapConfig, 1234);
+
+        testClient.getNodeStatus('HEAD', function(err, response, nodeStatus) {
+            assert.ok(!err, err);
+
+            assert.equal(nodeStatus.status, 'ready');
+
+            var headers = response.headers;
+
+            assert.equal(headers['cache-control'], 'public,max-age=5');
+
+            var lastModified = new Date(headers['last-modified']);
+            var tenSecondsInMs = 1e5;
+            assert.ok(Date.now() - lastModified.getTime() < tenSecondsInMs);
+
+            testClient.drain(done);
+        });
+    });
 });
--- a/test/support/test-client.js
+++ b/test/support/test-client.js
@@ -2,6 +2,7 @@

 var qs = require('querystring');
 var step = require('step');
+var urlParser = require('url');

 var mapnik = require('windshaft').mapnik;

@@ -313,13 +314,15 @@ TestClient.prototype.getTile = function(z, x, y, params, callback) {
            assert.response(server, request, expectedResponse, function(res, err) {
                assert.ifError(err);

-                var image;
+                var obj;

                if (isPng) {
-                    image = mapnik.Image.fromBytes(new Buffer(res.body, 'binary'));
+                    obj = mapnik.Image.fromBytes(new Buffer(res.body, 'binary'));
+                } else {
+                    obj = JSON.parse(res.body);
                }

-                next(null, res, image);
+                next(null, res, obj);
            });
        },
        function finish(err, res, image) {
@@ -377,6 +380,94 @@ TestClient.prototype.getLayergroup = function(expectedResponse, callback) {
    );
 };

+TestClient.prototype.getNodeStatus = function(nodeName, callback) {
+    var self = this;
+
+    var url = '/api/v1/map';
+
+    if (this.apiKey) {
+        url += '?' + qs.stringify({api_key: this.apiKey});
+    }
+
+    var layergroupId;
+    var nodes = {};
+    step(
+        function createLayergroup() {
+            var next = this;
+            assert.response(server,
+                {
+                    url: url,
+                    method: 'POST',
+                    headers: {
+                        host: 'localhost',
+                        'Content-Type': 'application/json'
+                    },
+                    data: JSON.stringify(self.mapConfig)
+                },
+                {
+                    status: 200,
+                    headers: {
+                        'Content-Type': 'application/json; charset=utf-8'
+                    }
+                },
+                function(res, err) {
+                    if (err) {
+                        return next(err);
+                    }
+                    var parsedBody = JSON.parse(res.body);
+
+                    nodes = parsedBody.metadata.analyses.reduce(function(nodes, analysis) {
+                        return Object.keys(analysis.nodes).reduce(function(nodes, nodeName) {
+                            var node = analysis.nodes[nodeName];
+                            nodes[nodeName] = node.url.http;
+                            return nodes;
+                        }, nodes);
+                    }, nodes);
+
+                    return next(null, parsedBody.layergroupid);
+                }
+            );
+        },
+        function getNodeStatusResult(err, _layergroupId) {
+            assert.ifError(err);
+
+            var next = this;
+            layergroupId = _layergroupId;
+
+            url = urlParser.parse(nodes[nodeName]).path;
+
+            if (self.apiKey) {
+                url += '?' + qs.stringify({api_key: self.apiKey});
+            }
+
+            var request = {
+                url: url,
+                method: 'GET',
+                headers: {
+                    host: 'localhost'
+                }
+            };
+
+            var expectedResponse = {
+                status: 200,
+                headers: {
+                    'Content-Type': 'application/json; charset=utf-8'
+                }
+            };
+
+            assert.response(server, request, expectedResponse, function(res, err) {
+                assert.ifError(err);
+                next(null, res, JSON.parse(res.body));
+            });
+        },
+        function finish(err, res, image) {
+            self.keysToDelete['map_cfg|' + LayergroupToken.parse(layergroupId).token] = 0;
+            self.keysToDelete['user:localhost:mapviews:global'] = 5;
+            return callback(err, res, image);
+        }
+    );
+};
+
 TestClient.prototype.drain = function(callback) {
    helper.deleteRedisKeys(this.keysToDelete, callback);
 };
Author	SHA1	Message	Date
Raul Ochoa	778860c81f	Release 2.39.0	2016-05-05 18:09:44 +02:00
Raul Ochoa	ee3c56efba	Update news	2016-05-05 18:09:15 +02:00
Raul Ochoa	5dc328724a	Merge pull request #440 from CartoDB/node-status-cache-control-header Use a more aggressive cache control header for node status endpoint	2016-05-05 18:07:16 +02:00
Raul Ochoa	c77ea49594	Use a more aggressive cache control header for node status endpoint	2016-05-05 17:52:37 +02:00
Raul Ochoa	73aa159b98	Upgrade istanbul	2016-05-05 16:06:52 +02:00
Raul Ochoa	b7d7cffb67	Reformat package.json with npm cli tool	2016-05-05 16:05:46 +02:00
Raul Ochoa	eba8db292c	Merge pull request #439 from CartoDB/avoid-profiler-dots Upgrades step-profiler to 0.3.0 to avoid dots in json keys	2016-05-05 15:41:30 +02:00
Raul Ochoa	d5391ef15b	Merge remote-tracking branch 'origin/master' into avoid-profiler-dots Conflicts: NEWS.md	2016-05-05 15:30:12 +02:00
Francisco Dans	685cbb1eec	updates news	2016-05-05 14:34:19 +02:00
Francisco Dans	5842a239fd	shrinkwrap	2016-05-05 14:32:57 +02:00
Francisco Dans	285363aa40	bumps current version and turbocarto's	2016-05-05 14:32:11 +02:00
Raul Ochoa	92e130d8de	Upgrades step-profiler to 0.3.0 to avoid dots in json keys Closes #438	2016-05-05 13:45:25 +02:00
Francisco Dans	f674f90eba	Merge branch 'master' of github.com:CartoDB/Windshaft-cartodb	2016-05-05 12:28:01 +02:00
Francisco Dans	0542b65cbb	shrinkwrap changes for 2.38.0	2016-05-05 12:26:12 +02:00
Francisco Dans	60fa94781e	adds upgrade to NEWS	2016-05-05 12:25:12 +02:00
Raul Ochoa	38d57533c2	Discourage console usage, global.logger should be used when required	2016-05-05 12:18:22 +02:00
Raul Ochoa	e3d6da06a7	Remove console usage	2016-05-05 12:17:51 +02:00
Raul Ochoa	3af05bb734	Remove console usage	2016-05-05 12:17:33 +02:00
Francisco Dans	ffd58cc7ca	bumps minor	2016-05-05 12:07:26 +02:00
Francisco Dans	e103c52d27	upgrades turbo carto	2016-05-05 12:04:14 +02:00
Daniel García Aubert	00a71af95d	Stubs next version	2016-05-03 17:58:47 +02:00
Daniel García Aubert	2fb8036740	Release 2.37.0	2016-05-03 17:53:08 +02:00
Daniel García Aubert	6902a8c9b3	Upgraded camashaft version to 0.6.0	2016-05-03 17:46:38 +02:00
Raul Ochoa	c19a345f6c	Stubs next version	2016-04-29 12:54:47 +02:00
Raul Ochoa	bdc3ecff5a	Release 2.36.1	2016-04-29 12:53:58 +02:00
Raul Ochoa	6c4ec29e18	Add test to validate new behaviour in camshaft 0.5.1	2016-04-29 12:51:48 +02:00
Raul Ochoa	412712e62e	Upgrades camshaft to 0.5.1	2016-04-29 12:51:39 +02:00
Raul Ochoa	0edcb30f75	Stubs next version	2016-04-28 18:46:49 +02:00
Raul Ochoa	c0f49b3acb	Release 2.36.0	2016-04-28 18:45:51 +02:00
Raul Ochoa	b926244085	Upgrades windshaft to 1.19.0	2016-04-28 17:30:57 +02:00
Raul Ochoa	d21136b475	Stubs next version	2016-04-27 18:44:47 +02:00
Raul Ochoa	8788aaaf25	Release 2.35.0	2016-04-27 18:43:50 +02:00
Raul Ochoa	120e800089	Bump version and update news	2016-04-27 18:42:56 +02:00
Raul Ochoa	92dc4b148c	Merge pull request #432 from CartoDB/dataviews-columns Append dataviews related columns to layers	2016-04-27 18:40:33 +02:00
Raul Ochoa	755dfe6822	Append dataviews related columns to layers	2016-04-27 18:30:05 +02:00
Daniel García Aubert	b787ee1033	Stubs next version	2016-04-27 15:12:13 +02:00
Daniel García Aubert	9ee3612da0	Release 2.34.1	2016-04-27 15:09:13 +02:00
Daniel García Aubert	fe0b0a9c50	Upgraded windshaft to 1.17.3	2016-04-27 15:05:45 +02:00
Raul Ochoa	dea19f20dd	Stubs next version	2016-04-27 10:24:16 +02:00