Release 2.18.0

Merge pull request #342 from CartoDB/upgrade-mapnik
Upgrade mapnik
2015-11-02 10:38:50 +01:00 · 2015-11-02 10:31:49 +01:00 · 2015-10-29 18:31:15 +01:00 · 2015-10-29 18:30:02 +01:00 · 2015-10-28 19:27:53 +01:00 · 2015-10-28 19:27:03 +01:00
6 changed files with 100 additions and 57 deletions
--- a/11
+++ b/11
@@ -1,12 +1,11 @@
 1. Test (make clean all check), fix if broken before proceeding
 2. Ensure proper version in package.json 
 3. Ensure NEWS section exists for the new version, review it, add release date
-4. Drop npm-shrinkwrap.json
-5. Run npm shrinkwrap to recreate npm-shrinkwrap.json
-6. Commit package.json, npm-shrinwrap.json, NEWS
-7. git tag -a Major.Minor.Patch # use NEWS section as content
-8. Announce on cartodb@googlegroups.com
-9. Stub NEWS/package for next version
+4. Recreate npm-shrinkwrap.json with: `npm install --no-shrinkwrap && npm shrinkwrap`
+5. Commit package.json, npm-shrinwrap.json, NEWS
+6. git tag -a Major.Minor.Patch # use NEWS section as content
+7. Announce on cartodb@googlegroups.com
+8. Stub NEWS/package for next version

 Versions:

--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,47 @@
 # Changelog

+## 2.18.0
+
+Released 2015-11-02
+
+Announcements:
+ - Upgrades windshaft to [1.5.0](https://github.com/CartoDB/Windshaft/releases/tag/1.5.0)
+
+
+## 2.17.0
+
+Released 2015-10-28
+
+Announcements:
+ - Upgrades windshaft to [1.4.0](https://github.com/CartoDB/Windshaft/releases/tag/1.4.0)
+
+
+## 2.16.0
+
+Released 2015-10-22
+
+Announcements:
+ - Upgrades windshaft to [1.2.0](https://github.com/CartoDB/Windshaft/releases/tag/1.2.0)
+
+
+## 2.15.1
+
+Released 2015-10-21
+
+Announcements:
+ - Upgrades windshaft to [1.1.1](https://github.com/CartoDB/Windshaft/releases/tag/1.1.1)
+
+
+## 2.15.0
+
+Released 2015-10-13
+
+Announcements:
+ - Fastly purging no longer uses soft-purge option
+ - Upgrades windshaft to [1.1.0](https://github.com/CartoDB/Windshaft/releases/tag/1.1.0)
+ - Upgrades fastly-purge to [1.0.1](https://github.com/CartoDB/node-fastly-purge/releases/tag/1.0.1)
+
+
 ## 2.14.1

 Released 2015-09-30
--- a/lib/cartodb/cache/backend/fastly.js
+++ b/lib/cartodb/cache/backend/fastly.js
@@ -1,8 +1,8 @@
 var FastlyPurge = require('fastly-purge');

-function FastlyCacheBackend(apiKey, serviceId, softPurge) {
+function FastlyCacheBackend(apiKey, serviceId) {
    this.serviceId = serviceId;
-    this.fastlyPurge = new FastlyPurge(apiKey, { softPurge: softPurge || true });
+    this.fastlyPurge = new FastlyPurge(apiKey, { softPurge: false });
 }

 module.exports = FastlyCacheBackend;
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
  "name": "windshaft-cartodb",
-  "version": "2.14.1",
+  "version": "2.18.0",
  "dependencies": {
    "body-parser": {
      "version": "1.14.1",
@@ -406,8 +406,8 @@
      }
    },
    "fastly-purge": {
-      "version": "1.0.0",
-      "from": "fastly-purge@~1.0.0"
+      "version": "1.0.1",
+      "from": "fastly-purge@~1.0.1"
    },
    "log4js": {
      "version": "0.6.25",
@@ -441,7 +441,7 @@
            },
            "inherits": {
              "version": "2.0.1",
-              "from": "inherits@2",
+              "from": "inherits@~2.0.1",
              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
            }
          }
@@ -522,9 +522,9 @@
          "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.0.tgz",
          "dependencies": {
            "readable-stream": {
-              "version": "2.0.2",
+              "version": "2.0.3",
              "from": "readable-stream@~2.0.0",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.3.tgz",
              "dependencies": {
                "core-util-is": {
                  "version": "1.0.1",
@@ -533,7 +533,7 @@
                },
                "inherits": {
                  "version": "2.0.1",
-                  "from": "inherits@2",
+                  "from": "inherits@~2.0.1",
                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                },
                "isarray": {
@@ -552,9 +552,9 @@
                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                },
                "util-deprecate": {
-                  "version": "1.0.1",
+                  "version": "1.0.2",
                  "from": "util-deprecate@~1.0.1",
-                  "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz"
+                  "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
                }
              }
            }
@@ -581,9 +581,9 @@
          "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz",
          "dependencies": {
            "async": {
-              "version": "1.4.2",
+              "version": "1.5.0",
              "from": "async@^1.4.0",
-              "resolved": "https://registry.npmjs.org/async/-/async-1.4.2.tgz"
+              "resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz"
            }
          }
        },
@@ -620,9 +620,9 @@
          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
        },
        "tough-cookie": {
-          "version": "2.0.0",
+          "version": "2.2.0",
          "from": "tough-cookie@>=0.12.0",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.0.0.tgz"
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.0.tgz"
        },
        "http-signature": {
          "version": "0.11.0",
@@ -662,9 +662,9 @@
              "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
            },
            "boom": {
-              "version": "2.9.0",
+              "version": "2.10.0",
              "from": "boom@^2.8.x",
-              "resolved": "https://registry.npmjs.org/boom/-/boom-2.9.0.tgz"
+              "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.0.tgz"
            },
            "cryptiles": {
              "version": "2.0.5",
@@ -684,9 +684,9 @@
          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
        },
        "stringstream": {
-          "version": "0.0.4",
+          "version": "0.0.5",
          "from": "stringstream@~0.0.4",
-          "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
+          "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
        },
        "combined-stream": {
          "version": "1.0.5",
@@ -711,9 +711,9 @@
          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz",
          "dependencies": {
            "bluebird": {
-              "version": "2.10.1",
+              "version": "2.10.2",
              "from": "bluebird@^2.9.30",
-              "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.10.1.tgz"
+              "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.10.2.tgz"
            },
            "chalk": {
              "version": "1.1.1",
@@ -762,9 +762,9 @@
              }
            },
            "commander": {
-              "version": "2.8.1",
+              "version": "2.9.0",
              "from": "commander@^2.8.1",
-              "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
+              "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
              "dependencies": {
                "graceful-readlink": {
                  "version": "1.0.1",
@@ -827,13 +827,13 @@
      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
    },
    "windshaft": {
-      "version": "1.0.1",
-      "from": "windshaft@~1.0.1",
+      "version": "1.5.0",
+      "from": "windshaft@~1.5.0",
      "dependencies": {
        "mapnik": {
-          "version": "1.4.15-cdb2",
-          "from": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb2",
-          "resolved": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb2",
+          "version": "1.4.15-cdb5",
+          "from": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb5",
+          "resolved": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb5",
          "dependencies": {
            "nan": {
              "version": "1.2.0",
@@ -1216,8 +1216,8 @@
          }
        },
        "grainstore": {
-          "version": "1.0.0",
-          "from": "grainstore@~1.0.0",
+          "version": "1.1.0",
+          "from": "grainstore@~1.1.0",
          "dependencies": {
            "carto": {
              "version": "0.9.5-cdb2",
@@ -1301,9 +1301,9 @@
                      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
                    },
                    "tough-cookie": {
-                      "version": "2.0.0",
+                      "version": "2.2.0",
                      "from": "tough-cookie@>=0.12.0",
-                      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.0.0.tgz"
+                      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.0.tgz"
                    },
                    "form-data": {
                      "version": "0.1.4",
@@ -2966,6 +2966,11 @@
                  }
                }
              }
+            },
+            "semver": {
+              "version": "5.0.3",
+              "from": "semver@~5.0.3",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"
            }
          }
        },
@@ -2994,9 +2999,9 @@
          }
        },
        "tilelive-mapnik": {
-          "version": "0.6.15",
-          "from": "https://github.com/CartoDB/tilelive-mapnik/tarball/0.6.x-cdb1",
-          "resolved": "https://github.com/CartoDB/tilelive-mapnik/tarball/0.6.x-cdb1",
+          "version": "0.6.15-cdb3",
+          "from": "https://github.com/CartoDB/tilelive-mapnik/tarball/0.6.15-cdb3",
+          "resolved": "https://github.com/CartoDB/tilelive-mapnik/tarball/0.6.15-cdb3",
          "dependencies": {
            "generic-pool": {
              "version": "2.1.1",
@@ -3011,14 +3016,14 @@
          }
        },
        "tilelive-bridge": {
-          "version": "1.3.0",
-          "from": "https://github.com/CartoDB/tilelive-bridge/tarball/gzip-option",
-          "resolved": "https://github.com/CartoDB/tilelive-bridge/tarball/gzip-option",
+          "version": "1.3.0-cdb3",
+          "from": "https://github.com/CartoDB/tilelive-bridge/tarball/1.3.0-cdb3",
+          "resolved": "https://github.com/CartoDB/tilelive-bridge/tarball/1.3.0-cdb3",
          "dependencies": {
            "mapnik-pool": {
-              "version": "0.1.1",
-              "from": "https://github.com/CartoDB/mapnik-pool/tarball/cdb",
-              "resolved": "https://github.com/CartoDB/mapnik-pool/tarball/cdb",
+              "version": "0.1.1-cdb3",
+              "from": "https://github.com/CartoDB/mapnik-pool/tarball/0.1.1-cdb3",
+              "resolved": "https://github.com/CartoDB/mapnik-pool/tarball/0.1.1-cdb3",
              "dependencies": {
                "generic-pool": {
                  "version": "2.1.1",
@@ -3104,9 +3109,9 @@
          "resolved": "https://registry.npmjs.org/torque.js/-/torque.js-2.11.0.tgz"
        },
        "abaculus": {
-          "version": "1.1.0",
-          "from": "https://github.com/CartoDB/abaculus/tarball/cdb",
-          "resolved": "https://github.com/CartoDB/abaculus/tarball/cdb"
+          "version": "1.1.0-cdb3",
+          "from": "https://github.com/CartoDB/abaculus/tarball/1.1.0-cdb3",
+          "resolved": "https://github.com/CartoDB/abaculus/tarball/1.1.0-cdb3"
        },
        "sphericalmercator": {
          "version": "1.0.3",
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
    "private": true,
    "name": "windshaft-cartodb",
-    "version": "2.14.1",
+    "version": "2.18.0",
    "description": "A map tile server for CartoDB",
    "keywords": [
      "cartodb"
@@ -29,13 +29,13 @@
        "node-statsd": "~0.0.7",
        "underscore"  : "~1.6.0",
        "dot": "~1.0.2",
-        "windshaft": "~1.0.1",
+        "windshaft": "~1.5.0",
        "step": "~0.0.6",
        "queue-async": "~1.0.7",
        "request": "~2.62.0",
        "cartodb-redis": "~0.13.0",
        "cartodb-psql": "~0.4.0",
-        "fastly-purge": "~1.0.0",
+        "fastly-purge": "~1.0.1",
        "redis-mpool": "~0.4.0",
        "lru-cache": "2.6.5",
        "lzma": "~1.3.7",
--- a/test/acceptance/cache/surrogate_keys_invalidation.js
+++ b/test/acceptance/cache/surrogate_keys_invalidation.js
@@ -68,7 +68,7 @@ describe('templates surrogate keys', function() {

    var cacheEntryKey = new NamedMapsCacheEntry(templateOwner, templateName).key();
    var invalidationMatchHeader = '\\b' + cacheEntryKey + '\\b';
-    var fastlyPurgePath = '/service/' + FAKE_FASTLY_SERVICE_ID + '/purge/' + encodeURIComponent(cacheEntryKey);
+    var fastlyPurgePath = '/service/' + FAKE_FASTLY_SERVICE_ID + '/purge/' + cacheEntryKey;

    var nock = require('nock');
    nock.enableNetConnect(/(127.0.0.1:5555|cartocdn.com)/);
@@ -132,7 +132,6 @@ describe('templates surrogate keys', function() {
        var fastlyScope = nock(FastlyPurge.FASTLY_API_ENDPOINT)
            .post(fastlyPurgePath)
            .matchHeader('Fastly-Key', FAKE_FASTLY_API_KEY)
-            .matchHeader('Fastly-Soft-Purge', 1)
            .matchHeader('Accept', 'application/json')
            .reply(200, {
                status:'ok'
@@ -199,7 +198,6 @@ describe('templates surrogate keys', function() {
        var fastlyScope = nock(FastlyPurge.FASTLY_API_ENDPOINT)
            .post(fastlyPurgePath)
            .matchHeader('Fastly-Key', FAKE_FASTLY_API_KEY)
-            .matchHeader('Fastly-Soft-Purge', 1)
            .matchHeader('Accept', 'application/json')
            .reply(200, {
                status:'ok'
@@ -260,7 +258,6 @@ describe('templates surrogate keys', function() {
        var fastlyScope = nock(FastlyPurge.FASTLY_API_ENDPOINT)
            .post(fastlyPurgePath)
            .matchHeader('Fastly-Key', FAKE_FASTLY_API_KEY)
-            .matchHeader('Fastly-Soft-Purge', 1)
            .matchHeader('Accept', 'application/json')
            .reply(200, {
                status:'ok'
Author	SHA1	Message	Date
Raul Ochoa	c9e95ccc9d	Release 2.18.0	2015-11-02 10:38:50 +01:00
Raul Ochoa	98b14de02e	Merge pull request #342 from CartoDB/upgrade-mapnik Upgrade mapnik	2015-11-02 10:31:49 +01:00
Raul Ochoa	479861e612	Update news	2015-10-29 18:31:15 +01:00
Raul Ochoa	a746445b88	Upgrade windshaft to 1.5.0	2015-10-29 18:30:02 +01:00
Raul Ochoa	a20a1f692b	Stubs next version	2015-10-28 19:27:53 +01:00
Raul Ochoa	628b1921b4	Release 2.17.0	2015-10-28 19:27:03 +01:00
Raul Ochoa	fd8131201d	Merge pull request #341 from CartoDB/upgrade-mapnik Upgrades windshaft to 1.4.0	2015-10-28 19:26:11 +01:00
Raul Ochoa	ee39450864	Regenerate npm-shrinkwrap.json	2015-10-28 19:21:22 +01:00
Raul Ochoa	34e866007e	Use windshaft 1.4.0	2015-10-28 19:15:26 +01:00
Raul Ochoa	3fa4f8573e	Upgrades windshaft to 1.3.0	2015-10-28 16:31:11 +01:00
Raul Ochoa	2f592e6f62	Stubs next version	2015-10-22 16:28:49 +02:00
Raul Ochoa	860d4bb475	Release 2.16.0	2015-10-22 16:27:52 +02:00
Raul Ochoa	c7b5fb9187	Be more clear about how to upgrade shrinkwrap file	2015-10-22 16:26:37 +02:00
Raul Ochoa	f513db837d	Merge pull request #338 from CartoDB/upgrade-windshaft Upgrades windshaft to 1.2.0	2015-10-21 18:56:45 +02:00
Raul Ochoa	d7181ec6c2	Upgrades windshaft to 1.2.0	2015-10-21 18:38:19 +02:00
Raul Ochoa	7761f56d36	Stubs next version	2015-10-21 13:58:26 +02:00
Raul Ochoa	f136b9f6e7	Release 2.15.1	2015-10-21 13:56:53 +02:00
Raul Ochoa	12175f10a6	Upgrades windshaft to 1.1.1	2015-10-21 13:55:36 +02:00
Raul Ochoa	01bd09040e	Stubs next version	2015-10-13 12:44:29 +02:00
Raul Ochoa	ab38e7069a	Release 2.15.0	2015-10-13 12:36:25 +02:00
Raul Ochoa	9449642773	Remove soft-purge option when purging fastly	2015-10-09 16:37:17 +02:00
Raul Ochoa	1f489a4537	Fix broken test due fastly-purge upgrade	2015-10-09 16:02:11 +02:00
Raul Ochoa	6effcfb62e	Upgrades windshaft to 1.1.0 and fastly-purge to 1.0.1	2015-10-09 15:50:39 +02:00
Raul Ochoa	2cc4cc5deb	Stubs next version	2015-09-30 19:26:33 +02:00