Merge pull request #17 from crossfilter/fix-adding-data-to-existing-queries

Fix: Data adds to existing queries

Author: tannerlinsley

package.json

@@ -1,6 +1,6 @@
 {
   "name": "universe",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "description": "The fastest way to query and explore multivariate datasets",
   "main": "src/universe.js",
   "directories": {

src/query.js

@@ -49,6 +49,7 @@ module.exports = function(service) {
     return createColumn(query)
       .then(makeCrossfilterGroup)
       .then(buildRequiredColumns)
+      .then(setupDataListeners)
       .then(applyQuery)
 
 
@@ -93,29 +94,32 @@ module.exports = function(service) {
               dynamicReference: query.group
             })
           }))
-          .then(function() {
-            // Here, we create a listener to recreate and apply the reducer
-            // (with updated reference data) to
-            // the group anytime data changes
-            var stopDataListen = service.onDataChange(function() {
-              return applyQuery(query)
-            })
-            query.removeListeners.push(stopDataListen)
+          .then(function(){
             return query
           })
       }
       return query
     }
 
-    function applyQuery(query) {
+    function setupDataListeners(query){
+      // Here, we create a listener to recreate and apply the reducer to
+      // the group anytime underlying data changes
+      var stopDataListen = service.onDataChange(function() {
+        return applyQuery(query)
+      })
+      query.removeListeners.push(stopDataListen)
 
-      // apply a one time listener for filtering. This is what allows
-      // us to post aggregate and change the data on each filter
+      // This is a similar listener for filtering which will (if needed)
+      // run any post aggregations on the data after each filter action
       var stopFilterListen = service.onFilter(function() {
         return postAggregate(query)
       })
       query.removeListeners.push(stopFilterListen)
 
+      return query
+    }
+
+    function applyQuery(query) {
       return buildReducer(query)
         .then(applyReducer)
         .then(attachData)

test/filter.spec.js

@@ -4,23 +4,28 @@ var chaiAsPromised = require('chai-as-promised')
 chai.use(chaiAsPromised)
 var expect = chai.expect
 
-var universe = require('../universe');
-var crossfilter = require('crossfilter2');
+var universe = require('../universe')
+var crossfilter = require('crossfilter2')
 
 
-var data = require('./data');
+var data = require('./data')
 
 
 describe('universe filter', function() {
 
-  var u = universe(data)
-
+  var u
+  
   beforeEach(function() {
-    return u.then(function(u) {
-      return u.clear()
+    u = universe(data)
+  })
+
+  afterEach(function() {
+    return u.then(function(u){
+      return u.destroy()
     })
   })
 
+
   it('has the filter method', function() {
     return u.then(function(u) {
       expect(typeof(u.filter)).to.deep.equal('function')

test/query.dynamicData.spec.js

@@ -5,17 +5,65 @@ var chaiAsPromised = require('chai-as-promised')
 chai.use(chaiAsPromised)
 
 
-var universe = require('../universe');
-var data = require('./data');
-var crossfilter = require('crossfilter2');
+var universe = require('../universe')
+var data = require('./data')
+var crossfilter = require('crossfilter2')
 
-describe('universe query', function() {
+describe('universe dynamic data', function() {
 
-  var u = universe(crossfilter(data))
+  var u
 
   beforeEach(function() {
+    u = universe(crossfilter(data))
+  })
+
+  afterEach(function() {
     return u.then(function(u){
-      return u.clear()
+      return u.destroy()
+    })
+  })
+
+  it('can add data to an existing query', function() {
+    var res
+    return u.then(function(u){
+      return u.query({
+        groupBy: 'type',
+        select: {
+          $count: 'true',
+          $sum: 'total'
+        },
+      })
+    })
+    .then(function(r){
+      res = r
+      expect(res.data).to.deep.equal([
+        {"key": "cash","value": {"count": 2, sum: 300}},
+        {"key": "tab","value": {"count": 8, sum: 920}},
+        {"key": "visa","value": {"count": 2, sum: 500}}
+      ])
+      return res.universe.add([{
+        date: "2012-11-14T17:29:52Z",
+        quantity: 100,
+        total: 50000,
+        tip: 999,
+        type: "visa",
+        productIDs: ["004"]
+      }, {
+        date: "2012-11-14T17:29:52Z",
+        quantity: 100,
+        total: 400,
+        tip: 600,
+        type: "other",
+        productIDs: ["004"]
+      }])
+    })
+    .then(function(r){
+      expect(res.data).to.deep.equal([
+        {"key": "cash","value": {"count": 2, sum: 300}},
+        {"key": "other","value": {"count": 1, sum: 400}},
+        {"key": "tab","value": {"count": 8, sum: 920}},
+        {"key": "visa","value": {"count": 3, sum: 50500}},
+      ])
     })
   })
 
@@ -76,6 +124,16 @@ describe('universe query', function() {
     })
     .then(function(r){
       res = r
+      return res.universe.add([{
+        date: "2012-11-14T17:29:52Z",
+        quantity: 100,
+        total: 50000,
+        tip: 999,
+        type: "visa",
+        productIDs: ["004"]
+      }])
+    })
+    .then(function(r){
       expect(res.data).to.deep.equal([
         { key: 'cash', value: { valueList: [100, 200] } },
         { key: 'tab', value: { valueList: [90, 90, 90, 90, 90, 90, 190, 190] } },

test/query.spec.js

@@ -5,17 +5,21 @@ var chaiAsPromised = require('chai-as-promised')
 chai.use(chaiAsPromised)
 
 
-var universe = require('../universe');
-var data = require('./data');
-var crossfilter = require('crossfilter2');
+var universe = require('../universe')
+var data = require('./data')
+var crossfilter = require('crossfilter2')
 
 describe('universe query', function() {
 
-  var u = universe(crossfilter(data))
+  var u
 
   beforeEach(function() {
+    u = universe(data)
+  })
+
+  afterEach(function() {
     return u.then(function(u){
-      return u.clear()
+      return u.destroy()
     })
   })