diff --git a/NEWS.md b/NEWS.md index 15c8e3f4..2f3f3869 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,10 +1,21 @@ # Changelog -## 2.14.2 +## 2.15.1 Released 2015-mm-dd + +## 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 diff --git a/lib/cartodb/cache/backend/fastly.js b/lib/cartodb/cache/backend/fastly.js index d641b5d6..1dad622c 100644 --- 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; diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 727251f8..b556fd73 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "windshaft-cartodb", - "version": "2.14.2", + "version": "2.15.1", "dependencies": { "body-parser": { "version": "1.14.1", @@ -58,7 +58,7 @@ }, "qs": { "version": "5.1.0", - "from": "qs@5.1.0", + "from": "qs@~5.1.0", "resolved": "https://registry.npmjs.org/qs/-/qs-5.1.0.tgz" }, "raw-body": { @@ -85,7 +85,7 @@ }, "mime-types": { "version": "2.1.7", - "from": "mime-types@~2.1.6", + "from": "mime-types@~2.1.7", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz", "dependencies": { "mime-db": { @@ -192,7 +192,7 @@ "dependencies": { "mime-types": { "version": "2.1.7", - "from": "mime-types@~2.1.6", + "from": "mime-types@~2.1.7", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz", "dependencies": { "mime-db": { @@ -359,7 +359,7 @@ }, "statuses": { "version": "1.2.1", - "from": "statuses@~1.2.1", + "from": "statuses@1", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz" } } @@ -381,7 +381,7 @@ }, "mime-types": { "version": "2.1.7", - "from": "mime-types@~2.1.6", + "from": "mime-types@~2.1.7", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz", "dependencies": { "mime-db": { @@ -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.0.1", + "from": "inherits@2", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } @@ -533,7 +533,7 @@ }, "inherits": { "version": "2.0.1", - "from": "inherits@~2.0.1", + "from": "inherits@2", "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" } } } @@ -620,9 +620,9 @@ "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz" }, "tough-cookie": { - "version": "2.1.0", + "version": "2.2.0", "from": "tough-cookie@>=0.12.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.1.0.tgz" + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.0.tgz" }, "http-signature": { "version": "0.11.0", @@ -827,7 +827,7 @@ "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz" }, "windshaft": { - "version": "1.0.2", + "version": "1.1.1", "from": "https://github.com/CartoDB/Windshaft/tarball/mapconfig-extension", "resolved": "https://github.com/CartoDB/Windshaft/tarball/mapconfig-extension", "dependencies": { @@ -1302,9 +1302,9 @@ "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz" }, "tough-cookie": { - "version": "2.1.0", + "version": "2.2.0", "from": "tough-cookie@>=0.12.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.1.0.tgz" + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.0.tgz" }, "form-data": { "version": "0.1.4", diff --git a/package.json b/package.json index 12f9194e..65bed259 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "windshaft-cartodb", - "version": "2.14.2", + "version": "2.15.1", "description": "A map tile server for CartoDB", "keywords": [ "cartodb" @@ -35,7 +35,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", diff --git a/test/acceptance/cache/surrogate_keys_invalidation.js b/test/acceptance/cache/surrogate_keys_invalidation.js index 8a69d2dc..fbe2ff7d 100644 --- 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'