Merge pull request #206 from CartoDB/upgrade-dependencies

Upgrades dependencies

NEWS.md

@@ -7,6 +7,11 @@ New features:
 
 Enhancements:
  - Removes mapnik dependency as it now relies on Windshaft to check mapnik version
+ - Upgrades dependencies:
+    - underscore
+    - lzma
+    - log4js
+    - rollbar
 
 1.15.0 -- 2014-08-13
 --------------------

lib/cartodb/server_options.js

@@ -4,7 +4,7 @@ var   _          = require('underscore')
     , Cache      = require('./cache_validator')
     , QueryTablesApi   = require('./api/query_tables_api')
     , crypto     = require('crypto')
-    , LZMA       = require('lzma/lzma_worker.js').LZMA
+    , LZMA       = require('lzma').LZMA;
   ;
 
 // This is for backward compatibility with 1.3.3
@@ -18,6 +18,8 @@ if ( _.isUndefined(global.environment.sqlapi.domain) ) {
 
 module.exports = function(){
 
+    var lzmaWorker = new LZMA();
+
     var queryTablesApi = new QueryTablesApi();
 
     var rendererConfig = _.defaults(global.environment.renderer || {}, {
@@ -630,7 +632,7 @@ module.exports = function(){
           var lzma = (new Buffer(req.query.lzma, 'base64').toString('binary')).split('').map(function(c) { return c.charCodeAt(0) - 128 });
 
           // Decompress
-          LZMA.decompress(
+          lzmaWorker.decompress(
             lzma,
             function(result) {
               if (req.profiler) req.profiler.done('LZMA decompress');

npm-shrinkwrap.json

@@ -4,10 +4,10 @@
   "dependencies": {
     "node-varnish": {
       "version": "0.3.0",
-      "from": "http://github.com/Vizzuality/node-varnish/tarball/0.3.0"
+      "from": "https://github.com/Vizzuality/node-varnish/tarball/0.3.0"
     },
     "underscore": {
-      "version": "1.3.3"
+      "version": "1.6.0"
     },
     "windshaft": {
       "version": "0.24.1",
@@ -939,11 +939,11 @@
     },
     "cartodb-redis": {
       "version": "0.9.0",
-      "from": "git://github.com/CartoDB/node-cartodb-redis.git#0.9.0"
+      "from": "https://github.com/CartoDB/node-cartodb-redis/tarball/0.9.0"
     },
     "cartodb-psql": {
-      "version": "0.3.1",
-      "from": "git://github.com/CartoDB/node-cartodb-psql.git#0.3.1",
+      "version": "0.4.0",
+      "from": "https://github.com/CartoDB/node-cartodb-psql/tarball/0.4.0",
       "dependencies": {
           "pg": {
               "version": "2.6.2",
@@ -985,10 +985,10 @@
       }
     },
     "lzma": {
-      "version": "1.2.3"
+      "version": "1.3.7"
     },
     "log4js": {
-      "version": "0.6.14",
+      "version": "0.6.16",
       "dependencies": {
         "async": {
           "version": "0.1.15"
@@ -1013,7 +1013,7 @@
       }
     },
     "rollbar": {
-      "version": "0.3.8",
+      "version": "0.3.12",
       "dependencies": {
         "node-uuid": {
           "version": "1.4.1"
@@ -1033,7 +1033,7 @@
       "version": "1.1.4"
     },
     "strftime": {
-      "version": "0.6.2"
+      "version": "0.8.2"
     },
     "mocha": {
       "version": "1.14.0",

package.json

@@ -22,23 +22,23 @@
       "Sandro Santilli <strk@vizzuality.com>"
     ],
     "dependencies": {
-        "node-varnish": "http://github.com/Vizzuality/node-varnish/tarball/0.3.0",
-        "underscore"  : "~1.3.3",
+        "node-varnish": "https://github.com/Vizzuality/node-varnish/tarball/0.3.0",
+        "underscore"  : "~1.6.0",
         "windshaft": "https://github.com/CartoDB/Windshaft/tarball/0.24.1",
         "step": "~0.0.5",
-        "request": "2.9.202",
-        "cartodb-redis": "git://github.com/CartoDB/node-cartodb-redis.git#0.9.0",
-        "cartodb-psql": "git://github.com/CartoDB/node-cartodb-psql.git#0.3.1",
+        "request": "~2.9.202",
+        "cartodb-redis": "https://github.com/CartoDB/node-cartodb-redis/tarball/0.9.0",
+        "cartodb-psql": "https://github.com/CartoDB/node-cartodb-psql/tarball/0.4.0",
         "redis-mpool": "https://github.com/CartoDB/node-redis-mpool/tarball/0.1.0",
-        "lzma": "~1.2.3",
-        "log4js": "~0.6.10",
-        "rollbar": "~0.3.1"
+        "lzma": "~1.3.7",
+        "log4js": "~0.6.16",
+        "rollbar": "~0.3.12"
     },
     "devDependencies": {
         "mocha": "1.14.0",
-        "redis": "~0.8.3",
-        "strftime": "~0.6.0",
-        "semver": "~1.1.0"
+        "redis": "~0.8.6",
+        "strftime": "~0.8.2",
+        "semver": "~1.1.4"
     },
     "scripts": {
         "test": "make check"

test/support/test_helper.js

@@ -7,7 +7,9 @@
 
 var _ = require('underscore');
 var assert = require('assert');
-var LZMA  = require('lzma/lzma_worker.js').LZMA;
+var LZMA  = require('lzma').LZMA;
+
+var lzmaWorker = new LZMA();
 
 // set environment specific variables
 global.environment  = require(__dirname + '/../../config/environments/test');
@@ -16,7 +18,7 @@ process.env.NODE_ENV = 'test';
 
 // Utility function to compress & encode LZMA
 function lzma_compress_to_base64(payload, mode, callback) {
-  LZMA.compress(payload, mode, 
+  lzmaWorker.compress(payload, mode,
     function(ints) {
       ints = ints.map(function(c) { return String.fromCharCode(c + 128) }).join('')
       var base64 = new Buffer(ints, 'binary').toString('base64');