cartodb/CartoDB-SQL-API
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade underscore dependencies

Browse Source
This commit is contained in:
Sandro Santilli 2013-05-23 13:21:23 +02:00
parent 81a83b93e4
commit b1e7bb8f8f
4 changed files with 79 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS.md
View File

@ -2,6 +2,7 @@
------
* Fixed problem identifying OAuth request protocol
* Make base url configurable
* Update underscore dependency
1.3.9
-----

4
app/controllers/app.js
View File

@ -119,8 +119,8 @@ function handleQuery(req, res) {
filename = (filename === "" || _.isUndefined(filename)) ? 'cartodb-query' : sanitize_filename(filename);
sql = (sql === "" || _.isUndefined(sql)) ? null : sql;
database = (database === "" || _.isUndefined(database)) ? null : database;
limit = (_.isNumber(limit)) ? limit : null;
offset = (_.isNumber(offset)) ? offset * limit : null;
limit = (!_.isNaN(limit)) ? limit : null;
offset = (!_.isNaN(offset)) ? offset * limit : null;
// Accept both comma-separated string or array of comma-separated strings
if ( requestedSkipfields ) {

138
npm-shrinkwrap.json generated
View File

@ -1,16 +1,16 @@
{
"name": "cartodb_api",
"version": "1.3.8",
"version": "1.3.10",
"dependencies": {
"cluster2": {
"version": "0.3.5-cdb02",
"from": "git://github.com/CartoDB/cluster2.git#cdb_production",
"dependencies": {
"ejs": {
"version": "0.8.3"
"version": "0.8.4"
},
"npm": {
"version": "1.2.19",
"version": "1.2.22",
"dependencies": {
"semver": {
"version": "1.1.4"
@ -25,7 +25,7 @@
"version": "1.0.4"
},
"graceful-fs": {
"version": "1.2.0"
"version": "1.2.1"
},
"minimatch": {
"version": "0.2.12",
@ -42,54 +42,18 @@
"version": "2.1.4"
},
"request": {
"version": "2.20.0",
"version": "2.21.0",
"dependencies": {
"form-data": {
"version": "0.0.8",
"dependencies": {
"combined-stream": {
"version": "0.0.4",
"dependencies": {
"delayed-stream": {
"version": "0.0.5"
}
}
},
"async": {
"version": "0.2.7"
}
}
"qs": {
"version": "0.6.4"
},
"mime": {
"version": "1.2.9"
"json-stringify-safe": {
"version": "4.0.0"
},
"hawk": {
"version": "0.10.2",
"dependencies": {
"hoek": {
"version": "0.7.6"
},
"boom": {
"version": "0.3.8"
},
"cryptiles": {
"version": "0.1.3"
},
"sntp": {
"version": "0.1.4"
}
}
"forever-agent": {
"version": "0.5.0"
},
"node-uuid": {
"version": "1.4.0"
},
"cookie-jar": {
"version": "0.3.0"
},
"aws-sign": {
"version": "0.3.0"
},
"oauth-sign": {
"tunnel-agent": {
"version": "0.3.0"
},
"http-signature": {
@ -106,17 +70,53 @@
}
}
},
"forever-agent": {
"hawk": {
"version": "0.13.1",
"dependencies": {
"hoek": {
"version": "0.8.5"
},
"boom": {
"version": "0.4.1"
},
"cryptiles": {
"version": "0.2.1"
},
"sntp": {
"version": "0.2.2"
}
}
},
"aws-sign": {
"version": "0.3.0"
},
"tunnel-agent": {
"oauth-sign": {
"version": "0.3.0"
},
"json-stringify-safe": {
"version": "3.0.0"
"cookie-jar": {
"version": "0.3.0"
},
"qs": {
"version": "0.5.6"
"node-uuid": {
"version": "1.4.0"
},
"mime": {
"version": "1.2.9"
},
"form-data": {
"version": "0.0.8",
"dependencies": {
"combined-stream": {
"version": "0.0.4",
"dependencies": {
"delayed-stream": {
"version": "0.0.5"
}
}
},
"async": {
"version": "0.2.8"
}
}
}
}
},
@ -177,7 +177,7 @@
"version": "0.1.2"
},
"npm-registry-client": {
"version": "0.2.22",
"version": "0.2.23",
"dependencies": {
"couch-login": {
"version": "0.1.16"
@ -188,7 +188,7 @@
"version": "0.4.1",
"dependencies": {
"normalize-package-data": {
"version": "0.1.2",
"version": "0.1.6",
"dependencies": {
"github-url-from-git": {
"version": "1.1.1"
@ -215,7 +215,7 @@
"version": "0.0.3"
},
"lockfile": {
"version": "0.3.1"
"version": "0.3.2"
},
"retry": {
"version": "0.6.0"
@ -253,6 +253,9 @@
},
"child-process-close": {
"version": "0.1.1"
},
"npm-user-validate": {
"version": "0.0.1"
}
}
}
@ -265,7 +268,7 @@
"version": "1.9.2",
"dependencies": {
"formidable": {
"version": "1.0.11"
"version": "1.0.14"
}
}
},
@ -281,13 +284,13 @@
}
},
"underscore": {
"version": "1.1.7"
"version": "1.3.3"
},
"underscore.string": {
"version": "1.1.5",
"version": "1.1.6",
"dependencies": {
"underscore": {
"version": "1.1.6"
"version": "1.1.7"
}
}
},
@ -302,7 +305,12 @@
"version": "0.7.1"
},
"hiredis": {
"version": "0.1.14"
"version": "0.1.15",
"dependencies": {
"bindings": {
"version": "1.1.0"
}
}
},
"step": {
"version": "0.0.5"
@ -332,10 +340,10 @@
"version": "1.3.3"
},
"lru-cache": {
"version": "2.2.2"
"version": "2.2.4"
},
"zipfile": {
"version": "0.3.2"
"version": "0.3.4"
},
"libxmljs": {
"version": "0.6.1",
@ -366,7 +374,7 @@
"version": "1.0.2"
},
"debug": {
"version": "0.7.0"
"version": "0.7.2"
}
}
}

6
package.json
View File

@ -11,15 +11,15 @@
"dependencies": {
"cluster2": "git://github.com/CartoDB/cluster2.git#cdb_production",
"express": "~2.5.11",
"underscore" : "1.1.x",
"underscore.string": "1.1.5",
"underscore" : "~1.3.3",
"underscore.string": "~1.1.6",
"pg": "git://github.com/CartoDB/node-postgres.git#cdb-0.12.3-cdb2",
"express": "~2.5.11",
"generic-pool": "~2.0.2",
"redis": "0.7.1",
"hiredis": "*",
"step": "0.0.x",
"topojson": "~0.0.8",
"topojson": "0.0.8",
"oauth-client": "0.2.0",
"node-uuid":"1.3.3",
"lru-cache":"~2.2.2"