Grammar update: lock expression

.gitignore

@@ -1,3 +1,6 @@
 node_modules
 .jshintrc
 Procfile
+*.un~
+*.swo
+*.swp

lib/cube/event-expression.peg

@@ -73,7 +73,14 @@
 }
 
 start
-  = _ expression:event_expression _ { expression.source = input; return expression; }
+  = _ expression:event_expression _ ":" _ lock_expression:event_expression _
+{
+    var uf = expression.filter;
+    expression.type = lock_expression.type;
+    expression.filter = function(filter) { uf(filter); lock_expression.filter(filter); }; 
+    return expression;
+  }
+  / _ expression:event_expression _ { expression.source = input; return expression; }
 
 event_expression
   = value:event_value_expression filters:(_ "." _ event_filter_expression)*

lib/cube/metric-expression.peg

@@ -104,7 +104,14 @@
 }
 
 start
-  = _ expression:metric_additive_expression _ { return expression; }
+  = _ expression:metric_additive_expression _ ":" _ lock_expression:event_expression _ 
+{ 
+    var uf = expression.filter; 
+    expression.type = lock_expression.type;
+    expression.filter = function(filter){ uf(filter); lock_expression.filter(filter); }; 
+    return expression; 
+  }
+  / _ expression:metric_additive_expression _ { return expression; }
 
 metric_additive_expression
   = head:metric_multiplicative_expression tail:(_ additive_operator _ metric_additive_expression)* { return compoundMetric(head, tail); }

package.json

@@ -18,7 +18,7 @@
   "dependencies": {
     "mongodb": "~1.3.18",
     "node-static": "0.6.5",
-    "pegjs": "0.7.0",
+    "pegjs": "0.6.2",
     "vows": "0.7.0",
     "websocket": "1.0.8",
     "websocket-server": "1.4.04"

test/event-expression-test.js

@@ -236,8 +236,18 @@ suite.addBatch({
       parser.parse("test.in(i, [\"foo\", 42])").filter(filter);
       assert.deepEqual(filter, {"d.i": {$in: ["foo", 42]}});
     }
+  },
+  "lock expression": {
+    "lock expression merges additional filters": function() {
+      var filter = {};
+      parser.parse("test.gt(i, 42):test.le(i, 52)").filter(filter);
+      assert.deepEqual(filter, {"d.i": {$gt: 42, $lte: 52}});
+    },
+    "lock expression results in expected type": function() {
+      var e = parser.parse("test1.gt(i, 42):test.le(i, 52)");
+      assert.equal(e.type, "test") 
+    }
   }
-
 });
 
 suite.export(module);

test/metric-expression-test.js

@@ -5,7 +5,7 @@ var vows = require("vows"),
 var suite = vows.describe("metric-expression");
 
 suite.addBatch({
-
+  
   "a simple unary expression, sum(test)": {
     topic: parser.parse("sum(test)"),
     "is unary (has no associated binary operator)": function(e) {
@@ -295,9 +295,19 @@ suite.addBatch({
       var filter = {};
       parser.parse("sum(test.in(i, [\"foo\", 42]))").filter(filter);
       assert.deepEqual(filter, {"d.i": {$in: ["foo", 42]}});
+    },
+  },
+  "lock expression": {
+    "lock expression merges additional filters": function() {
+      var filter = {};
+      parser.parse("sum(test.gt(i, 42)):test.le(i, 52)").filter(filter);
+      assert.deepEqual(filter, {"d.i": {$gt: 42, $lte: 52}});
+    },
+    "lock expression results in expected type": function() {
+      var e = parser.parse("sum(test1.gt(i, 42)):test.le(i, 52)");
+      assert.equal(e.type, "test") 
     }
   }
-
 });
 
 suite.export(module);