Release 2.47.1

Upgrades camshaft to 0.14.1
Stubs next version
2016-06-13 10:43:45 +02:00 · 2016-06-10 18:38:49 +02:00 · 2016-06-10 14:41:08 +02:00 · 2016-06-10 14:40:28 +02:00 · 2016-06-10 14:19:39 +02:00 · 2016-06-10 14:05:23 +02:00
5 changed files with 172 additions and 60 deletions
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,21 @@
 # Changelog

+## 2.47.1
+
+Released 2016-06-13
+
+Announcements:
+ - Upgrades camshaft to [0.14.1](https://github.com/CartoDB/camshaft/releases/tag/0.14.1)
+
+
+## 2.47.0
+
+Released 2016-06-10
+
+Announcements:
+ - Upgrades camshaft to [0.14.0](https://github.com/CartoDB/camshaft/releases/tag/0.14.0)
+
+
 ## 2.46.0

 Released 2016-06-09
--- a/lib/cartodb/models/mapconfig/adapter/analysis-mapconfig-adapter.js
+++ b/lib/cartodb/models/mapconfig/adapter/analysis-mapconfig-adapter.js
@@ -232,6 +232,15 @@ function getDataviewsList(dataviews) {
 }

 function getDataviewsErrors(dataviews) {
+    var dataviewType = typeof dataviews;
+    if (dataviewType !== 'object') {
+        return [new Error('"dataviews" must be a valid JSON object: "' + dataviewType + '" type found')];
+    }
+
+    if (Array.isArray(dataviews)) {
+        return [new Error('"dataviews" must be a valid JSON object: "array" type found')];
+    }
+
    var errors = [];

    Object.keys(dataviews).forEach(function(dataviewName) {
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
  "name": "windshaft-cartodb",
-  "version": "2.46.0",
+  "version": "2.47.1",
  "dependencies": {
    "body-parser": {
      "version": "1.14.2",
@@ -105,9 +105,9 @@
      }
    },
    "camshaft": {
-      "version": "0.13.0",
-      "from": "camshaft@0.13.0",
-      "resolved": "https://registry.npmjs.org/camshaft/-/camshaft-0.13.0.tgz",
+      "version": "0.14.1",
+      "from": "camshaft@0.14.1",
+      "resolved": "https://registry.npmjs.org/camshaft/-/camshaft-0.14.1.tgz",
      "dependencies": {
        "async": {
          "version": "1.5.2",
@@ -146,7 +146,7 @@
                    },
                    "inherits": {
                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "from": "inherits@>=2.0.1 <2.1.0",
                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                    },
                    "isarray": {
@@ -804,7 +804,7 @@
        },
        "type-is": {
          "version": "1.6.13",
-          "from": "type-is@>=1.6.10 <1.7.0",
+          "from": "type-is@>=1.6.6 <1.7.0",
          "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.13.tgz",
          "dependencies": {
            "media-typer": {
@@ -3041,11 +3041,6 @@
                      "from": "caseless@>=0.11.0 <0.12.0",
                      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
                    },
-                    "chalk": {
-                      "version": "1.1.3",
-                      "from": "chalk@>=1.1.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"
-                    },
                    "combined-stream": {
                      "version": "1.0.5",
                      "from": "combined-stream@>=1.0.5 <1.1.0",
@@ -3056,6 +3051,11 @@
                      "from": "commander@>=2.9.0 <3.0.0",
                      "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"
                    },
+                    "chalk": {
+                      "version": "1.1.3",
+                      "from": "chalk@>=1.1.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"
+                    },
                    "concat-map": {
                      "version": "0.0.1",
                      "from": "concat-map@0.0.1",
@@ -3076,16 +3076,16 @@
                      "from": "debug@>=2.2.0 <2.3.0",
                      "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"
                    },
-                    "deep-extend": {
-                      "version": "0.4.1",
-                      "from": "deep-extend@>=0.4.0 <0.5.0",
-                      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.1.tgz"
-                    },
                    "delayed-stream": {
                      "version": "1.0.0",
                      "from": "delayed-stream@>=1.0.0 <1.1.0",
                      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
                    },
+                    "deep-extend": {
+                      "version": "0.4.1",
+                      "from": "deep-extend@>=0.4.0 <0.5.0",
+                      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.1.tgz"
+                    },
                    "delegates": {
                      "version": "1.0.0",
                      "from": "delegates@>=1.0.0 <2.0.0",
@@ -3111,16 +3111,16 @@
                      "from": "extsprintf@1.0.2",
                      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"
                    },
-                    "forever-agent": {
-                      "version": "0.6.1",
-                      "from": "forever-agent@>=0.6.1 <0.7.0",
-                      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
-                    },
                    "form-data": {
                      "version": "1.0.0-rc4",
                      "from": "form-data@>=1.0.0-rc3 <1.1.0",
                      "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc4.tgz"
                    },
+                    "forever-agent": {
+                      "version": "0.6.1",
+                      "from": "forever-agent@>=0.6.1 <0.7.0",
+                      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
+                    },
                    "fstream": {
                      "version": "1.0.9",
                      "from": "fstream@>=1.0.2 <2.0.0",
@@ -3136,16 +3136,16 @@
                      "from": "gauge@>=1.2.5 <1.3.0",
                      "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.7.tgz"
                    },
-                    "generate-object-property": {
-                      "version": "1.2.0",
-                      "from": "generate-object-property@>=1.1.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"
-                    },
                    "generate-function": {
                      "version": "2.0.0",
                      "from": "generate-function@>=2.0.0 <3.0.0",
                      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
                    },
+                    "generate-object-property": {
+                      "version": "1.2.0",
+                      "from": "generate-object-property@>=1.1.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"
+                    },
                    "glob": {
                      "version": "7.0.3",
                      "from": "glob@>=7.0.0 <8.0.0",
@@ -3201,11 +3201,6 @@
                      "from": "inherits@>=2.0.1 <2.1.0",
                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                    },
-                    "ini": {
-                      "version": "1.3.4",
-                      "from": "ini@>=1.3.0 <1.4.0",
-                      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
-                    },
                    "is-my-json-valid": {
                      "version": "2.13.1",
                      "from": "is-my-json-valid@>=2.12.4 <3.0.0",
@@ -3236,16 +3231,16 @@
                      "from": "jodid25519@>=1.0.0 <2.0.0",
                      "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"
                    },
-                    "json-schema": {
-                      "version": "0.2.2",
-                      "from": "json-schema@0.2.2",
-                      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"
-                    },
                    "jsbn": {
                      "version": "0.1.0",
                      "from": "jsbn@>=0.1.0 <0.2.0",
                      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"
                    },
+                    "json-schema": {
+                      "version": "0.2.2",
+                      "from": "json-schema@0.2.2",
+                      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"
+                    },
                    "json-stringify-safe": {
                      "version": "5.0.1",
                      "from": "json-stringify-safe@>=5.0.1 <5.1.0",
@@ -3266,6 +3261,11 @@
                      "from": "lodash._baseslice@>=4.0.0 <4.1.0",
                      "resolved": "https://registry.npmjs.org/lodash._baseslice/-/lodash._baseslice-4.0.0.tgz"
                    },
+                    "ini": {
+                      "version": "1.3.4",
+                      "from": "ini@>=1.3.0 <1.4.0",
+                      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
+                    },
                    "lodash._basetostring": {
                      "version": "4.12.0",
                      "from": "lodash._basetostring@>=4.12.0 <4.13.0",
@@ -3381,16 +3381,16 @@
                      "from": "request@>=2.0.0 <3.0.0",
                      "resolved": "https://registry.npmjs.org/request/-/request-2.72.0.tgz"
                    },
-                    "rimraf": {
-                      "version": "2.5.2",
-                      "from": "rimraf@>=2.5.0 <2.6.0",
-                      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.2.tgz"
-                    },
                    "semver": {
                      "version": "5.1.0",
                      "from": "semver@>=5.1.0 <5.2.0",
                      "resolved": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz"
                    },
+                    "rimraf": {
+                      "version": "2.5.2",
+                      "from": "rimraf@>=2.5.0 <2.6.0",
+                      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.2.tgz"
+                    },
                    "sntp": {
                      "version": "1.0.9",
                      "from": "sntp@>=1.0.0 <2.0.0",
@@ -3431,16 +3431,16 @@
                      "from": "tough-cookie@>=2.2.0 <2.3.0",
                      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz"
                    },
-                    "tweetnacl": {
-                      "version": "0.13.3",
-                      "from": "tweetnacl@>=0.13.0 <0.14.0",
-                      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz"
-                    },
                    "tunnel-agent": {
                      "version": "0.4.3",
                      "from": "tunnel-agent@>=0.4.1 <0.5.0",
                      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"
                    },
+                    "tweetnacl": {
+                      "version": "0.13.3",
+                      "from": "tweetnacl@>=0.13.0 <0.14.0",
+                      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz"
+                    },
                    "uid-number": {
                      "version": "0.0.6",
                      "from": "uid-number@>=0.0.6 <0.1.0",
@@ -3490,18 +3490,6 @@
                        }
                      }
                    },
-                    "rc": {
-                      "version": "1.1.6",
-                      "from": "rc@>=1.1.0 <1.2.0",
-                      "resolved": "https://registry.npmjs.org/rc/-/rc-1.1.6.tgz",
-                      "dependencies": {
-                        "minimist": {
-                          "version": "1.2.0",
-                          "from": "minimist@>=1.2.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
-                        }
-                      }
-                    },
                    "getpass": {
                      "version": "0.1.6",
                      "from": "getpass@>=0.1.1 <0.2.0",
@@ -3514,6 +3502,18 @@
                        }
                      }
                    },
+                    "rc": {
+                      "version": "1.1.6",
+                      "from": "rc@>=1.1.0 <1.2.0",
+                      "resolved": "https://registry.npmjs.org/rc/-/rc-1.1.6.tgz",
+                      "dependencies": {
+                        "minimist": {
+                          "version": "1.2.0",
+                          "from": "minimist@>=1.2.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
+                        }
+                      }
+                    },
                    "sshpk": {
                      "version": "1.8.3",
                      "from": "sshpk@>=1.7.0 <2.0.0",
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "private": true,
  "name": "windshaft-cartodb",
-  "version": "2.46.0",
+  "version": "2.47.1",
  "description": "A map tile server for CartoDB",
  "keywords": [
    "cartodb"
@@ -20,7 +20,7 @@
  ],
  "dependencies": {
    "body-parser": "~1.14.0",
-    "camshaft": "0.13.0",
+    "camshaft": "0.14.1",
    "cartodb-psql": "~0.6.1",
    "cartodb-query-tables": "~0.1.0",
    "cartodb-redis": "~0.13.0",
--- a/test/acceptance/dataviews/error-cases.js
+++ b/test/acceptance/dataviews/error-cases.js
@@ -0,0 +1,87 @@
+require('../../support/test_helper');
+
+var assert = require('../../support/assert');
+var TestClient = require('../../support/test-client');
+
+describe('histogram-dataview', function() {
+
+    afterEach(function(done) {
+        if (this.testClient) {
+            this.testClient.drain(done);
+        } else {
+            done();
+        }
+    });
+
+    var ERROR_RESPONSE = {
+        status: 400,
+        headers: {
+            'Content-Type': 'application/json; charset=utf-8'
+        }
+    };
+
+    function createMapConfig(dataviews) {
+        return {
+            version: '1.5.0',
+            layers: [
+                {
+                    "type": "cartodb",
+                    "options": {
+                        "source": {
+                            "id": "HEAD"
+                        },
+                        "cartocss": "#points { marker-width: 10; marker-fill: red; }",
+                        "cartocss_version": "2.3.0"
+                    }
+                }
+            ],
+            dataviews: dataviews,
+            analyses: [
+                {
+                    "id": "HEAD",
+                    "type": "source",
+                    "params": {
+                        "query": "select null::geometry the_geom_webmercator, x from generate_series(0,1000) x"
+                    }
+                }
+            ]
+        };
+    }
+
+    it('should fail when invalid dataviews object is provided, string case', function(done) {
+        var mapConfig = createMapConfig("wadus-string");
+        this.testClient = new TestClient(mapConfig, 1234);
+        this.testClient.getLayergroup(ERROR_RESPONSE, function(err, errObj) {
+            assert.ok(!err, err);
+
+            assert.deepEqual(errObj, { errors: [ '"dataviews" must be a valid JSON object: "string" type found' ] });
+
+            done();
+        });
+    });
+
+    it('should fail when invalid dataviews object is provided, array case', function(done) {
+        var mapConfig = createMapConfig([]);
+        this.testClient = new TestClient(mapConfig, 1234);
+        this.testClient.getLayergroup(ERROR_RESPONSE, function(err, errObj) {
+            assert.ok(!err, err);
+
+            assert.deepEqual(errObj, { errors: [ '"dataviews" must be a valid JSON object: "array" type found' ] });
+
+            done();
+        });
+    });
+
+    it('should work with empty but valid objects', function(done) {
+        var mapConfig = createMapConfig({});
+        this.testClient = new TestClient(mapConfig, 1234);
+        this.testClient.getLayergroup(function(err, layergroup) {
+            assert.ok(!err, err);
+
+            assert.ok(layergroup);
+            assert.ok(layergroup.layergroupid);
+
+            done();
+        });
+    });
+});
Author	SHA1	Message	Date
Raul Ochoa	9160d8018d	Release 2.47.1	2016-06-13 10:43:45 +02:00
Raul Ochoa	51307bcc69	Upgrades camshaft to 0.14.1	2016-06-10 18:38:49 +02:00
Raul Ochoa	d29651ee80	Stubs next version	2016-06-10 14:41:08 +02:00
Raul Ochoa	18640077aa	Release 2.47.0	2016-06-10 14:40:28 +02:00
Raul Ochoa	59563c893b	Merge pull request #499 from CartoDB/upgrade-camshaft Upgrades camshaft to 0.14.0	2016-06-10 14:19:39 +02:00
Raul Ochoa	90fd1786e1	Upgrades camshaft to 0.14.0	2016-06-10 14:05:23 +02:00
Raul Ochoa	4a11115dd0	Improve errors for dataviews validation	2016-06-09 18:13:54 +02:00
Raul Ochoa	baf3e774c5	Stubs next version	2016-06-09 10:33:35 +02:00