Release 2.4.1

Update news
Merge pull request #302 from CartoDB/upgrade-windshaft
2015-06-01 15:49:30 +02:00 · 2015-06-01 15:46:32 +02:00 · 2015-06-01 14:28:28 +02:00 · 2015-06-01 14:19:49 +02:00 · 2015-06-01 12:20:44 +02:00 · 2015-06-01 11:35:57 +02:00
4 changed files with 172 additions and 61 deletions
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,21 @@
 # Changelog

+## 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
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
  "name": "windshaft-cartodb",
-  "version": "2.3.0",
+  "version": "2.4.1",
  "dependencies": {
    "cartodb-psql": {
      "version": "0.4.0",
@@ -76,9 +76,9 @@
      "from": "fastly-purge@~1.0.0",
      "dependencies": {
        "request": {
-          "version": "2.55.0",
+          "version": "2.57.0",
          "from": "request@^2.55.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.55.0.tgz",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.57.0.tgz",
          "dependencies": {
            "bl": {
              "version": "0.9.4",
@@ -114,9 +114,9 @@
              }
            },
            "caseless": {
-              "version": "0.9.0",
-              "from": "caseless@~0.9.0",
-              "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.9.0.tgz"
+              "version": "0.10.0",
+              "from": "caseless@~0.10.0",
+              "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.10.0.tgz"
            },
            "forever-agent": {
              "version": "0.6.1",
@@ -129,26 +129,38 @@
              "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
              "dependencies": {
                "async": {
-                  "version": "0.9.0",
+                  "version": "0.9.2",
                  "from": "async@~0.9.0",
-                  "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
+                  "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
+                },
+                "combined-stream": {
+                  "version": "0.0.7",
+                  "from": "combined-stream@~0.0.4",
+                  "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+                  "dependencies": {
+                    "delayed-stream": {
+                      "version": "0.0.5",
+                      "from": "delayed-stream@0.0.5",
+                      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
+                    }
+                  }
                }
              }
            },
            "json-stringify-safe": {
-              "version": "5.0.0",
+              "version": "5.0.1",
              "from": "json-stringify-safe@~5.0.0",
-              "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
+              "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
            },
            "mime-types": {
-              "version": "2.0.11",
+              "version": "2.0.13",
              "from": "mime-types@~2.0.1",
-              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.11.tgz",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.13.tgz",
              "dependencies": {
                "mime-db": {
-                  "version": "1.9.1",
-                  "from": "mime-db@~1.9.1",
-                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.9.1.tgz"
+                  "version": "1.11.0",
+                  "from": "mime-db@~1.11.0",
+                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.11.0.tgz"
                }
              }
            },
@@ -158,9 +170,9 @@
              "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
            },
            "qs": {
-              "version": "2.4.2",
-              "from": "qs@~2.4.0",
-              "resolved": "https://registry.npmjs.org/qs/-/qs-2.4.2.tgz"
+              "version": "3.1.0",
+              "from": "qs@~3.1.0",
+              "resolved": "https://registry.npmjs.org/qs/-/qs-3.1.0.tgz"
            },
            "tunnel-agent": {
              "version": "0.4.0",
@@ -168,14 +180,14 @@
              "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
            },
            "tough-cookie": {
-              "version": "1.1.0",
+              "version": "1.2.0",
              "from": "tough-cookie@>=0.12.0",
-              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-1.1.0.tgz"
+              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-1.2.0.tgz"
            },
            "http-signature": {
-              "version": "0.10.1",
-              "from": "http-signature@~0.10.0",
-              "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
+              "version": "0.11.0",
+              "from": "http-signature@~0.11.0",
+              "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz",
              "dependencies": {
                "assert-plus": {
                  "version": "0.1.5",
@@ -195,9 +207,9 @@
              }
            },
            "oauth-sign": {
-              "version": "0.6.0",
-              "from": "oauth-sign@~0.6.0",
-              "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.6.0.tgz"
+              "version": "0.8.0",
+              "from": "oauth-sign@~0.8.0",
+              "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz"
            },
            "hawk": {
              "version": "2.3.1",
@@ -205,14 +217,14 @@
              "resolved": "https://registry.npmjs.org/hawk/-/hawk-2.3.1.tgz",
              "dependencies": {
                "hoek": {
-                  "version": "2.13.0",
+                  "version": "2.14.0",
                  "from": "hoek@2.x.x",
-                  "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.13.0.tgz"
+                  "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz"
                },
                "boom": {
-                  "version": "2.7.1",
+                  "version": "2.7.2",
                  "from": "boom@2.x.x",
-                  "resolved": "https://registry.npmjs.org/boom/-/boom-2.7.1.tgz"
+                  "resolved": "https://registry.npmjs.org/boom/-/boom-2.7.2.tgz"
                },
                "cryptiles": {
                  "version": "2.0.4",
@@ -237,14 +249,14 @@
              "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
            },
            "combined-stream": {
-              "version": "0.0.7",
-              "from": "combined-stream@~0.0.5",
-              "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+              "version": "1.0.3",
+              "from": "combined-stream@~1.0.1",
+              "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.3.tgz",
              "dependencies": {
                "delayed-stream": {
-                  "version": "0.0.5",
-                  "from": "delayed-stream@0.0.5",
-                  "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
+                  "version": "1.0.0",
+                  "from": "delayed-stream@^1.0.0",
+                  "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
                }
              }
            },
@@ -254,14 +266,14 @@
              "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
            },
            "har-validator": {
-              "version": "1.7.0",
-              "from": "har-validator@^1.4.0",
-              "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.7.0.tgz",
+              "version": "1.7.1",
+              "from": "har-validator@^1.6.1",
+              "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.7.1.tgz",
              "dependencies": {
                "bluebird": {
-                  "version": "2.9.25",
-                  "from": "bluebird@^2.9.25",
-                  "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.25.tgz"
+                  "version": "2.9.27",
+                  "from": "bluebird@^2.9.26",
+                  "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.27.tgz"
                },
                "chalk": {
                  "version": "1.0.0",
@@ -302,7 +314,7 @@
                      "dependencies": {
                        "ansi-regex": {
                          "version": "1.1.1",
-                          "from": "ansi-regex@^1.0.0",
+                          "from": "ansi-regex@1.1.1",
                          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
                        }
                      }
@@ -328,7 +340,7 @@
                },
                "is-my-json-valid": {
                  "version": "2.12.0",
-                  "from": "is-my-json-valid@^2.10.1",
+                  "from": "is-my-json-valid@^2.12.0",
                  "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.0.tgz",
                  "dependencies": {
                    "generate-function": {
@@ -464,9 +476,9 @@
      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
    },
    "windshaft": {
-      "version": "0.43.0",
-      "from": "windshaft@0.43.0",
-      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-0.43.0.tgz",
+      "version": "0.44.1",
+      "from": "windshaft@0.44.1",
+      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-0.44.1.tgz",
      "dependencies": {
        "chronograph": {
          "version": "0.1.0",
@@ -579,9 +591,9 @@
                      "resolved": "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz"
                    },
                    "json-stringify-safe": {
-                      "version": "5.0.0",
+                      "version": "5.0.1",
                      "from": "json-stringify-safe@~5.0.0",
-                      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
+                      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
                    },
                    "forever-agent": {
                      "version": "0.5.2",
@@ -594,9 +606,9 @@
                      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
                    },
                    "tough-cookie": {
-                      "version": "1.1.0",
+                      "version": "1.2.0",
                      "from": "tough-cookie@>=0.12.0",
-                      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-1.1.0.tgz"
+                      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-1.2.0.tgz"
                    },
                    "form-data": {
                      "version": "0.1.4",
@@ -616,9 +628,9 @@
                          }
                        },
                        "async": {
-                          "version": "0.9.0",
+                          "version": "0.9.2",
                          "from": "async@~0.9.0",
-                          "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
+                          "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
                        }
                      }
                    },
@@ -2817,16 +2829,16 @@
                  "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
                },
                "async": {
-                  "version": "0.9.0",
+                  "version": "0.9.2",
                  "from": "async@~0.9.0",
-                  "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
+                  "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
                }
              }
            },
            "json-stringify-safe": {
-              "version": "5.0.0",
+              "version": "5.0.1",
              "from": "json-stringify-safe@~5.0.0",
-              "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
+              "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
            },
            "mime-types": {
              "version": "1.0.2",
@@ -2849,9 +2861,9 @@
              "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
            },
            "tough-cookie": {
-              "version": "1.1.0",
+              "version": "1.2.0",
              "from": "tough-cookie@>=0.12.0",
-              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-1.1.0.tgz"
+              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-1.2.0.tgz"
            },
            "http-signature": {
              "version": "0.10.1",
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
    "private": true,
    "name": "windshaft-cartodb",
-    "version": "2.3.0",
+    "version": "2.4.1",
    "description": "A map tile server for CartoDB",
    "keywords": [
      "cartodb"
@@ -24,7 +24,7 @@
    "dependencies": {
        "underscore"  : "~1.6.0",
        "dot": "~1.0.2",
-        "windshaft": "0.43.0",
+        "windshaft": "0.44.1",
        "step": "~0.0.5",
        "queue-async": "~1.0.7",
        "request": "~2.9.203",
--- a/test/acceptance/named_layers.js
+++ b/test/acceptance/named_layers.js
@@ -44,6 +44,7 @@ describe('named_layers', function() {
        },
        layergroup: {
            layers: [
+                wadusLayer,
                wadusLayer
            ]
        }
@@ -634,6 +635,88 @@ describe('named_layers', function() {

    });

+    it('should return metadata for named layers', 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};
Author	SHA1	Message	Date
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
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