Merge pull request #62 from keen/apryka-result-parsers

Result parsers

Author: Artur Pryka

dist/keen-analysis.js

@@ -17731,7 +17731,7 @@ module.exports = result;
 /* 133 */
 /***/ (function(module) {
 
-module.exports = {"_from":"crossfilter2","_id":"[email protected]","_inBundle":false,"_integrity":"sha512-Fdmb6NqdUqreOuQ9qiNvTLOxMFBQRPDeRBBnqM8Zlebdf2i7Bn5hRhE8RlO9YzbGRyYxvYzdDXt6C1muyanolg==","_location":"/crossfilter2","_phantomChildren":{},"_requested":{"type":"tag","registry":true,"raw":"crossfilter2","name":"crossfilter2","escapedName":"crossfilter2","rawSpec":"","saveSpec":null,"fetchSpec":"latest"},"_requiredBy":["#USER","/"],"_resolved":"https://registry.npmjs.org/crossfilter2/-/crossfilter2-1.4.6.tgz","_shasum":"c173f0d75a04344ad226b1f8ae747f0386f98750","_spec":"crossfilter2","_where":"/Users/adamk/Desktop/my/keen-analysis.js","author":{"name":"Mike Bostock","url":"http://bost.ocks.org/mike"},"bugs":{"url":"https://github.com/crossfilter/crossfilter/issues"},"bundleDependencies":false,"contributors":[{"name":"Jason Davies","url":"http://www.jasondavies.com/"}],"dependencies":{"lodash.result":"^4.4.0"},"deprecated":false,"description":"Fast multidimensional filtering for coordinated views.","devDependencies":{"browserify":"^13.0.0","d3":"3.5","eslint":"2.10.2","package-json-versionify":"1.0.2","semver":"^5.3.0","sinon":"^4.0.2","uglify-js":"2.4.0","vows":"0.7.0"},"eslintConfig":{"env":{"browser":true,"node":true},"globals":{"Uint8Array":true,"Uint16Array":true,"Uint32Array":true},"extends":"eslint:recommended"},"files":["src","index.js","index.d.ts","crossfilter.js","crossfilter.min.js"],"homepage":"https://crossfilter.github.io/crossfilter/","keywords":["analytics","visualization","crossfilter"],"license":"Apache-2.0","main":"./index.js","maintainers":[{"name":"Gordon Woodhull","url":"https://github.com/gordonwoodhull"},{"name":"Tanner Linsley","url":"https://github.com/tannerlinsley"},{"name":"Ethan Jewett","url":"https://github.com/esjewett"}],"name":"crossfilter2","repository":{"type":"git","url":"git+ssh://[email protected]/crossfilter/crossfilter.git"},"scripts":{"benchmark":"node test/benchmark.js","build":"browserify index.js -t package-json-versionify --standalone crossfilter -o crossfilter.js && uglifyjs --compress --mangle --screw-ie8 crossfilter.js -o crossfilter.min.js","clean":"rm -f crossfilter.js crossfilter.min.js","test":"vows --verbose && eslint src/"},"types":"./index.d.ts","unpkg":"./crossfilter.min.js","version":"1.4.6"};
+module.exports = {"_args":[["[email protected]","/Users/arturpryka/SourceFiles/keen-analysis.js"]],"_from":"[email protected]","_id":"[email protected]","_inBundle":false,"_integrity":"sha512-Fdmb6NqdUqreOuQ9qiNvTLOxMFBQRPDeRBBnqM8Zlebdf2i7Bn5hRhE8RlO9YzbGRyYxvYzdDXt6C1muyanolg==","_location":"/crossfilter2","_phantomChildren":{},"_requested":{"type":"version","registry":true,"raw":"[email protected]","name":"crossfilter2","escapedName":"crossfilter2","rawSpec":"1.4.6","saveSpec":null,"fetchSpec":"1.4.6"},"_requiredBy":["/"],"_resolved":"https://registry.npmjs.org/crossfilter2/-/crossfilter2-1.4.6.tgz","_spec":"1.4.6","_where":"/Users/arturpryka/SourceFiles/keen-analysis.js","author":{"name":"Mike Bostock","url":"http://bost.ocks.org/mike"},"bugs":{"url":"https://github.com/crossfilter/crossfilter/issues"},"contributors":[{"name":"Jason Davies","url":"http://www.jasondavies.com/"}],"dependencies":{"lodash.result":"^4.4.0"},"description":"Fast multidimensional filtering for coordinated views.","devDependencies":{"browserify":"^13.0.0","d3":"3.5","eslint":"2.10.2","package-json-versionify":"1.0.2","semver":"^5.3.0","sinon":"^4.0.2","uglify-js":"2.4.0","vows":"0.7.0"},"eslintConfig":{"env":{"browser":true,"node":true},"globals":{"Uint8Array":true,"Uint16Array":true,"Uint32Array":true},"extends":"eslint:recommended"},"files":["src","index.js","index.d.ts","crossfilter.js","crossfilter.min.js"],"homepage":"https://crossfilter.github.io/crossfilter/","keywords":["analytics","visualization","crossfilter"],"license":"Apache-2.0","main":"./index.js","maintainers":[{"name":"Gordon Woodhull","url":"https://github.com/gordonwoodhull"},{"name":"Tanner Linsley","url":"https://github.com/tannerlinsley"},{"name":"Ethan Jewett","url":"https://github.com/esjewett"}],"name":"crossfilter2","repository":{"type":"git","url":"git+ssh://[email protected]/crossfilter/crossfilter.git"},"scripts":{"benchmark":"node test/benchmark.js","build":"browserify index.js -t package-json-versionify --standalone crossfilter -o crossfilter.js && uglifyjs --compress --mangle --screw-ie8 crossfilter.js -o crossfilter.min.js","clean":"rm -f crossfilter.js crossfilter.min.js","test":"vows --verbose && eslint src/"},"types":"./index.d.ts","unpkg":"./crossfilter.min.js","version":"1.4.6"};
 
 /***/ }),
 /* 134 */

dist/keen-analysis.js.map

@@ -26730,7 +26730,7 @@ module.exports = result;
 /* 241 */
 /***/ (function(module) {
 
-module.exports = {"_from":"crossfilter2","_id":"[email protected]","_inBundle":false,"_integrity":"sha512-Fdmb6NqdUqreOuQ9qiNvTLOxMFBQRPDeRBBnqM8Zlebdf2i7Bn5hRhE8RlO9YzbGRyYxvYzdDXt6C1muyanolg==","_location":"/crossfilter2","_phantomChildren":{},"_requested":{"type":"tag","registry":true,"raw":"crossfilter2","name":"crossfilter2","escapedName":"crossfilter2","rawSpec":"","saveSpec":null,"fetchSpec":"latest"},"_requiredBy":["#USER","/"],"_resolved":"https://registry.npmjs.org/crossfilter2/-/crossfilter2-1.4.6.tgz","_shasum":"c173f0d75a04344ad226b1f8ae747f0386f98750","_spec":"crossfilter2","_where":"/Users/adamk/Desktop/my/keen-analysis.js","author":{"name":"Mike Bostock","url":"http://bost.ocks.org/mike"},"bugs":{"url":"https://github.com/crossfilter/crossfilter/issues"},"bundleDependencies":false,"contributors":[{"name":"Jason Davies","url":"http://www.jasondavies.com/"}],"dependencies":{"lodash.result":"^4.4.0"},"deprecated":false,"description":"Fast multidimensional filtering for coordinated views.","devDependencies":{"browserify":"^13.0.0","d3":"3.5","eslint":"2.10.2","package-json-versionify":"1.0.2","semver":"^5.3.0","sinon":"^4.0.2","uglify-js":"2.4.0","vows":"0.7.0"},"eslintConfig":{"env":{"browser":true,"node":true},"globals":{"Uint8Array":true,"Uint16Array":true,"Uint32Array":true},"extends":"eslint:recommended"},"files":["src","index.js","index.d.ts","crossfilter.js","crossfilter.min.js"],"homepage":"https://crossfilter.github.io/crossfilter/","keywords":["analytics","visualization","crossfilter"],"license":"Apache-2.0","main":"./index.js","maintainers":[{"name":"Gordon Woodhull","url":"https://github.com/gordonwoodhull"},{"name":"Tanner Linsley","url":"https://github.com/tannerlinsley"},{"name":"Ethan Jewett","url":"https://github.com/esjewett"}],"name":"crossfilter2","repository":{"type":"git","url":"git+ssh://[email protected]/crossfilter/crossfilter.git"},"scripts":{"benchmark":"node test/benchmark.js","build":"browserify index.js -t package-json-versionify --standalone crossfilter -o crossfilter.js && uglifyjs --compress --mangle --screw-ie8 crossfilter.js -o crossfilter.min.js","clean":"rm -f crossfilter.js crossfilter.min.js","test":"vows --verbose && eslint src/"},"types":"./index.d.ts","unpkg":"./crossfilter.min.js","version":"1.4.6"};
+module.exports = {"_args":[["[email protected]","/Users/arturpryka/SourceFiles/keen-analysis.js"]],"_from":"[email protected]","_id":"[email protected]","_inBundle":false,"_integrity":"sha512-Fdmb6NqdUqreOuQ9qiNvTLOxMFBQRPDeRBBnqM8Zlebdf2i7Bn5hRhE8RlO9YzbGRyYxvYzdDXt6C1muyanolg==","_location":"/crossfilter2","_phantomChildren":{},"_requested":{"type":"version","registry":true,"raw":"[email protected]","name":"crossfilter2","escapedName":"crossfilter2","rawSpec":"1.4.6","saveSpec":null,"fetchSpec":"1.4.6"},"_requiredBy":["/"],"_resolved":"https://registry.npmjs.org/crossfilter2/-/crossfilter2-1.4.6.tgz","_spec":"1.4.6","_where":"/Users/arturpryka/SourceFiles/keen-analysis.js","author":{"name":"Mike Bostock","url":"http://bost.ocks.org/mike"},"bugs":{"url":"https://github.com/crossfilter/crossfilter/issues"},"contributors":[{"name":"Jason Davies","url":"http://www.jasondavies.com/"}],"dependencies":{"lodash.result":"^4.4.0"},"description":"Fast multidimensional filtering for coordinated views.","devDependencies":{"browserify":"^13.0.0","d3":"3.5","eslint":"2.10.2","package-json-versionify":"1.0.2","semver":"^5.3.0","sinon":"^4.0.2","uglify-js":"2.4.0","vows":"0.7.0"},"eslintConfig":{"env":{"browser":true,"node":true},"globals":{"Uint8Array":true,"Uint16Array":true,"Uint32Array":true},"extends":"eslint:recommended"},"files":["src","index.js","index.d.ts","crossfilter.js","crossfilter.min.js"],"homepage":"https://crossfilter.github.io/crossfilter/","keywords":["analytics","visualization","crossfilter"],"license":"Apache-2.0","main":"./index.js","maintainers":[{"name":"Gordon Woodhull","url":"https://github.com/gordonwoodhull"},{"name":"Tanner Linsley","url":"https://github.com/tannerlinsley"},{"name":"Ethan Jewett","url":"https://github.com/esjewett"}],"name":"crossfilter2","repository":{"type":"git","url":"git+ssh://[email protected]/crossfilter/crossfilter.git"},"scripts":{"benchmark":"node test/benchmark.js","build":"browserify index.js -t package-json-versionify --standalone crossfilter -o crossfilter.js && uglifyjs --compress --mangle --screw-ie8 crossfilter.js -o crossfilter.min.js","clean":"rm -f crossfilter.js crossfilter.min.js","test":"vows --verbose && eslint src/"},"types":"./index.d.ts","unpkg":"./crossfilter.min.js","version":"1.4.6"};
 
 /***/ }),
 /* 242 */

dist/keen-analysis.min.js

@@ -157,35 +157,50 @@ request.prototype.send = function(obj){
               //interval and group by result
               response.result.forEach((val) => {
                 val.value.forEach((res) => {
+                  let parsedValue;
                   this.config.resultParsers.forEach((func) => {
-                    res.result = func(res.result)
+                    parsedValue = parsedValue ? func(parsedValue) : func(res.result);
                   })
+                  res.result = parsedValue;
                 })
               })
             }
             else {
               //interval result
               response.result.forEach((val) => {
+                let parsedValue;
                 this.config.resultParsers.forEach((func) => {
-                  val.value = func(val.value)
+                  parsedValue = parsedValue ? func(parsedValue) : func(val.value);
                 })
+                val.value = parsedValue;
               })
             }
           }
           else {
             //group by result
             response.result.forEach((res) => {
+              let parsedValue;
               this.config.resultParsers.forEach((func) => {
-                res.result = func(res.result)
+                parsedValue = parsedValue ? func(parsedValue) : func(res.result);
               })
+              res.result = parsedValue;
             })
           }
-      }
-      else {
+      } else if (typeof response.result === 'object') {
+        Object.keys(response.result).forEach((res) => {
+          let parsedValue;
+          this.config.resultParsers.forEach((func) => {
+            parsedValue = parsedValue ? func(parsedValue) : func(response.result[res]);
+          });
+          response.result[res] = parsedValue;
+        });
+      } else {
         //simple result
+        let parsedValue;
         this.config.resultParsers.forEach((func) => {
-          response.result = func(response.result)
-        })
+          parsedValue = parsedValue ? func(parsedValue) : func(response.result);
+        });
+        response.result = parsedValue;
       }
     }
     if (httpOptions.params &&