Add full d3.time aggregation support. Closes #7

chiasm-project · Dec 4, 2015 · 3b34419 · 3b34419
1 parent d04de6e
commit 3b34419
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -33,8 +33,8 @@ function ChiasmCrossfilter() {
         // Generate an aggregate function by parsing the "aggregation" config option.
         var aggregate;
         var interval;
-        if(group.aggregation === "day"){
-          aggregate = time.day;
+        if(group.aggregation in time){
+          aggregate = time[group.aggregation];
           interval = group.aggregation;
         } else if(group.aggregation.indexOf("floor") === 0){
           interval = parseInt(group.aggregation.substr(6));

diff --git a/test/test.js b/test/test.js
@@ -112,4 +112,36 @@ describe("chiasm-crossfilter", function () {
       });
     }, console.log);
   });
+
+  it("should compute histogram (interval of months)", function(done) {
+    var chiasm = initChiasm();
+    chiasm.setConfig({
+      "cf": {
+        "plugin": "crossfilter",
+        "state": {
+          "groups": {
+            "dates": {
+              "dimension": "date",
+              "aggregation": "month"
+            }
+          }
+        }
+      }
+    }).then(function(){
+      chiasm.getComponent("cf").then(function(cf){
+        cf.dataset = flightsDataset;
+        cf.when("dates", function(dataset){
+          expect(dataset.data.length).to.equal(3);
+          expect(dataset.data[1].key.getTime()).to.equal(
+            new Date("Thu Feb 01 2001 00:00:00 GMT-0800 (PST)").getTime());
+          expect(dataset.data[1].value).to.equal(324);
+
+          expect(dataset.isCube);
+          expect(getColumnMetadata(dataset, "key").interval).to.equal("month");
+
+          ChiasmDataset.validate(dataset).then(done, console.log);
+        });
+      });
+    }, console.log);
+  });
 });