Rename carto version parameters and add its support to GET tile

Also upgrades "carto" to 0.9.3 and "millstone" to 0.5.11

NEWS.md

@@ -2,8 +2,9 @@
 -----
 * Add /version entry point
 * CartoCSS versioning
- * Include version in GET /style response
- * Support version and convert parameters in POST /style request
+ * Include style_version in GET /style response
+ * Support style_version and style_convert parameters in POST /style request
+ * Support style_version in GET /:z/:x/:y request
  * Autodetect target mapnik version and let config override it
  * Add tools/reset_styles script to batch-reset (and optionally convert) styles
 * Configurable logging format (#4)

npm-shrinkwrap.json

@@ -180,10 +180,10 @@
       "version": "1.3.3"
     },
     "grainstore": {
-      "version": "0.9.1",
+      "version": "0.9.2",
       "dependencies": {
         "carto": {
-          "version": "0.9.2",
+          "version": "0.9.3",
           "dependencies": {
             "mapnik-reference": {
               "version": "5.0.0"
@@ -199,7 +199,7 @@
           }
         },
         "millstone": {
-          "version": "0.5.10",
+          "version": "0.5.11",
           "dependencies": {
             "request": {
               "version": "2.11.4",
@@ -226,7 +226,7 @@
               }
             },
             "srs": {
-              "version": "0.2.16"
+              "version": "0.2.17"
             },
             "zipfile": {
               "version": "0.3.2"
@@ -245,7 +245,7 @@
       }
     },
     "windshaft": {
-      "version": "0.6.2",
+      "version": "0.7.0",
       "dependencies": {
         "express": {
           "version": "2.5.11",

package.json

@@ -21,8 +21,8 @@
         "cluster2": "git://github.com/CartoDB/cluster2.git#cdb_production",
         "node-varnish": "0.1.1",
         "underscore"  : "~1.3.3",
-        "grainstore"  : "~0.9.1",
-        "windshaft"  : "~0.6.2",
+        "grainstore"  : "~0.9.2",
+        "windshaft"  : "~0.7.0",
         "step": "0.0.x",
         "generic-pool": "1.0.x",
         "redis": "0.7.2",

test/acceptance/server.js

@@ -79,7 +79,7 @@ suite('server', function() {
         }, function(res) {
             var parsed = JSON.parse(res.body);
             assert.equal(parsed.style, "#my_table {marker-fill: #FF6600;marker-opacity: 1;marker-width: 8;marker-line-color: white;marker-line-width: 3;marker-line-opacity: 0.9;marker-placement: point;marker-type: ellipse;marker-allow-overlap: true;}");
-            assert.equal(parsed.version, '2.0.0');
+            assert.equal(parsed.style_version, '2.0.0');
             done();
         });
     });
@@ -112,7 +112,7 @@ suite('server', function() {
           assert.equal(res.statusCode, 200, res.body);
           var parsed = JSON.parse(res.body);
           assert.equal(parsed.style, "#test_table_private_1 {marker-fill: #FF6600;marker-opacity: 1;marker-width: 8;marker-line-color: white;marker-line-width: 3;marker-line-opacity: 0.9;marker-placement: point;marker-type: ellipse;marker-allow-overlap: true;}");
-          assert.equal(parsed.version, '2.0.0');
+          assert.equal(parsed.style_version, '2.0.0');
           done();
         });
     });