Merge pull request #560 from CartoDB/upgrade-turbo-carto

Upgrades turbo-carto to 0.15.0
This commit is contained in:
Raul Ochoa 2016-07-19 20:03:30 +02:00 committed by GitHub
commit 25df193390
6 changed files with 427 additions and 336 deletions

View File

@ -4,6 +4,9 @@
Released 2016-mm-dd Released 2016-mm-dd
Announcements:
- Upgrades turbo-carto to [0.15.0](https://github.com/CartoDB/turbo-carto/releases/tag/0.15.0).
## 2.66.0 ## 2.66.0

View File

@ -32,14 +32,9 @@ methodTemplates.category = dot.template([
' ORDER BY 2 DESC', ' ORDER BY 2 DESC',
'),', '),',
'agg_categories AS (', 'agg_categories AS (',
' SELECT \'__other\' category', ' SELECT category',
' FROM categories', ' FROM categories',
' WHERE rank >= {{=it._buckets}}', ' WHERE rank <= {{=it._buckets}}',
' GROUP BY 1',
' UNION ALL',
' SELECT CAST(category AS text)',
' FROM categories',
' WHERE rank < {{=it._buckets}}',
')', ')',
'SELECT array_agg(category) AS category FROM agg_categories' 'SELECT array_agg(category) AS category FROM agg_categories'
].join('\n')); ].join('\n'));

650
npm-shrinkwrap.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "windshaft-cartodb", "name": "windshaft-cartodb",
"version": "2.66.0", "version": "2.66.1",
"dependencies": { "dependencies": {
"body-parser": { "body-parser": {
"version": "1.14.2", "version": "1.14.2",
@ -52,7 +52,7 @@
"ee-first": { "ee-first": {
"version": "1.1.1", "version": "1.1.1",
"from": "ee-first@1.1.1", "from": "ee-first@1.1.1",
"resolved": "http://registry.npm.taobao.org/ee-first/download/ee-first-1.1.1.tgz" "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"
} }
} }
}, },
@ -548,7 +548,7 @@
"dependencies": { "dependencies": {
"mime-types": { "mime-types": {
"version": "2.1.11", "version": "2.1.11",
"from": "mime-types@>=2.1.6 <2.2.0", "from": "mime-types@>=2.1.11 <2.2.0",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz",
"dependencies": { "dependencies": {
"mime-db": { "mime-db": {
@ -640,7 +640,7 @@
"ee-first": { "ee-first": {
"version": "1.1.1", "version": "1.1.1",
"from": "ee-first@1.1.1", "from": "ee-first@1.1.1",
"resolved": "http://registry.npm.taobao.org/ee-first/download/ee-first-1.1.1.tgz" "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"
} }
} }
}, },
@ -706,7 +706,7 @@
"mime": { "mime": {
"version": "1.3.4", "version": "1.3.4",
"from": "mime@1.3.4", "from": "mime@1.3.4",
"resolved": "http://registry.npm.taobao.org/mime/download/mime-1.3.4.tgz" "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"
}, },
"ms": { "ms": {
"version": "0.7.1", "version": "0.7.1",
@ -750,7 +750,7 @@
"mime": { "mime": {
"version": "1.3.4", "version": "1.3.4",
"from": "mime@1.3.4", "from": "mime@1.3.4",
"resolved": "http://registry.npm.taobao.org/mime/download/mime-1.3.4.tgz" "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"
}, },
"ms": { "ms": {
"version": "0.7.1", "version": "0.7.1",
@ -778,7 +778,7 @@
}, },
"mime-types": { "mime-types": {
"version": "2.1.11", "version": "2.1.11",
"from": "mime-types@>=2.1.6 <2.2.0", "from": "mime-types@>=2.1.11 <2.2.0",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz",
"dependencies": { "dependencies": {
"mime-db": { "mime-db": {
@ -993,7 +993,7 @@
}, },
"mime-types": { "mime-types": {
"version": "2.1.11", "version": "2.1.11",
"from": "mime-types@>=2.1.2 <2.2.0", "from": "mime-types@>=2.1.11 <2.2.0",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz",
"dependencies": { "dependencies": {
"mime-db": { "mime-db": {
@ -1221,9 +1221,9 @@
"resolved": "https://registry.npmjs.org/step-profiler/-/step-profiler-0.3.0.tgz" "resolved": "https://registry.npmjs.org/step-profiler/-/step-profiler-0.3.0.tgz"
}, },
"turbo-carto": { "turbo-carto": {
"version": "0.14.0", "version": "0.15.0",
"from": "turbo-carto@0.14.0", "from": "turbo-carto@0.15.0",
"resolved": "https://registry.npmjs.org/turbo-carto/-/turbo-carto-0.14.0.tgz", "resolved": "https://registry.npmjs.com/turbo-carto/-/turbo-carto-0.15.0.tgz",
"dependencies": { "dependencies": {
"colorbrewer": { "colorbrewer": {
"version": "1.0.0", "version": "1.0.0",
@ -2930,16 +2930,6 @@
"from": "node-pre-gyp@>=0.6.28 <0.7.0", "from": "node-pre-gyp@>=0.6.28 <0.7.0",
"resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.28.tgz" "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.28.tgz"
}, },
"asn1": {
"version": "0.2.3",
"from": "asn1@>=0.2.3 <0.3.0",
"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"
},
"ansi-regex": {
"version": "2.0.0",
"from": "ansi-regex@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
},
"abbrev": { "abbrev": {
"version": "1.0.7", "version": "1.0.7",
"from": "abbrev@>=1.0.0 <2.0.0", "from": "abbrev@>=1.0.0 <2.0.0",
@ -2950,76 +2940,86 @@
"from": "ansi@>=0.3.1 <0.4.0", "from": "ansi@>=0.3.1 <0.4.0",
"resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz" "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz"
}, },
"assert-plus": { "ansi-regex": {
"version": "0.2.0", "version": "2.0.0",
"from": "assert-plus@>=0.2.0 <0.3.0", "from": "ansi-regex@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz" "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
},
"brace-expansion": {
"version": "1.1.4",
"from": "brace-expansion@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.4.tgz"
}, },
"ansi-styles": { "ansi-styles": {
"version": "2.2.1", "version": "2.2.1",
"from": "ansi-styles@>=2.2.1 <3.0.0", "from": "ansi-styles@>=2.2.1 <3.0.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz" "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"
}, },
"block-stream": {
"version": "0.0.9",
"from": "block-stream@*",
"resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz"
},
"boom": {
"version": "2.10.1",
"from": "boom@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
},
"commander": {
"version": "2.9.0",
"from": "commander@>=2.9.0 <3.0.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"
},
"caseless": {
"version": "0.11.0",
"from": "caseless@>=0.11.0 <0.12.0",
"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
},
"aws-sign2": {
"version": "0.6.0",
"from": "aws-sign2@>=0.6.0 <0.7.0",
"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"
},
"are-we-there-yet": { "are-we-there-yet": {
"version": "1.1.2", "version": "1.1.2",
"from": "are-we-there-yet@>=1.1.2 <1.2.0", "from": "are-we-there-yet@>=1.1.2 <1.2.0",
"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.2.tgz" "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.2.tgz"
}, },
"asn1": {
"version": "0.2.3",
"from": "asn1@>=0.2.3 <0.3.0",
"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"
},
"async": { "async": {
"version": "1.5.2", "version": "1.5.2",
"from": "async@>=1.5.2 <2.0.0", "from": "async@>=1.5.2 <2.0.0",
"resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz" "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz"
}, },
"balanced-match": { "assert-plus": {
"version": "0.4.1", "version": "0.2.0",
"from": "balanced-match@>=0.4.1 <0.5.0", "from": "assert-plus@>=0.2.0 <0.3.0",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.1.tgz" "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"
}, },
"cryptiles": { "aws-sign2": {
"version": "2.0.5", "version": "0.6.0",
"from": "cryptiles@>=2.0.0 <3.0.0", "from": "aws-sign2@>=0.6.0 <0.7.0",
"resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz" "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"
}, },
"aws4": { "aws4": {
"version": "1.4.1", "version": "1.4.1",
"from": "aws4@>=1.2.1 <2.0.0", "from": "aws4@>=1.2.1 <2.0.0",
"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.4.1.tgz" "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.4.1.tgz"
}, },
"balanced-match": {
"version": "0.4.1",
"from": "balanced-match@>=0.4.1 <0.5.0",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.1.tgz"
},
"block-stream": {
"version": "0.0.9",
"from": "block-stream@*",
"resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz"
},
"brace-expansion": {
"version": "1.1.4",
"from": "brace-expansion@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.4.tgz"
},
"boom": {
"version": "2.10.1",
"from": "boom@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
},
"caseless": {
"version": "0.11.0",
"from": "caseless@>=0.11.0 <0.12.0",
"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
},
"chalk": { "chalk": {
"version": "1.1.3", "version": "1.1.3",
"from": "chalk@>=1.1.1 <2.0.0", "from": "chalk@>=1.1.1 <2.0.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz" "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"
}, },
"combined-stream": {
"version": "1.0.5",
"from": "combined-stream@>=1.0.5 <1.1.0",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"
},
"commander": {
"version": "2.9.0",
"from": "commander@>=2.9.0 <3.0.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"
},
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"from": "concat-map@0.0.1", "from": "concat-map@0.0.1",
@ -3030,36 +3030,46 @@
"from": "core-util-is@>=1.0.0 <1.1.0", "from": "core-util-is@>=1.0.0 <1.1.0",
"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
}, },
"cryptiles": {
"version": "2.0.5",
"from": "cryptiles@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
},
"debug": { "debug": {
"version": "2.2.0", "version": "2.2.0",
"from": "debug@>=2.2.0 <2.3.0", "from": "debug@>=2.2.0 <2.3.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz" "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"
}, },
"escape-string-regexp": { "deep-extend": {
"version": "1.0.5", "version": "0.4.1",
"from": "escape-string-regexp@>=1.0.2 <2.0.0", "from": "deep-extend@>=0.4.0 <0.5.0",
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.1.tgz"
},
"delegates": {
"version": "1.0.0",
"from": "delegates@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"
}, },
"delayed-stream": { "delayed-stream": {
"version": "1.0.0", "version": "1.0.0",
"from": "delayed-stream@>=1.0.0 <1.1.0", "from": "delayed-stream@>=1.0.0 <1.1.0",
"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz" "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
}, },
"combined-stream": { "delegates": {
"version": "1.0.5", "version": "1.0.0",
"from": "combined-stream@>=1.0.5 <1.1.0", "from": "delegates@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz" "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"
}, },
"ecc-jsbn": { "ecc-jsbn": {
"version": "0.1.1", "version": "0.1.1",
"from": "ecc-jsbn@>=0.1.1 <0.2.0", "from": "ecc-jsbn@>=0.1.1 <0.2.0",
"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz" "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"
}, },
"escape-string-regexp": {
"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.5.tgz"
},
"extend": {
"version": "3.0.0",
"from": "extend@>=3.0.0 <3.1.0",
"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
},
"forever-agent": { "forever-agent": {
"version": "0.6.1", "version": "0.6.1",
"from": "forever-agent@>=0.6.1 <0.7.0", "from": "forever-agent@>=0.6.1 <0.7.0",
@ -3070,115 +3080,75 @@
"from": "extsprintf@1.0.2", "from": "extsprintf@1.0.2",
"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz" "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"
}, },
"deep-extend": {
"version": "0.4.1",
"from": "deep-extend@>=0.4.0 <0.5.0",
"resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.1.tgz"
},
"form-data": { "form-data": {
"version": "1.0.0-rc4", "version": "1.0.0-rc4",
"from": "form-data@>=1.0.0-rc3 <1.1.0", "from": "form-data@>=1.0.0-rc3 <1.1.0",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc4.tgz" "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc4.tgz"
}, },
"generate-object-property": {
"version": "1.2.0",
"from": "generate-object-property@>=1.1.0 <2.0.0",
"resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"
},
"fstream-ignore": {
"version": "1.0.4",
"from": "fstream-ignore@>=1.0.3 <1.1.0",
"resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.4.tgz"
},
"glob": {
"version": "7.0.3",
"from": "glob@>=7.0.0 <8.0.0",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.0.3.tgz"
},
"extend": {
"version": "3.0.0",
"from": "extend@>=3.0.0 <3.1.0",
"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
},
"fstream": { "fstream": {
"version": "1.0.9", "version": "1.0.9",
"from": "fstream@>=1.0.2 <2.0.0", "from": "fstream@>=1.0.2 <2.0.0",
"resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.9.tgz" "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.9.tgz"
}, },
"fstream-ignore": {
"version": "1.0.4",
"from": "fstream-ignore@>=1.0.3 <1.1.0",
"resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.4.tgz"
},
"gauge": { "gauge": {
"version": "1.2.7", "version": "1.2.7",
"from": "gauge@>=1.2.5 <1.3.0", "from": "gauge@>=1.2.5 <1.3.0",
"resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.7.tgz" "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.7.tgz"
}, },
"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"
},
"generate-function": { "generate-function": {
"version": "2.0.0", "version": "2.0.0",
"from": "generate-function@>=2.0.0 <3.0.0", "from": "generate-function@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz" "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
}, },
"har-validator": { "generate-object-property": {
"version": "2.0.6", "version": "1.2.0",
"from": "har-validator@>=2.0.6 <2.1.0", "from": "generate-object-property@>=1.1.0 <2.0.0",
"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz" "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"
}, },
"has-unicode": { "glob": {
"version": "2.0.0", "version": "7.0.3",
"from": "has-unicode@>=2.0.0 <3.0.0", "from": "glob@>=7.0.0 <8.0.0",
"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.0.tgz" "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.3.tgz"
},
"has-ansi": {
"version": "2.0.0",
"from": "has-ansi@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.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"
},
"hoek": {
"version": "2.16.3",
"from": "hoek@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
},
"isstream": {
"version": "0.1.2",
"from": "isstream@>=0.1.2 <0.2.0",
"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
},
"hawk": {
"version": "3.1.3",
"from": "hawk@>=3.1.3 <3.2.0",
"resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"
}, },
"graceful-fs": { "graceful-fs": {
"version": "4.1.4", "version": "4.1.4",
"from": "graceful-fs@>=4.1.2 <5.0.0", "from": "graceful-fs@>=4.1.2 <5.0.0",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.4.tgz" "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.4.tgz"
}, },
"ini": { "graceful-readlink": {
"version": "1.3.4", "version": "1.0.1",
"from": "ini@>=1.3.0 <1.4.0", "from": "graceful-readlink@>=1.0.0",
"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz" "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
}, },
"is-typedarray": { "har-validator": {
"version": "1.0.0", "version": "2.0.6",
"from": "is-typedarray@>=1.0.0 <1.1.0", "from": "har-validator@>=2.0.6 <2.1.0",
"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz" "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz"
}, },
"isarray": { "has-ansi": {
"version": "1.0.0", "version": "2.0.0",
"from": "isarray@>=1.0.0 <1.1.0", "from": "has-ansi@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
}, },
"is-my-json-valid": { "has-unicode": {
"version": "2.13.1", "version": "2.0.0",
"from": "is-my-json-valid@>=2.12.4 <3.0.0", "from": "has-unicode@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz" "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.0.tgz"
},
"hawk": {
"version": "3.1.3",
"from": "hawk@>=3.1.3 <3.2.0",
"resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"
},
"hoek": {
"version": "2.16.3",
"from": "hoek@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
}, },
"http-signature": { "http-signature": {
"version": "1.1.1", "version": "1.1.1",
@ -3190,10 +3160,40 @@
"from": "inflight@>=1.0.4 <2.0.0", "from": "inflight@>=1.0.4 <2.0.0",
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz" "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz"
}, },
"json-stringify-safe": { "inherits": {
"version": "5.0.1", "version": "2.0.1",
"from": "json-stringify-safe@>=5.0.1 <5.1.0", "from": "inherits@>=2.0.1 <2.1.0",
"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz" "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
},
"ini": {
"version": "1.3.4",
"from": "ini@>=1.3.0 <1.4.0",
"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
},
"is-my-json-valid": {
"version": "2.13.1",
"from": "is-my-json-valid@>=2.12.4 <3.0.0",
"resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz"
},
"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"
},
"is-typedarray": {
"version": "1.0.0",
"from": "is-typedarray@>=1.0.0 <1.1.0",
"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"
},
"isarray": {
"version": "1.0.0",
"from": "isarray@>=1.0.0 <1.1.0",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
},
"isstream": {
"version": "0.1.2",
"from": "isstream@>=0.1.2 <0.2.0",
"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
}, },
"jodid25519": { "jodid25519": {
"version": "1.0.2", "version": "1.0.2",
@ -3205,240 +3205,252 @@
"from": "jsbn@>=0.1.0 <0.2.0", "from": "jsbn@>=0.1.0 <0.2.0",
"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz" "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"
}, },
"jsonpointer": {
"version": "2.0.0",
"from": "jsonpointer@2.0.0",
"resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"
},
"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"
},
"json-schema": { "json-schema": {
"version": "0.2.2", "version": "0.2.2",
"from": "json-schema@0.2.2", "from": "json-schema@0.2.2",
"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz" "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"
}, },
"json-stringify-safe": {
"version": "5.0.1",
"from": "json-stringify-safe@>=5.0.1 <5.1.0",
"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
},
"jsonpointer": {
"version": "2.0.0",
"from": "jsonpointer@2.0.0",
"resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"
},
"jsprim": { "jsprim": {
"version": "1.2.2", "version": "1.2.2",
"from": "jsprim@>=1.2.2 <2.0.0", "from": "jsprim@>=1.2.2 <2.0.0",
"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.2.2.tgz" "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.2.2.tgz"
}, },
"lodash.padend": {
"version": "4.5.0",
"from": "lodash.padend@>=4.1.0 <5.0.0",
"resolved": "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.5.0.tgz"
},
"lodash._baseslice": { "lodash._baseslice": {
"version": "4.0.0", "version": "4.0.0",
"from": "lodash._baseslice@>=4.0.0 <4.1.0", "from": "lodash._baseslice@>=4.0.0 <4.1.0",
"resolved": "https://registry.npmjs.org/lodash._baseslice/-/lodash._baseslice-4.0.0.tgz" "resolved": "https://registry.npmjs.org/lodash._baseslice/-/lodash._baseslice-4.0.0.tgz"
}, },
"lodash.pad": {
"version": "4.4.0",
"from": "lodash.pad@>=4.1.0 <5.0.0",
"resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-4.4.0.tgz"
},
"mime-types": {
"version": "2.1.11",
"from": "mime-types@>=2.1.7 <2.2.0",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz"
},
"lodash._basetostring": { "lodash._basetostring": {
"version": "4.12.0", "version": "4.12.0",
"from": "lodash._basetostring@>=4.12.0 <4.13.0", "from": "lodash._basetostring@>=4.12.0 <4.13.0",
"resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-4.12.0.tgz" "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-4.12.0.tgz"
}, },
"lodash.pad": {
"version": "4.4.0",
"from": "lodash.pad@>=4.1.0 <5.0.0",
"resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-4.4.0.tgz"
},
"lodash.padend": {
"version": "4.5.0",
"from": "lodash.padend@>=4.1.0 <5.0.0",
"resolved": "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.5.0.tgz"
},
"lodash.padstart": { "lodash.padstart": {
"version": "4.5.0", "version": "4.5.0",
"from": "lodash.padstart@>=4.1.0 <5.0.0", "from": "lodash.padstart@>=4.1.0 <5.0.0",
"resolved": "https://registry.npmjs.org/lodash.padstart/-/lodash.padstart-4.5.0.tgz" "resolved": "https://registry.npmjs.org/lodash.padstart/-/lodash.padstart-4.5.0.tgz"
}, },
"mkdirp": {
"version": "0.5.1",
"from": "mkdirp@>=0.5.0 <0.6.0",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"
},
"mime-db": {
"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"
},
"oauth-sign": {
"version": "0.8.2",
"from": "oauth-sign@>=0.8.1 <0.9.0",
"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"
},
"lodash.tostring": { "lodash.tostring": {
"version": "4.1.3", "version": "4.1.3",
"from": "lodash.tostring@>=4.0.0 <5.0.0", "from": "lodash.tostring@>=4.0.0 <5.0.0",
"resolved": "https://registry.npmjs.org/lodash.tostring/-/lodash.tostring-4.1.3.tgz" "resolved": "https://registry.npmjs.org/lodash.tostring/-/lodash.tostring-4.1.3.tgz"
}, },
"minimist": { "mime-db": {
"version": "0.0.8", "version": "1.23.0",
"from": "minimist@0.0.8", "from": "mime-db@>=1.23.0 <1.24.0",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz" "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz"
}, },
"node-uuid": { "mime-types": {
"version": "1.4.7", "version": "2.1.11",
"from": "node-uuid@>=1.4.7 <1.5.0", "from": "mime-types@>=2.1.7 <2.2.0",
"resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz" "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz"
}, },
"minimatch": { "minimatch": {
"version": "3.0.0", "version": "3.0.0",
"from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0", "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz" "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz"
}, },
"npmlog": { "minimist": {
"version": "2.0.3", "version": "0.0.8",
"from": "npmlog@>=2.0.0 <2.1.0", "from": "minimist@0.0.8",
"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-2.0.3.tgz" "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
}, },
"nopt": { "mkdirp": {
"version": "3.0.6", "version": "0.5.1",
"from": "nopt@>=3.0.1 <3.1.0", "from": "mkdirp@>=0.5.0 <0.6.0",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz" "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"
},
"qs": {
"version": "6.1.0",
"from": "qs@>=6.1.0 <6.2.0",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.1.0.tgz"
}, },
"ms": { "ms": {
"version": "0.7.1", "version": "0.7.1",
"from": "ms@0.7.1", "from": "ms@0.7.1",
"resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz" "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
}, },
"path-is-absolute": { "node-uuid": {
"version": "1.0.0", "version": "1.4.7",
"from": "path-is-absolute@>=1.0.0 <2.0.0", "from": "node-uuid@>=1.4.7 <1.5.0",
"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz" "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
},
"nopt": {
"version": "3.0.6",
"from": "nopt@>=3.0.1 <3.1.0",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz"
},
"oauth-sign": {
"version": "0.8.2",
"from": "oauth-sign@>=0.8.1 <0.9.0",
"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"
},
"npmlog": {
"version": "2.0.3",
"from": "npmlog@>=2.0.0 <2.1.0",
"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-2.0.3.tgz"
}, },
"once": { "once": {
"version": "1.3.3", "version": "1.3.3",
"from": "once@>=1.3.0 <2.0.0", "from": "once@>=1.3.0 <2.0.0",
"resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz" "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz"
}, },
"pinkie-promise": { "path-is-absolute": {
"version": "2.0.1", "version": "1.0.0",
"from": "pinkie-promise@>=2.0.0 <3.0.0", "from": "path-is-absolute@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz" "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
},
"strip-ansi": {
"version": "3.0.1",
"from": "strip-ansi@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
},
"process-nextick-args": {
"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.7.tgz"
},
"sntp": {
"version": "1.0.9",
"from": "sntp@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
},
"readable-stream": {
"version": "2.1.2",
"from": "readable-stream@>=2.0.0 <3.0.0||>=1.1.13 <2.0.0",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.2.tgz"
},
"rimraf": {
"version": "2.5.2",
"from": "rimraf@>=2.5.0 <2.6.0",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.2.tgz"
},
"request": {
"version": "2.72.0",
"from": "request@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/request/-/request-2.72.0.tgz"
},
"semver": {
"version": "5.1.0",
"from": "semver@>=5.1.0 <5.2.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz"
}, },
"pinkie": { "pinkie": {
"version": "2.0.4", "version": "2.0.4",
"from": "pinkie@>=2.0.0 <3.0.0", "from": "pinkie@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz" "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"
}, },
"supports-color": { "pinkie-promise": {
"version": "2.0.0", "version": "2.0.1",
"from": "supports-color@>=2.0.0 <3.0.0", "from": "pinkie-promise@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz" "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"
}, },
"stringstream": { "process-nextick-args": {
"version": "0.0.5", "version": "1.0.7",
"from": "stringstream@>=0.0.4 <0.1.0", "from": "process-nextick-args@>=1.0.6 <1.1.0",
"resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz" "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"
},
"qs": {
"version": "6.1.0",
"from": "qs@>=6.1.0 <6.2.0",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.1.0.tgz"
},
"readable-stream": {
"version": "2.1.2",
"from": "readable-stream@>=2.0.0 <3.0.0||>=1.1.13 <2.0.0",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.2.tgz"
},
"request": {
"version": "2.72.0",
"from": "request@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/request/-/request-2.72.0.tgz"
},
"rimraf": {
"version": "2.5.2",
"from": "rimraf@>=2.5.0 <2.6.0",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.2.tgz"
},
"semver": {
"version": "5.1.0",
"from": "semver@>=5.1.0 <5.2.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz"
},
"sntp": {
"version": "1.0.9",
"from": "sntp@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
}, },
"string_decoder": { "string_decoder": {
"version": "0.10.31", "version": "0.10.31",
"from": "string_decoder@>=0.10.0 <0.11.0", "from": "string_decoder@>=0.10.0 <0.11.0",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
}, },
"tunnel-agent": { "stringstream": {
"version": "0.4.3", "version": "0.0.5",
"from": "tunnel-agent@>=0.4.1 <0.5.0", "from": "stringstream@>=0.0.4 <0.1.0",
"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz" "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
}, },
"tar": { "strip-ansi": {
"version": "2.2.1", "version": "3.0.1",
"from": "tar@>=2.2.0 <2.3.0", "from": "strip-ansi@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz" "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
},
"wrappy": {
"version": "1.0.1",
"from": "wrappy@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
}, },
"strip-json-comments": { "strip-json-comments": {
"version": "1.0.4", "version": "1.0.4",
"from": "strip-json-comments@>=1.0.4 <1.1.0", "from": "strip-json-comments@>=1.0.4 <1.1.0",
"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz" "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz"
}, },
"xtend": { "supports-color": {
"version": "4.0.1", "version": "2.0.0",
"from": "xtend@>=4.0.0 <5.0.0", "from": "supports-color@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz" "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
},
"tar": {
"version": "2.2.1",
"from": "tar@>=2.2.0 <2.3.0",
"resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz"
}, },
"tough-cookie": { "tough-cookie": {
"version": "2.2.2", "version": "2.2.2",
"from": "tough-cookie@>=2.2.0 <2.3.0", "from": "tough-cookie@>=2.2.0 <2.3.0",
"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz" "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz"
}, },
"tweetnacl": {
"version": "0.13.3",
"from": "tweetnacl@>=0.13.0 <0.14.0",
"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz"
},
"uid-number": { "uid-number": {
"version": "0.0.6", "version": "0.0.6",
"from": "uid-number@>=0.0.6 <0.1.0", "from": "uid-number@>=0.0.6 <0.1.0",
"resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz" "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz"
}, },
"tunnel-agent": {
"version": "0.4.3",
"from": "tunnel-agent@>=0.4.1 <0.5.0",
"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"
},
"util-deprecate": { "util-deprecate": {
"version": "1.0.2", "version": "1.0.2",
"from": "util-deprecate@>=1.0.1 <1.1.0", "from": "util-deprecate@>=1.0.1 <1.1.0",
"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
}, },
"tweetnacl": {
"version": "0.13.3",
"from": "tweetnacl@>=0.13.0 <0.14.0",
"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz"
},
"verror": { "verror": {
"version": "1.3.6", "version": "1.3.6",
"from": "verror@1.3.6", "from": "verror@1.3.6",
"resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz" "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"
}, },
"rc": { "wrappy": {
"version": "1.1.6", "version": "1.0.1",
"from": "rc@>=1.1.0 <1.2.0", "from": "wrappy@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/rc/-/rc-1.1.6.tgz", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
},
"xtend": {
"version": "4.0.1",
"from": "xtend@>=4.0.0 <5.0.0",
"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
},
"bl": {
"version": "1.1.2",
"from": "bl@>=1.1.2 <1.2.0",
"resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz",
"dependencies": { "dependencies": {
"minimist": { "readable-stream": {
"version": "1.2.0", "version": "2.0.6",
"from": "minimist@>=1.2.0 <2.0.0", "from": "readable-stream@>=2.0.5 <2.1.0",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz" "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
}
}
},
"dashdash": {
"version": "1.13.1",
"from": "dashdash@>=1.12.0 <2.0.0",
"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.13.1.tgz",
"dependencies": {
"assert-plus": {
"version": "1.0.0",
"from": "assert-plus@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
} }
} }
}, },
@ -3454,6 +3466,18 @@
} }
} }
}, },
"rc": {
"version": "1.1.6",
"from": "rc@>=1.1.0 <1.2.0",
"resolved": "https://registry.npmjs.org/rc/-/rc-1.1.6.tgz",
"dependencies": {
"minimist": {
"version": "1.2.0",
"from": "minimist@>=1.2.0 <2.0.0",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
}
}
},
"sshpk": { "sshpk": {
"version": "1.8.3", "version": "1.8.3",
"from": "sshpk@>=1.7.0 <2.0.0", "from": "sshpk@>=1.7.0 <2.0.0",
@ -3477,30 +3501,6 @@
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz" "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
} }
} }
},
"bl": {
"version": "1.1.2",
"from": "bl@>=1.1.2 <1.2.0",
"resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz",
"dependencies": {
"readable-stream": {
"version": "2.0.6",
"from": "readable-stream@>=2.0.5 <2.1.0",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
}
}
},
"dashdash": {
"version": "1.13.1",
"from": "dashdash@>=1.12.0 <2.0.0",
"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.13.1.tgz",
"dependencies": {
"assert-plus": {
"version": "1.0.0",
"from": "assert-plus@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
}
}
} }
} }
}, },

View File

@ -37,7 +37,7 @@
"request": "~2.62.0", "request": "~2.62.0",
"step": "~0.0.6", "step": "~0.0.6",
"step-profiler": "~0.3.0", "step-profiler": "~0.3.0",
"turbo-carto": "0.14.0", "turbo-carto": "0.15.0",
"underscore": "~1.6.0", "underscore": "~1.6.0",
"windshaft": "2.4.0" "windshaft": "2.4.0"
}, },

View File

@ -50,14 +50,14 @@ describe('turbo-carto error cases', function() {
}); });
it('should return invalid number of ramp error', function(done) { it('should return invalid number of ramp error', function(done) {
this.testClient = new TestClient(makeMapconfig('ramp([pop_max], (8,24,96), (8,24,96,128))')); this.testClient = new TestClient(makeMapconfig('ramp([pop_max], 8, 96, 3, (8,24,96,128))'));
this.testClient.getLayergroup(ERROR_RESPONSE, function(err, layergroup) { this.testClient.getLayergroup(ERROR_RESPONSE, function(err, layergroup) {
assert.ok(!err, err); assert.ok(!err, err);
assert.ok(layergroup.hasOwnProperty('errors')); assert.ok(layergroup.hasOwnProperty('errors'));
assert.equal(layergroup.errors.length, 1); assert.equal(layergroup.errors.length, 1);
assert.ok(layergroup.errors[0].match(/^Failed\sto\sprocess/)); assert.ok(layergroup.errors[0].match(/^Failed\sto\sprocess/), layergroup.errors[0]);
assert.ok(layergroup.errors[0].match(/invalid\sramp\slength/i)); assert.ok(layergroup.errors[0].match(/invalid\sramp\slength/i), layergroup.errors[0]);
done(); done();
}); });

View File

@ -287,4 +287,97 @@ describe('turbo-carto regressions', function() {
}); });
}); });
var scenarios = [
{
desc: 'numeric datasource',
cartocss: [
"#points {",
" marker-fill: ramp([scalerank], colorbrewer(Reds), category);",
"}"
].join('\n'),
expected: [
'#points {',
' marker-fill: #fee5d9;',
' [ scalerank = 6 ] {',
' marker-fill: #fcae91',
' }',
' [ scalerank = 8 ] {',
' marker-fill: #fb6a4a',
' }',
' [ scalerank = 4 ] {',
' marker-fill: #de2d26',
' }',
' [ scalerank = 10 ] {',
' marker-fill: #a50f15',
' }',
'}',
].join('\n')
},
{
desc: 'string datasource',
cartocss: [
"#points {",
" marker-fill: ramp([adm0name], colorbrewer(Reds), category);",
"}"
].join('\n'),
expected: [
'#points {',
' marker-fill: #fee5d9;',
' [ adm0name = "Russia" ] {',
' marker-fill: #fcae91',
' }',
' [ adm0name = "China" ] {',
' marker-fill: #fb6a4a',
' }',
' [ adm0name = "Brazil" ] {',
' marker-fill: #de2d26',
' }',
' [ adm0name = "Canada" ] {',
' marker-fill: #a50f15',
' }',
'}',
].join('\n')
},
{
desc: 'numeric manual',
cartocss: [
"#points {",
" marker-fill: ramp([scalerank], colorbrewer(Reds), (-1, 6, 8, 4, 10), category);",
"}"
].join('\n'),
expected: [
'#points {',
' marker-fill: #fee5d9;',
' [ scalerank = 6 ] {',
' marker-fill: #fcae91',
' }',
' [ scalerank = 8 ] {',
' marker-fill: #fb6a4a',
' }',
' [ scalerank = 4 ] {',
' marker-fill: #de2d26',
' }',
' [ scalerank = 10 ] {',
' marker-fill: #a50f15',
' }',
'}',
].join('\n')
}
];
scenarios.forEach(function(scenario) {
it('category ramps should use original type: ' + scenario.desc, function(done) {
var mapConfig = makeMapconfig('SELECT * FROM populated_places_simple_reduced', scenario.cartocss);
this.testClient = new TestClient(mapConfig);
this.testClient.getLayergroup(function(err, layergroup) {
assert.ok(!err, err);
assert.ok(layergroup.hasOwnProperty('layergroupid'));
assert.deepEqual(layergroup.metadata.layers[0].meta.cartocss, scenario.expected);
done();
});
});
});
}); });