Add Support for Mapnik-2.2.0. Closes #78.

- Tolerate change in CartoCSS error message between 0.9.3 and 0.9.5
- Expect default style to be different for mapnik-2.2.0+ target

HOWTO_RELEASE

@@ -0,0 +1,11 @@
+1. Ensure proper version in package.json 
+2. Ensure NEWS section exists for the new version, review it, add release date
+3. Drop npm-shrinkwrap.json
+4. Run npm install
+5. Test (make check or npm test), fix if broken before proceeding
+6. Run npm shrinkwrap
+7. Commit package.json, npm-shrinwrap.json, NEWS
+8. Tag Major.Minor.Patch
+9. Announce
+10. Stub NEWS/package for next version
+

NEWS.md

@@ -1,3 +1,14 @@
+1.4.0 -- 2013-10-31
+-------------------
+
+* Add Support for Mapnik-2.2.0 (#78)
+
+1.3.6 -- 2013-10-11
+-------------------
+
+* Restore support for node-0.8.9 accidentally dropped by 1.3.5
+  NOTE: needs removing node_modules/windshaft and re-running npm install
+
 1.3.5 -- 2013-10-03
 -------------------
 

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "1.3.5",
+  "version": "1.4.0",
   "dependencies": {
     "node-varnish": {
       "version": "0.1.1"
@@ -9,34 +9,44 @@
       "version": "1.3.3"
     },
     "windshaft": {
-      "version": "0.13.7",
+      "version": "0.14.1",
       "dependencies": {
         "grainstore": {
-          "version": "0.13.11",
+          "version": "0.14.1",
           "dependencies": {
             "carto": {
-              "version": "0.9.3-cdb6",
-              "from": "git://github.com/CartoDB/carto.git#0.9.3-cdb6",
+              "version": "0.9.5-cdb1",
+              "from": "git://github.com/CartoDB/carto.git#0.9.5-cdb1",
               "dependencies": {
-                "mapnik-reference": {
-                  "version": "5.0.0-cdb1",
-                  "from": "git://github.com/CartoDB/mapnik-reference.git#cdb-5.0"
+                "underscore": {
+                  "version": "1.4.4"
                 },
                 "xml2js": {
-                  "version": "0.1.14",
+                  "version": "0.2.8",
                   "dependencies": {
                     "sax": {
                       "version": "0.5.5"
                     }
                   }
+                },
+                "optimist": {
+                  "version": "0.6.0",
+                  "dependencies": {
+                    "wordwrap": {
+                      "version": "0.0.2"
+                    },
+                    "minimist": {
+                      "version": "0.0.5"
+                    }
+                  }
                 }
               }
             },
             "mapnik-reference": {
-              "version": "5.0.6"
+              "version": "5.0.7"
             },
             "millstone": {
-              "version": "0.6.5",
+              "version": "0.6.8",
               "dependencies": {
                 "underscore": {
                   "version": "1.5.2"
@@ -118,13 +128,13 @@
                   }
                 },
                 "srs": {
-                  "version": "0.3.3"
+                  "version": "0.3.6"
                 },
                 "zipfile": {
-                  "version": "0.4.1"
+                  "version": "0.4.2"
                 },
                 "sqlite3": {
-                  "version": "2.1.17",
+                  "version": "2.1.18",
                   "dependencies": {
                     "progress": {
                       "version": "1.0.1"

package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "windshaft-cartodb",
-    "version": "1.3.5",
+    "version": "1.4.0",
     "description": "A map tile server for CartoDB",
     "url": "https://github.com/CartoDB/Windshaft-cartodb",
     "licenses": [{
@@ -21,13 +21,13 @@
     "dependencies": {
         "node-varnish": "0.1.1",
         "underscore"  : "~1.3.3",
-        "windshaft"  : "~0.13.7",
+        "windshaft"  : "~0.14.1",
         "step": "0.0.x",
         "generic-pool": "~2.0.3",
         "redis": "~0.8.3",
         "hiredis": "~0.1.14",
         "request": "2.9.202",
-        "mapnik": "~0.7.14",
+        "mapnik": "~0.7.22",
         "strftime": "~0.6.0",
         "lzma": "~1.2.3"
     },

test/acceptance/server.js

@@ -21,13 +21,20 @@ suite('server', function() {
     var redis_client = redis.createClient(global.environment.redis.port);
     var sqlapi_server;
 
-    var default_style = semver.satisfies(mapnik.versions.mapnik, '<2.1.0')
-    ?
+    var mapnik_version = global.environment.mapnik_version || mapnik.versions.mapnik;
+    var default_style;
+    if ( semver.satisfies(mapnik_version, '<2.1.0') ) {
       // 2.0.0 default
-      '#<%= 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;}'
-    :
+      default_style = '#<%= 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;}';
+    }
+    else if ( semver.satisfies(mapnik_version, '<2.2.0') ) {
       // 2.1.0 default
-      '#<%= table %>[mapnik-geometry-type=1] {marker-fill: #FF6600;marker-opacity: 1;marker-width: 16;marker-line-color: white;marker-line-width: 3;marker-line-opacity: 0.9;marker-placement: point;marker-type: ellipse;marker-allow-overlap: true;}#<%= table %>[mapnik-geometry-type=2] {line-color:#FF6600; line-width:1; line-opacity: 0.7;}#<%= table %>[mapnik-geometry-type=3] {polygon-fill:#FF6600; polygon-opacity: 0.7; line-opacity:1; line-color: #FFFFFF;}';
+      default_style = '#<%= table %>[mapnik-geometry-type=1] {marker-fill: #FF6600;marker-opacity: 1;marker-width: 16;marker-line-color: white;marker-line-width: 3;marker-line-opacity: 0.9;marker-placement: point;marker-type: ellipse;marker-allow-overlap: true;}#<%= table %>[mapnik-geometry-type=2] {line-color:#FF6600; line-width:1; line-opacity: 0.7;}#<%= table %>[mapnik-geometry-type=3] {polygon-fill:#FF6600; polygon-opacity: 0.7; line-opacity:1; line-color: #FFFFFF;}';
+    }
+    else {
+      // 2.2.0+ default
+      default_style = '#<%= table %>["mapnik::geometry_type"=1] {marker-fill: #FF6600;marker-opacity: 1;marker-width: 16;marker-line-color: white;marker-line-width: 3;marker-line-opacity: 0.9;marker-placement: point;marker-type: ellipse;marker-allow-overlap: true;}#<%= table %>["mapnik::geometry_type"=2] {line-color:#FF6600; line-width:1; line-opacity: 0.7;}#<%= table %>["mapnik::geometry_type"=3] {polygon-fill:#FF6600; polygon-opacity: 0.7; line-opacity:1; line-color: #FFFFFF;}';
+    }
 
     // A couple of styles to use during testing
     var test_style_black_200 = "#test_table{marker-fill:black;marker-line-color:red;marker-width:10}";
@@ -190,10 +197,11 @@ suite('server', function() {
             method: 'POST',
             headers: {host: 'localhost', 'Content-Type': 'application/x-www-form-urlencoded' },
             data: querystring.stringify({style: '#my_table3{'})
-        },{
-            status: 400, 
-            body: /Missing closing/
-        }, function() { done(); });
+        },{}, function(res) {
+          assert.equal(res.statusCode, 400, res.statusCode + ': ' + res.body);
+          assert.ok( RegExp(/missing closing/i).test(res.body) );
+          done();
+        });
     });
     
     test("post'ing multiple bad styles returns 400 with error array", function(done){