Compare commits

..

15 Commits
2.2.0 ... 2.4.1

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
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
682db1ca75 Stubs next version 2015-04-29 15:26:56 +02:00
4 changed files with 477 additions and 166 deletions

24
NEWS.md
View File

@@ -1,5 +1,29 @@
# 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
Announcements:
- Upgrades cartodb-redis for `global` map stats
## 2.2.0
Released 2015-04-29

530
npm-shrinkwrap.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "windshaft-cartodb",
"version": "2.2.0",
"version": "2.4.1",
"dependencies": {
"cartodb-psql": {
"version": "0.4.0",
@@ -27,8 +27,8 @@
}
},
"cartodb-redis": {
"version": "0.12.1",
"from": "cartodb-redis@~0.12.1",
"version": "0.13.0",
"from": "cartodb-redis@~0.13.0",
"dependencies": {
"redis-mpool": {
"version": "0.1.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",
@@ -107,17 +107,16 @@
},
"inherits": {
"version": "2.0.1",
"from": "inherits@~2.0.1",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
"from": "inherits@~2.0.1"
}
}
}
}
},
"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",
@@ -130,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.10",
"version": "2.0.13",
"from": "mime-types@~2.0.1",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.10.tgz",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.13.tgz",
"dependencies": {
"mime-db": {
"version": "1.8.0",
"from": "mime-db@~1.8.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.8.0.tgz"
"version": "1.11.0",
"from": "mime-db@~1.11.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.11.0.tgz"
}
}
},
@@ -159,9 +170,9 @@
"resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
},
"qs": {
"version": "2.4.1",
"from": "qs@~2.4.0",
"resolved": "https://registry.npmjs.org/qs/-/qs-2.4.1.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",
@@ -169,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",
@@ -196,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",
@@ -206,14 +217,14 @@
"resolved": "https://registry.npmjs.org/hawk/-/hawk-2.3.1.tgz",
"dependencies": {
"hoek": {
"version": "2.12.0",
"version": "2.14.0",
"from": "hoek@2.x.x",
"resolved": "https://registry.npmjs.org/hoek/-/hoek-2.12.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",
@@ -238,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"
}
}
},
@@ -255,14 +266,14 @@
"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
},
"har-validator": {
"version": "1.6.1",
"from": "har-validator@^1.4.0",
"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.6.1.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.21",
"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",
@@ -303,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"
}
}
@@ -317,7 +328,7 @@
},
"commander": {
"version": "2.8.1",
"from": "commander@^2.7.1",
"from": "commander@^2.8.1",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
"dependencies": {
"graceful-readlink": {
@@ -328,9 +339,9 @@
}
},
"is-my-json-valid": {
"version": "2.10.1",
"from": "is-my-json-valid@^2.10.0",
"resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.10.1.tgz",
"version": "2.12.0",
"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": {
"version": "2.0.0",
@@ -338,9 +349,9 @@
"resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
},
"generate-object-property": {
"version": "1.1.1",
"version": "1.2.0",
"from": "generate-object-property@^1.1.0",
"resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.1.1.tgz",
"resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
"dependencies": {
"is-property": {
"version": "1.0.2",
@@ -399,8 +410,7 @@
},
"inherits": {
"version": "2.0.1",
"from": "inherits@2.0.1",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
"from": "inherits@~2.0.1"
}
}
}
@@ -466,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",
@@ -547,9 +557,9 @@
"resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
"dependencies": {
"wordwrap": {
"version": "0.0.2",
"version": "0.0.3",
"from": "wordwrap@~0.0.2",
"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
},
"minimist": {
"version": "0.0.10",
@@ -581,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",
@@ -596,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",
@@ -618,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"
}
}
},
@@ -691,19 +701,18 @@
}
},
"srs": {
"version": "0.4.7",
"version": "0.4.8",
"from": "srs@~0.4.1",
"resolved": "https://registry.npmjs.org/srs/-/srs-0.4.7.tgz",
"resolved": "https://registry.npmjs.org/srs/-/srs-0.4.8.tgz",
"dependencies": {
"nan": {
"version": "1.7.0",
"from": "nan@~1.7.0",
"resolved": "https://registry.npmjs.org/nan/-/nan-1.7.0.tgz"
"version": "1.8.4",
"from": "nan@~1.8.4",
"resolved": "https://registry.npmjs.org/nan/-/nan-1.8.4.tgz"
},
"node-pre-gyp": {
"version": "0.6.4",
"from": "node-pre-gyp@~0.6.4",
"resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.4.tgz",
"version": "0.6.7",
"from": "node-pre-gyp@~0.6.7",
"dependencies": {
"nopt": {
"version": "3.0.1",
@@ -718,9 +727,9 @@
}
},
"npmlog": {
"version": "1.1.0",
"from": "npmlog@>=1.1.0 <1.2.0",
"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-1.1.0.tgz",
"version": "1.2.0",
"from": "npmlog@>=1.2.0 <1.3.0",
"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-1.2.0.tgz",
"dependencies": {
"ansi": {
"version": "0.3.0",
@@ -728,21 +737,48 @@
"resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"
},
"are-we-there-yet": {
"version": "1.0.2",
"version": "1.0.4",
"from": "are-we-there-yet@>=1.0.0 <1.1.0",
"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.2.tgz",
"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz",
"dependencies": {
"delegates": {
"version": "0.1.0",
"from": "delegates@>=0.1.0 <0.2.0",
"resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
},
"readable-stream": {
"version": "1.1.13",
"from": "readable-stream@>=1.1.13 <2.0.0",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
"dependencies": {
"core-util-is": {
"version": "1.0.1",
"from": "core-util-is@>=1.0.0 <1.1.0",
"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
},
"isarray": {
"version": "0.0.1",
"from": "isarray@0.0.1",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
},
"string_decoder": {
"version": "0.10.31",
"from": "string_decoder@>=0.10.0 <0.11.0",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
},
"inherits": {
"version": "2.0.1",
"from": "inherits@>=2.0.1 <2.1.0",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
}
}
}
}
},
"gauge": {
"version": "1.1.0",
"from": "gauge@>=1.1.0 <1.2.0",
"resolved": "https://registry.npmjs.org/gauge/-/gauge-1.1.0.tgz",
"version": "1.2.0",
"from": "gauge@>=1.2.0 <1.3.0",
"resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.0.tgz",
"dependencies": {
"has-unicode": {
"version": "1.0.0",
@@ -750,19 +786,19 @@
"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.0.tgz"
},
"lodash.pad": {
"version": "3.0.0",
"version": "3.1.0",
"from": "lodash.pad@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.0.0.tgz",
"resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.0.tgz",
"dependencies": {
"lodash._basetostring": {
"version": "3.0.0",
"from": "lodash._basetostring@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz"
},
"lodash._createpad": {
"version": "3.0.1",
"from": "lodash._createpad@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/lodash._createpad/-/lodash._createpad-3.0.1.tgz",
"lodash._createpadding": {
"version": "3.6.0",
"from": "lodash._createpadding@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.0.tgz",
"dependencies": {
"lodash.repeat": {
"version": "3.0.0",
@@ -774,19 +810,19 @@
}
},
"lodash.padleft": {
"version": "3.0.0",
"version": "3.1.1",
"from": "lodash.padleft@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.0.0.tgz",
"resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz",
"dependencies": {
"lodash._basetostring": {
"version": "3.0.0",
"from": "lodash._basetostring@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz"
},
"lodash._createpad": {
"version": "3.0.1",
"from": "lodash._createpad@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/lodash._createpad/-/lodash._createpad-3.0.1.tgz",
"lodash._createpadding": {
"version": "3.6.0",
"from": "lodash._createpadding@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.0.tgz",
"dependencies": {
"lodash.repeat": {
"version": "3.0.0",
@@ -798,19 +834,19 @@
}
},
"lodash.padright": {
"version": "3.0.0",
"version": "3.1.1",
"from": "lodash.padright@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.0.0.tgz",
"resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz",
"dependencies": {
"lodash._basetostring": {
"version": "3.0.0",
"from": "lodash._basetostring@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz"
},
"lodash._createpad": {
"version": "3.0.1",
"from": "lodash._createpad@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/lodash._createpad/-/lodash._createpad-3.0.1.tgz",
"lodash._createpadding": {
"version": "3.6.0",
"from": "lodash._createpadding@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.0.tgz",
"dependencies": {
"lodash.repeat": {
"version": "3.0.0",
@@ -826,9 +862,9 @@
}
},
"request": {
"version": "2.53.0",
"version": "2.55.0",
"from": "request@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/request/-/request-2.53.0.tgz",
"resolved": "https://registry.npmjs.org/request/-/request-2.55.0.tgz",
"dependencies": {
"bl": {
"version": "0.9.4",
@@ -870,9 +906,9 @@
"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.9.0.tgz"
},
"forever-agent": {
"version": "0.5.2",
"from": "forever-agent@>=0.5.0 <0.6.0",
"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
"version": "0.6.1",
"from": "forever-agent@>=0.6.0 <0.7.0",
"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
},
"form-data": {
"version": "0.2.0",
@@ -892,26 +928,26 @@
"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
},
"mime-types": {
"version": "2.0.9",
"version": "2.0.10",
"from": "mime-types@>=2.0.1 <2.1.0",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.9.tgz",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.10.tgz",
"dependencies": {
"mime-db": {
"version": "1.7.0",
"from": "mime-db@>=1.7.0 <1.8.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.7.0.tgz"
"version": "1.8.0",
"from": "mime-db@>=1.8.0 <1.9.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.8.0.tgz"
}
}
},
"node-uuid": {
"version": "1.4.2",
"version": "1.4.3",
"from": "node-uuid@>=1.4.0 <1.5.0",
"resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.2.tgz"
"resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
},
"qs": {
"version": "2.3.3",
"from": "qs@>=2.3.1 <2.4.0",
"resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
"version": "2.4.1",
"from": "qs@>=2.4.0 <2.5.0",
"resolved": "https://registry.npmjs.org/qs/-/qs-2.4.1.tgz"
},
"tunnel-agent": {
"version": "0.4.0",
@@ -919,16 +955,9 @@
"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
},
"tough-cookie": {
"version": "0.12.1",
"version": "1.1.0",
"from": "tough-cookie@>=0.12.0",
"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
"dependencies": {
"punycode": {
"version": "1.3.2",
"from": "punycode@>=0.2.0",
"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
}
}
"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-1.1.0.tgz"
},
"http-signature": {
"version": "0.10.1",
@@ -963,14 +992,14 @@
"resolved": "https://registry.npmjs.org/hawk/-/hawk-2.3.1.tgz",
"dependencies": {
"hoek": {
"version": "2.11.0",
"version": "2.13.0",
"from": "hoek@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/hoek/-/hoek-2.11.0.tgz"
"resolved": "https://registry.npmjs.org/hoek/-/hoek-2.13.0.tgz"
},
"boom": {
"version": "2.6.1",
"version": "2.7.1",
"from": "boom@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/boom/-/boom-2.6.1.tgz"
"resolved": "https://registry.npmjs.org/boom/-/boom-2.7.1.tgz"
},
"cryptiles": {
"version": "2.0.4",
@@ -1007,21 +1036,130 @@
}
},
"isstream": {
"version": "0.1.1",
"version": "0.1.2",
"from": "isstream@>=0.1.1 <0.2.0",
"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.1.tgz"
"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
},
"har-validator": {
"version": "1.7.0",
"from": "har-validator@>=1.4.0 <2.0.0",
"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.7.0.tgz",
"dependencies": {
"bluebird": {
"version": "2.9.25",
"from": "bluebird@>=2.9.25 <3.0.0",
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.25.tgz"
},
"chalk": {
"version": "1.0.0",
"from": "chalk@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz",
"dependencies": {
"ansi-styles": {
"version": "2.0.1",
"from": "ansi-styles@>=2.0.1 <3.0.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz"
},
"escape-string-regexp": {
"version": "1.0.3",
"from": "escape-string-regexp@>=1.0.2 <2.0.0",
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
},
"has-ansi": {
"version": "1.0.3",
"from": "has-ansi@>=1.0.3 <2.0.0",
"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz",
"dependencies": {
"ansi-regex": {
"version": "1.1.1",
"from": "ansi-regex@>=1.1.0 <2.0.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
},
"get-stdin": {
"version": "4.0.1",
"from": "get-stdin@>=4.0.1 <5.0.0",
"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
}
}
},
"strip-ansi": {
"version": "2.0.1",
"from": "strip-ansi@>=2.0.1 <3.0.0",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz",
"dependencies": {
"ansi-regex": {
"version": "1.1.1",
"from": "ansi-regex@>=1.1.0 <2.0.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
}
}
},
"supports-color": {
"version": "1.3.1",
"from": "supports-color@>=1.3.0 <2.0.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz"
}
}
},
"commander": {
"version": "2.8.1",
"from": "commander@>=2.8.1 <3.0.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
"dependencies": {
"graceful-readlink": {
"version": "1.0.1",
"from": "graceful-readlink@>=1.0.0",
"resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
}
}
},
"is-my-json-valid": {
"version": "2.10.1",
"from": "is-my-json-valid@>=2.10.1 <3.0.0",
"resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.10.1.tgz",
"dependencies": {
"generate-function": {
"version": "2.0.0",
"from": "generate-function@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
},
"generate-object-property": {
"version": "1.1.1",
"from": "generate-object-property@>=1.1.0 <2.0.0",
"resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.1.1.tgz",
"dependencies": {
"is-property": {
"version": "1.0.2",
"from": "is-property@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
}
}
},
"jsonpointer": {
"version": "1.1.0",
"from": "jsonpointer@>=1.1.0 <2.0.0",
"resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-1.1.0.tgz"
},
"xtend": {
"version": "4.0.0",
"from": "xtend@>=4.0.0 <5.0.0",
"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
}
}
}
}
}
}
},
"semver": {
"version": "4.3.0",
"from": "semver@>=4.3.0 <4.4.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-4.3.0.tgz"
"version": "4.3.3",
"from": "semver@>=4.3.2 <4.4.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-4.3.3.tgz"
},
"tar": {
"version": "1.0.3",
"from": "tar@>=1.0.2 <1.1.0",
"resolved": "https://registry.npmjs.org/tar/-/tar-1.0.3.tgz",
"version": "2.1.0",
"from": "tar@>=2.1.0 <2.2.0",
"resolved": "https://registry.npmjs.org/tar/-/tar-2.1.0.tgz",
"dependencies": {
"block-stream": {
"version": "0.0.7",
@@ -1034,9 +1172,9 @@
"resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.4.tgz",
"dependencies": {
"graceful-fs": {
"version": "3.0.5",
"version": "3.0.6",
"from": "graceful-fs@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.5.tgz"
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
}
}
},
@@ -1067,15 +1205,20 @@
"from": "debug@>=0.7.2 <0.8.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
},
"rimraf": {
"version": "2.2.8",
"from": "rimraf@>=2.2.0 <2.3.0",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
},
"fstream": {
"version": "0.1.31",
"from": "fstream@>=0.1.22 <0.2.0",
"resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
"dependencies": {
"graceful-fs": {
"version": "3.0.5",
"version": "3.0.6",
"from": "graceful-fs@>=3.0.2 <3.1.0",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.5.tgz"
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
},
"inherits": {
"version": "2.0.1",
@@ -1112,9 +1255,9 @@
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
"dependencies": {
"lru-cache": {
"version": "2.5.0",
"version": "2.6.2",
"from": "lru-cache@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz"
},
"sigmund": {
"version": "1.0.0",
@@ -1152,7 +1295,7 @@
},
"inherits": {
"version": "2.0.1",
"from": "inherits@>=2.0.0 <2.1.0",
"from": "inherits@>=2.0.1 <2.1.0",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
}
}
@@ -1177,9 +1320,9 @@
}
},
"rc": {
"version": "0.6.0",
"from": "rc@>=0.6.0 <0.7.0",
"resolved": "https://registry.npmjs.org/rc/-/rc-0.6.0.tgz",
"version": "1.0.1",
"from": "rc@>=1.0.1 <1.1.0",
"resolved": "https://registry.npmjs.org/rc/-/rc-1.0.1.tgz",
"dependencies": {
"minimist": {
"version": "0.0.10",
@@ -1204,9 +1347,71 @@
}
},
"rimraf": {
"version": "2.2.8",
"from": "rimraf@>=2.2.8 <2.3.0",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
"version": "2.3.3",
"from": "rimraf@>=2.3.2 <2.4.0",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.3.tgz",
"dependencies": {
"glob": {
"version": "4.5.3",
"from": "glob@>=4.4.2 <5.0.0",
"resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
"dependencies": {
"inflight": {
"version": "1.0.4",
"from": "inflight@>=1.0.4 <2.0.0",
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
"dependencies": {
"wrappy": {
"version": "1.0.1",
"from": "wrappy@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
}
}
},
"inherits": {
"version": "2.0.1",
"from": "inherits@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
},
"minimatch": {
"version": "2.0.7",
"from": "minimatch@>=2.0.1 <3.0.0",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.7.tgz",
"dependencies": {
"brace-expansion": {
"version": "1.1.0",
"from": "brace-expansion@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
"dependencies": {
"balanced-match": {
"version": "0.2.0",
"from": "balanced-match@>=0.2.0 <0.3.0",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
},
"concat-map": {
"version": "0.0.1",
"from": "concat-map@0.0.1",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
}
}
}
}
},
"once": {
"version": "1.3.1",
"from": "once@>=1.3.0 <2.0.0",
"resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
"dependencies": {
"wrappy": {
"version": "1.0.1",
"from": "wrappy@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
}
}
}
}
}
}
}
}
}
@@ -2039,9 +2244,9 @@
"resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
"dependencies": {
"wordwrap": {
"version": "0.0.2",
"version": "0.0.3",
"from": "wordwrap@~0.0.2",
"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
},
"minimist": {
"version": "0.0.10",
@@ -2099,9 +2304,9 @@
"resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
"dependencies": {
"wordwrap": {
"version": "0.0.2",
"version": "0.0.3",
"from": "wordwrap@~0.0.2",
"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
},
"minimist": {
"version": "0.0.10",
@@ -2542,9 +2747,9 @@
"resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
"dependencies": {
"wordwrap": {
"version": "0.0.2",
"version": "0.0.3",
"from": "wordwrap@~0.0.2",
"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
},
"minimist": {
"version": "0.0.10",
@@ -2597,8 +2802,7 @@
},
"inherits": {
"version": "2.0.1",
"from": "inherits@~2.0.1",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
"from": "inherits@~2.0.1"
}
}
}
@@ -2625,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",
@@ -2657,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",

View File

@@ -1,7 +1,7 @@
{
"private": true,
"name": "windshaft-cartodb",
"version": "2.2.0",
"version": "2.4.1",
"description": "A map tile server for CartoDB",
"keywords": [
"cartodb"
@@ -24,11 +24,11 @@
"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",
"cartodb-redis": "~0.12.1",
"cartodb-redis": "~0.13.0",
"cartodb-psql": "~0.4.0",
"fastly-purge": "~1.0.0",
"redis-mpool": "~0.3.0",

View File

@@ -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};