From e1babd05c14d67086a6ab9ad7525c220d1841ef2 Mon Sep 17 00:00:00 2001 From: csobier Date: Tue, 2 Feb 2016 13:14:00 -0500 Subject: [PATCH 01/17] add note regarding setParams and torque --- docs/named_maps.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/named_maps.md b/docs/named_maps.md index 4dac6d5c..0b68a408 100644 --- a/docs/named_maps.md +++ b/docs/named_maps.md @@ -461,6 +461,9 @@ cartodb.createLayer('map_dom_id',layerSource) [CartoDB.js](http://docs.cartodb.com/cartodb-platform/cartodb-js/) has methods for accessing your named maps. 1. [layer.setParams()](http://docs.cartodb.com/cartodb-platform/cartodb-js/api-methods/#layersetparamskey-value) allows you to change the template variables (in the placeholders object) via JavaScript + + **Note:** The CartoDB.js `layer.setParams()` function is not supported when using Named maps for Torque. + 2. [layer.setAuthToken()](http://docs.cartodb.com/cartodb-platform/cartodb-js/api-methods/#layersetauthtokenauthtoken) allows you to set the auth tokens to create the layer ### Complete Examples of Named Maps created with CartoDB.js From fe5c6faff1571906fd453f0d9046d432122a8f6a Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Mon, 15 Feb 2016 12:16:56 +0100 Subject: [PATCH 02/17] Upgrade windshaft to 1.10.0 --- NEWS.md | 5 ++++- npm-shrinkwrap.json | 19 ++++++++++--------- package.json | 4 ++-- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/NEWS.md b/NEWS.md index 1d8676b3..49cef27c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,9 +1,12 @@ # Changelog -## 2.23.1 +## 2.24.0 Released 2016-mm-dd +Announcements: + - Upgrades windshaft to [1.10.0](https://github.com/CartoDB/Windshaft/releases/tag/1.10.0) + ## 2.23.0 diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 70e7c50e..9c0f6b32 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "windshaft-cartodb", - "version": "2.23.1", + "version": "2.24.0", "dependencies": { "body-parser": { "version": "1.14.2", @@ -193,7 +193,7 @@ "dependencies": { "mime-types": { "version": "2.1.9", - "from": "mime-types@>=2.1.6 <2.2.0", + "from": "mime-types@>=2.1.9 <2.2.0", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz", "dependencies": { "mime-db": { @@ -382,7 +382,7 @@ }, "mime-types": { "version": "2.1.9", - "from": "mime-types@>=2.1.6 <2.2.0", + "from": "mime-types@>=2.1.9 <2.2.0", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz", "dependencies": { "mime-db": { @@ -520,9 +520,9 @@ "resolved": "https://registry.npmjs.org/request/-/request-2.62.0.tgz", "dependencies": { "bl": { - "version": "1.0.2", + "version": "1.0.3", "from": "bl@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.2.tgz", + "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz", "dependencies": { "readable-stream": { "version": "2.0.5", @@ -585,7 +585,7 @@ "dependencies": { "async": { "version": "1.5.2", - "from": "async@>=1.4.0 <2.0.0", + "from": "async@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz" } } @@ -597,7 +597,7 @@ }, "mime-types": { "version": "2.1.9", - "from": "mime-types@>=2.1.2 <2.2.0", + "from": "mime-types@>=2.1.9 <2.2.0", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz", "dependencies": { "mime-db": { @@ -830,8 +830,9 @@ "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz" }, "windshaft": { - "version": "1.9.0", - "from": "windshaft@1.9.0", + "version": "1.10.0", + "from": "windshaft@1.10.0", + "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-1.10.0.tgz", "dependencies": { "mapnik": { "version": "1.4.15-cdb6", diff --git a/package.json b/package.json index e31e26ff..021640ba 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "windshaft-cartodb", - "version": "2.23.1", + "version": "2.24.0", "description": "A map tile server for CartoDB", "keywords": [ "cartodb" @@ -26,7 +26,7 @@ "node-statsd": "~0.0.7", "underscore" : "~1.6.0", "dot": "~1.0.2", - "windshaft": "1.9.0", + "windshaft": "1.10.0", "step": "~0.0.6", "queue-async": "~1.0.7", "request": "~2.62.0", From d0f84b2440e59186b85c56f45044e548296e1542 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Mon, 15 Feb 2016 13:22:35 +0100 Subject: [PATCH 03/17] windshaft@1.10.1 --- NEWS.md | 2 +- npm-shrinkwrap.json | 16 ++++++++-------- package.json | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NEWS.md b/NEWS.md index 49cef27c..df3fcb77 100644 --- a/NEWS.md +++ b/NEWS.md @@ -5,7 +5,7 @@ Released 2016-mm-dd Announcements: - - Upgrades windshaft to [1.10.0](https://github.com/CartoDB/Windshaft/releases/tag/1.10.0) + - Upgrades windshaft to [1.10.0](https://github.com/CartoDB/Windshaft/releases/tag/1.10.1) ## 2.23.0 diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 9c0f6b32..47137877 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -193,7 +193,7 @@ "dependencies": { "mime-types": { "version": "2.1.9", - "from": "mime-types@>=2.1.9 <2.2.0", + "from": "mime-types@>=2.1.6 <2.2.0", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz", "dependencies": { "mime-db": { @@ -382,7 +382,7 @@ }, "mime-types": { "version": "2.1.9", - "from": "mime-types@>=2.1.9 <2.2.0", + "from": "mime-types@>=2.1.6 <2.2.0", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz", "dependencies": { "mime-db": { @@ -443,7 +443,7 @@ }, "inherits": { "version": "2.0.1", - "from": "inherits@>=2.0.1 <2.1.0", + "from": "inherits@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } @@ -585,7 +585,7 @@ "dependencies": { "async": { "version": "1.5.2", - "from": "async@>=1.0.0 <2.0.0", + "from": "async@>=1.4.0 <2.0.0", "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz" } } @@ -597,7 +597,7 @@ }, "mime-types": { "version": "2.1.9", - "from": "mime-types@>=2.1.9 <2.2.0", + "from": "mime-types@>=2.1.2 <2.2.0", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz", "dependencies": { "mime-db": { @@ -830,9 +830,9 @@ "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz" }, "windshaft": { - "version": "1.10.0", - "from": "windshaft@1.10.0", - "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-1.10.0.tgz", + "version": "1.10.1", + "from": "windshaft@1.10.1", + "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-1.10.1.tgz", "dependencies": { "mapnik": { "version": "1.4.15-cdb6", diff --git a/package.json b/package.json index 021640ba..09d0cc9f 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "node-statsd": "~0.0.7", "underscore" : "~1.6.0", "dot": "~1.0.2", - "windshaft": "1.10.0", + "windshaft": "1.10.1", "step": "~0.0.6", "queue-async": "~1.0.7", "request": "~2.62.0", From 3ab94c7c91d3bdbea620b6e6f5d0d171a896c84e Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Mon, 15 Feb 2016 14:46:43 +0100 Subject: [PATCH 04/17] Release 2.24.0 --- NEWS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index df3fcb77..dc955572 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,7 +2,7 @@ ## 2.24.0 -Released 2016-mm-dd +Released 2016-02-15 Announcements: - Upgrades windshaft to [1.10.0](https://github.com/CartoDB/Windshaft/releases/tag/1.10.1) From 121c146ef9695fe68b2c94fa6942b98f6c88a2a6 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Mon, 15 Feb 2016 14:47:36 +0100 Subject: [PATCH 05/17] Stubs next version --- NEWS.md | 5 +++++ npm-shrinkwrap.json | 2 +- package.json | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/NEWS.md b/NEWS.md index dc955572..784d26af 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,10 @@ # Changelog +## 2.24.1 + +Released 2016-mm-dd + + ## 2.24.0 Released 2016-02-15 diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 47137877..36867205 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "windshaft-cartodb", - "version": "2.24.0", + "version": "2.24.1", "dependencies": { "body-parser": { "version": "1.14.2", diff --git a/package.json b/package.json index 09d0cc9f..4e2e3145 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "windshaft-cartodb", - "version": "2.24.0", + "version": "2.24.1", "description": "A map tile server for CartoDB", "keywords": [ "cartodb" From cd81a594187e0f2873f78870d1e12558ea310bce Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Mon, 15 Feb 2016 16:53:31 +0100 Subject: [PATCH 06/17] Adds some notes about how to npm link windshaft for development --- README.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/README.md b/README.md index 88d4b897..6045cda7 100644 --- a/README.md +++ b/README.md @@ -67,3 +67,16 @@ Contributing --- See [CONTRIBUTING.md](CONTRIBUTING.md). + +### Developing with a custom windshaft version + +If you plan or want to use a custom / not released yet version of windshaft (or any other dependency) the best option is +to use `npm link`. You can read more about it at [npm-link: Symlink a package folder](https://docs.npmjs.com/cli/link). + +**Quick start**: + +```shell +~/windshaft-directory $ npm install +~/windshaft-directory $ npm link +~/windshaft-cartodb-directory $ npm link windshaft +``` From 65e539d4c893ef9a692ffdaa98a5117f570333fa Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Thu, 18 Feb 2016 13:49:10 +0100 Subject: [PATCH 07/17] Upgrade windshaft --- npm-shrinkwrap.json | 52 ++++++++++++++++++++++----------------------- package.json | 2 +- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 36867205..4431e81c 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -84,14 +84,14 @@ "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz" }, "mime-types": { - "version": "2.1.9", + "version": "2.1.10", "from": "mime-types@>=2.1.9 <2.2.0", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz", "dependencies": { "mime-db": { - "version": "1.21.0", - "from": "mime-db@>=1.21.0 <1.22.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.21.0.tgz" + "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" } } } @@ -192,14 +192,14 @@ "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz", "dependencies": { "mime-types": { - "version": "2.1.9", + "version": "2.1.10", "from": "mime-types@>=2.1.6 <2.2.0", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz", "dependencies": { "mime-db": { - "version": "1.21.0", - "from": "mime-db@>=1.21.0 <1.22.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.21.0.tgz" + "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" } } }, @@ -381,14 +381,14 @@ "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz" }, "mime-types": { - "version": "2.1.9", + "version": "2.1.10", "from": "mime-types@>=2.1.6 <2.2.0", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz", "dependencies": { "mime-db": { - "version": "1.21.0", - "from": "mime-db@>=1.21.0 <1.22.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.21.0.tgz" + "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" } } } @@ -443,7 +443,7 @@ }, "inherits": { "version": "2.0.1", - "from": "inherits@>=2.0.0 <3.0.0", + "from": "inherits@>=2.0.1 <2.1.0", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } @@ -596,14 +596,14 @@ "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz" }, "mime-types": { - "version": "2.1.9", + "version": "2.1.10", "from": "mime-types@>=2.1.2 <2.2.0", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz", "dependencies": { "mime-db": { - "version": "1.21.0", - "from": "mime-db@>=1.21.0 <1.22.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.21.0.tgz" + "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" } } }, @@ -777,9 +777,9 @@ } }, "is-my-json-valid": { - "version": "2.12.4", + "version": "2.13.0", "from": "is-my-json-valid@>=2.12.0 <3.0.0", - "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.4.tgz", + "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.0.tgz", "dependencies": { "generate-function": { "version": "2.0.0", @@ -830,9 +830,9 @@ "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz" }, "windshaft": { - "version": "1.10.1", - "from": "windshaft@1.10.1", - "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-1.10.1.tgz", + "version": "1.11.0", + "from": "windshaft@1.11.0", + "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-1.11.0.tgz", "dependencies": { "mapnik": { "version": "1.4.15-cdb6", diff --git a/package.json b/package.json index 4e2e3145..238cda74 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "node-statsd": "~0.0.7", "underscore" : "~1.6.0", "dot": "~1.0.2", - "windshaft": "1.10.1", + "windshaft": "1.11.0", "step": "~0.0.6", "queue-async": "~1.0.7", "request": "~2.62.0", From b3f62e163144565547710af3428e975e44a4009b Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Thu, 18 Feb 2016 14:27:44 +0100 Subject: [PATCH 08/17] Update news and bump version --- NEWS.md | 7 +++++-- npm-shrinkwrap.json | 2 +- package.json | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/NEWS.md b/NEWS.md index 784d26af..a4e937b0 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,16 +1,19 @@ # Changelog -## 2.24.1 +## 2.25.0 Released 2016-mm-dd +Announcements: + - Upgrades windshaft to [1.11.0](https://github.com/CartoDB/Windshaft/releases/tag/1.11.0) + ## 2.24.0 Released 2016-02-15 Announcements: - - Upgrades windshaft to [1.10.0](https://github.com/CartoDB/Windshaft/releases/tag/1.10.1) + - Upgrades windshaft to [1.10.1](https://github.com/CartoDB/Windshaft/releases/tag/1.10.1) ## 2.23.0 diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 4431e81c..ec5c7c7e 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "windshaft-cartodb", - "version": "2.24.1", + "version": "2.25.0", "dependencies": { "body-parser": { "version": "1.14.2", diff --git a/package.json b/package.json index 238cda74..6bcce7b5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "windshaft-cartodb", - "version": "2.24.1", + "version": "2.25.0", "description": "A map tile server for CartoDB", "keywords": [ "cartodb" From b7fff960a280bcdb27c14605ffdd0b2fe529a346 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Wed, 17 Feb 2016 11:47:27 +0100 Subject: [PATCH 09/17] Ignore CDB_ sql files downloaded for tests --- test/support/sql/.gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 test/support/sql/.gitignore diff --git a/test/support/sql/.gitignore b/test/support/sql/.gitignore new file mode 100644 index 00000000..68d2db39 --- /dev/null +++ b/test/support/sql/.gitignore @@ -0,0 +1 @@ +CDB_*.sql From 4d8b341b6f54bce6f25f4b9db6979ee9bc5a63b9 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Thu, 18 Feb 2016 15:14:18 +0100 Subject: [PATCH 10/17] Release 2.25.0 --- NEWS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index a4e937b0..79742cc4 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,7 +2,7 @@ ## 2.25.0 -Released 2016-mm-dd +Released 2016-02-18 Announcements: - Upgrades windshaft to [1.11.0](https://github.com/CartoDB/Windshaft/releases/tag/1.11.0) From 3161939de978012aedbf3fa1d4e758ea5e7f6e32 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Thu, 18 Feb 2016 15:15:09 +0100 Subject: [PATCH 11/17] Stubs next version --- NEWS.md | 5 +++++ npm-shrinkwrap.json | 2 +- package.json | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/NEWS.md b/NEWS.md index 79742cc4..6ad63596 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,10 @@ # Changelog +## 2.25.1 + +Released 2016-mm-dd + + ## 2.25.0 Released 2016-02-18 diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index ec5c7c7e..a22f8884 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "windshaft-cartodb", - "version": "2.25.0", + "version": "2.25.1", "dependencies": { "body-parser": { "version": "1.14.2", diff --git a/package.json b/package.json index 6bcce7b5..eb5e6949 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "windshaft-cartodb", - "version": "2.25.0", + "version": "2.25.1", "description": "A map tile server for CartoDB", "keywords": [ "cartodb" From 842fa4dfd241c816d55940caac50b965cb0bd9ef Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Fri, 19 Feb 2016 17:48:19 +0100 Subject: [PATCH 12/17] Create populated places private table for named maps + widgets --- test/support/sql/ported/populated_places_simple_reduced.sql | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/support/sql/ported/populated_places_simple_reduced.sql b/test/support/sql/ported/populated_places_simple_reduced.sql index 34e223be..b6c749f4 100644 --- a/test/support/sql/ported/populated_places_simple_reduced.sql +++ b/test/support/sql/ported/populated_places_simple_reduced.sql @@ -7385,3 +7385,8 @@ GRANT ALL ON TABLE populated_places_simple_reduced TO :TESTUSER; GRANT SELECT ON TABLE populated_places_simple_reduced TO :PUBLICUSER; VACUUM ANALYZE populated_places_simple_reduced; + +create table populated_places_simple_reduced_private AS +select * from populated_places_simple_reduced; + +GRANT ALL ON TABLE populated_places_simple_reduced_private TO :TESTUSER; From 1c567ec4556ae8637fd00a34512676d156f79391 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Fri, 19 Feb 2016 17:48:55 +0100 Subject: [PATCH 13/17] Add tests with named maps + private dataset + widgets --- test/acceptance/widgets/named-maps.js | 197 ++++++++++++++++++++++++++ 1 file changed, 197 insertions(+) create mode 100644 test/acceptance/widgets/named-maps.js diff --git a/test/acceptance/widgets/named-maps.js b/test/acceptance/widgets/named-maps.js new file mode 100644 index 00000000..4af90245 --- /dev/null +++ b/test/acceptance/widgets/named-maps.js @@ -0,0 +1,197 @@ +var assert = require('../../support/assert'); +var step = require('step'); + +var helper = require('../../support/test_helper'); + +var CartodbWindshaft = require('../../../lib/cartodb/server'); +var serverOptions = require('../../../lib/cartodb/server_options'); +var server = new CartodbWindshaft(serverOptions); + +var LayergroupToken = require('../../../lib/cartodb/models/layergroup_token'); + +describe('named-maps widgets', function() { + + var username = 'localhost'; + var widgetsTemplateName = 'widgets-template'; + + var layergroupid; + var keysToDelete; + + beforeEach(function(done) { + keysToDelete = {}; + + var widgetsTemplate = { + version: '0.0.1', + name: widgetsTemplateName, + layergroup: { + version: '1.5.0', + layers: [ + { + type: 'cartodb', + options: { + sql: "select * from populated_places_simple_reduced_private", + cartocss: '#layer { marker-fill: blue; }', + cartocss_version: '2.3.0', + widgets: { + country_places_count: { + type: 'aggregation', + options: { + column: 'adm0_a3', + aggregation: 'count' + } + }, + pop_max: { + type: 'histogram', + options: { + column: 'pop_max' + } + } + } + } + } + ] + } + }; + + var template_params = {}; + + step( + function createTemplate() + { + var next = this; + assert.response( + server, + { + url: '/api/v1/map/named?api_key=1234', + method: 'POST', + headers: { + host: username, + 'Content-Type': 'application/json' + }, + data: JSON.stringify(widgetsTemplate) + }, + { + status: 200 + }, + function(res, err) { + next(err, res); + } + ); + }, + function instantiateTemplate(err, res) { + assert.ifError(err); + + assert.deepEqual(JSON.parse(res.body), { template_id: widgetsTemplateName }); + var next = this; + assert.response( + server, + { + url: '/api/v1/map/named/' + widgetsTemplateName, + method: 'POST', + headers: { + host: username, + 'Content-Type': 'application/json' + }, + data: JSON.stringify(template_params) + }, + { + status: 200 + }, + function(res) { + next(null, res); + } + ); + }, + function fetchTile(err, res) { + assert.ifError(err); + + var parsed = JSON.parse(res.body); + assert.ok( + parsed.hasOwnProperty('layergroupid'), "Missing 'layergroupid' from response body: " + res.body); + layergroupid = parsed.layergroupid; + + keysToDelete['map_cfg|' + LayergroupToken.parse(parsed.layergroupid).token] = 0; + keysToDelete['user:localhost:mapviews:global'] = 5; + + return done(); + } + ); + + }); + + afterEach(function(done) { + step( + function deleteTemplate(err) { + assert.ifError(err); + var next = this; + assert.response( + server, + { + url: '/api/v1/map/named/' + widgetsTemplateName + '?api_key=1234', + method: 'DELETE', + headers: { + host: username + } + }, + { + status: 204 + }, + function(res, err) { + next(err, res); + } + ); + }, + function deleteRedisKeys(err) { + assert.ifError(err); + helper.deleteRedisKeys(keysToDelete, done); + } + ); + }); + + function getWidget(widgetName, callback) { + assert.response( + server, + { + url: '/api/v1/map/' + layergroupid + '/0/widget/' + widgetName, + method: 'GET', + headers: { + host: username + } + }, + { + status: 200 + }, + function(res, err) { + if (err) { + return callback(err); + } + var parsedBody = JSON.parse(res.body); + return callback(err, res, parsedBody); + } + ); + } + + + it("should retrieve aggregation", function(done) { + getWidget('country_places_count', function(err, response, aggregation) { + assert.ok(!err, err); + + assert.equal(aggregation.type, 'aggregation'); + assert.equal(aggregation.max, 769); + + return done(); + }); + }); + + it("should retrieve histogram", function(done) { + getWidget('pop_max', function(err, response, histogram) { + assert.ok(!err, err); + + assert.equal(histogram.type, 'histogram'); + assert.equal(histogram.bin_width, 743250); + + return done(); + }); + }); + +}); From dcfa38e29c30f23a0c07a824528a5a68450f31dc Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Mon, 22 Feb 2016 12:46:51 +0100 Subject: [PATCH 14/17] Upgrade windshaft to 1.11.1 --- npm-shrinkwrap.json | 27 +++++++++++++++++---------- package.json | 2 +- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index a22f8884..3c98feea 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -257,7 +257,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" } } @@ -724,14 +724,21 @@ "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz", "dependencies": { "ansi-styles": { - "version": "2.1.0", + "version": "2.2.0", "from": "ansi-styles@>=2.1.0 <3.0.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz" + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.0.tgz", + "dependencies": { + "color-convert": { + "version": "1.0.0", + "from": "color-convert@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.0.0.tgz" + } + } }, "escape-string-regexp": { - "version": "1.0.4", + "version": "1.0.5", "from": "escape-string-regexp@>=1.0.2 <2.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.4.tgz" + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" }, "has-ansi": { "version": "2.0.0", @@ -746,9 +753,9 @@ } }, "strip-ansi": { - "version": "3.0.0", + "version": "3.0.1", "from": "strip-ansi@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "dependencies": { "ansi-regex": { "version": "2.0.0", @@ -830,9 +837,9 @@ "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz" }, "windshaft": { - "version": "1.11.0", - "from": "windshaft@1.11.0", - "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-1.11.0.tgz", + "version": "1.11.1", + "from": "windshaft@1.11.1", + "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-1.11.1.tgz", "dependencies": { "mapnik": { "version": "1.4.15-cdb6", diff --git a/package.json b/package.json index eb5e6949..675e6e6a 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "node-statsd": "~0.0.7", "underscore" : "~1.6.0", "dot": "~1.0.2", - "windshaft": "1.11.0", + "windshaft": "1.11.1", "step": "~0.0.6", "queue-async": "~1.0.7", "request": "~2.62.0", From 3b67efeab1a3c3f30925a458f87b384c84c05049 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Mon, 22 Feb 2016 12:51:09 +0100 Subject: [PATCH 15/17] Update news --- NEWS.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NEWS.md b/NEWS.md index 6ad63596..40c8d09a 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,6 +4,9 @@ Released 2016-mm-dd +Announcements: + - Upgrades windshaft to [1.11.1](https://github.com/CartoDB/Windshaft/releases/tag/1.11.1) + ## 2.25.0 From 62e8868e4ba41f6afff48cc8f10d04b5629dea88 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Mon, 22 Feb 2016 12:58:51 +0100 Subject: [PATCH 16/17] Release 2.25.1 --- NEWS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 40c8d09a..3e79dbae 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,7 +2,7 @@ ## 2.25.1 -Released 2016-mm-dd +Released 2016-02-22 Announcements: - Upgrades windshaft to [1.11.1](https://github.com/CartoDB/Windshaft/releases/tag/1.11.1) From f78c6fbc6340b69126a5bc32fad7309c7826f4fd Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Mon, 22 Feb 2016 13:08:43 +0100 Subject: [PATCH 17/17] Stubs next version --- NEWS.md | 6 ++++++ npm-shrinkwrap.json | 2 +- package.json | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/NEWS.md b/NEWS.md index 3e79dbae..3dd16c6f 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,11 @@ # Changelog +## 2.25.2 + +Released 2016-mm-dd + + + ## 2.25.1 Released 2016-02-22 diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 3c98feea..db22e40f 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "windshaft-cartodb", - "version": "2.25.1", + "version": "2.25.2", "dependencies": { "body-parser": { "version": "1.14.2", diff --git a/package.json b/package.json index 675e6e6a..02932538 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "windshaft-cartodb", - "version": "2.25.1", + "version": "2.25.2", "description": "A map tile server for CartoDB", "keywords": [ "cartodb"