frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Add ignore-case flag to Switch regex rule

Browse Source 
closes #366
This commit is contained in:
Nick O'Leary 2015-10-04 22:14:49 +01:00
parent c1e8370916
commit 8b2b1669b5
4 changed files with 96 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nodes/core/locales/en-US/messages.json
View File

@ -425,8 +425,10 @@
"property": "Property",
"rule": "rule"
},
"and": "and",
"checkall": "checking all rules",
"stopfirst": "stopping after first match",
"ignorecase": "ignore case",
"rules": {
"btwn":"is between",
"cont":"contains",

27
nodes/core/logic/10-switch.html
View File

@ -82,6 +82,9 @@
{v:"else",t:this._("switch.rules.else")}
];
var andLabel = this._("switch.and");
var caseLabel = this._("switch.ignorecase");
function resizeRule(rule,width) {
var selectField = rule.find("select");
var type = selectField.children("option:selected").val();
@ -99,8 +102,9 @@
selectField.width(selectWidth);
if (type === "btwn") {
btwnField1.width((width-288)/2);
btwnField2.width((width-288)/2);
var labelWidth = rule.find(".node-input-tule-btwn-label").width();
btwnField1.width((width-256-labelWidth)/2);
btwnField2.width((width-256-labelWidth)/2);
} else {
if (type === "true" || type === "false" || type === "null" || type === "nnull" || type === "else") {
// valueField.hide();
@ -113,7 +117,7 @@
function generateRule(i,rule) {
var container = $('<li/>',{style:"background: #fff; margin:0; padding:8px 0px; border-bottom: 1px solid #ccc;"});
var row = $('<div/>').appendTo(container);
var row2 = $('<div/>',{style:"padding-top: 5px; text-align: right;"}).appendTo(container);
var row2 = $('<div/>',{style:"padding-top: 5px; padding-left: 175px;"}).appendTo(container);
$('<i style="color: #eee; cursor: move;" class="node-input-rule-handle fa fa-bars"></i>').appendTo(row);
var selectField = $('<select/>',{style:"width:120px; margin-left: 5px; text-align: center;"}).appendTo(row);
@ -124,7 +128,7 @@
var valueField = $('<input/>',{class:"node-input-rule-value",type:"text",style:"margin-left: 5px; width: 145px;"}).appendTo(row);
var btwnField = $('<span/>').appendTo(row);
var btwnValueField = $('<input/>',{class:"node-input-rule-btwn-value",type:"text",style:"margin-left: 5px; width: 50px;"}).appendTo(btwnField);
btwnField.append(" and ");
var btwnAndLabel = $('<span/>',{class:"node-input-tule-btwn-label"}).text(" "+andLabel+" ").appendTo(btwnField);
var btwnValue2Field = $('<input/>',{class:"node-input-rule-btwn-value2",type:"text",style:"width: 50px;margin-left:2px;"}).appendTo(btwnField);
var finalspan = $('<span/>',{style:"float: right;margin-right: 10px;"}).appendTo(row);
@ -133,6 +137,8 @@
var deleteButton = $('<a/>',{href:"#",class:"editor-button editor-button-small", style:"margin-top: 7px; margin-left: 5px;"}).appendTo(finalspan);
$('<i/>',{class:"fa fa-remove"}).appendTo(deleteButton);
var caseSensitive = $('<input/>',{id:"node-input-rule-case-"+i,class:"node-input-rule-case",type:"checkbox",style:"width:auto;vertical-align:top"}).appendTo(row2);
$('<label/>',{for:"node-input-rule-case-"+i,style:"margin-left: 3px;"}).text(caseLabel).appendTo(row2);
selectField.change(function() {
var width = $("#node-input-rule-container").width();
resizeRule(container,width);
@ -149,6 +155,11 @@
valueField.show();
}
}
if (type === "regex") {
row2.show();
} else {
row2.hide();
}
});
deleteButton.click(function() {
@ -171,6 +182,11 @@
} else if (typeof rule.v != "undefined") {
valueField.val(rule.v);
}
if (rule.case) {
caseSensitive.prop('checked',true);
} else {
caseSensitive.prop('checked',false);
}
selectField.change();
}
@ -245,6 +261,9 @@
} else {
r.v = rule.find(".node-input-rule-value").val();
}
if (type === "regex") {
r.case = rule.find(".node-input-rule-case").prop("checked");
}
}
node.rules.push(r);
});

6
nodes/core/logic/10-switch.js
View File

@ -1,5 +1,5 @@
/**
* Copyright 2013 IBM Corp.
* Copyright 2013, 2015 IBM Corp.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -25,7 +25,7 @@ module.exports = function(RED) {
'gte': function(a, b) { return a >= b; },
'btwn': function(a, b, c) { return a >= b && a <= c; },
'cont': function(a, b) { return (a + "").indexOf(b) != -1; },
'regex': function(a, b) { return (a + "").match(new RegExp(b)); },
'regex': function(a, b, c, d) { return (a + "").match(new RegExp(b,d?'i':'')); },
'true': function(a) { return a === true; },
'false': function(a) { return a === false; },
'null': function(a) { return (typeof a == "undefined" || a === null); },
@ -60,7 +60,7 @@ module.exports = function(RED) {
var rule = node.rules[i];
var test = prop;
if (rule.t == "else") { test = elseflag; elseflag = true; }
if (operators[rule.t](test,rule.v, rule.v2)) {
if (operators[rule.t](test,rule.v, rule.v2, rule.case)) {
onward.push(msg);
elseflag = false;
if (node.checkall == "false") { break; }

120
test/nodes/core/logic/10-switch_spec.js
View File

@ -55,7 +55,7 @@ describe('switch Node', function() {
{id:"helperNode1", type:"helper", wires:[]}];
customFlowSwitchTest(flow, shouldReceive, sendPayload, done);
}
/**
* Test a switch node where NO arguments are consumed by the rule (such as TRUE/FALSE)
* @param rule - the switch rule (see 10-switc.js) string we're using
@ -69,7 +69,7 @@ describe('switch Node', function() {
{id:"helperNode1", type:"helper", wires:[]}];
customFlowSwitchTest(flow, shouldReceive, sendPayload, done);
}
/**
* Test a switch node where two arguments are consumed by the rule (such as between).
* @param rule - the switch rule (see 10-switc.js) string we're using
@ -85,7 +85,7 @@ describe('switch Node', function() {
{id:"helperNode1", type:"helper", wires:[]}];
customFlowSwitchTest(flow, shouldReceive, sendPayload, done);
}
/**
* Execute a switch test. Can specify whether the should node is expected to send a payload onwards to the helper node.
* The flow and the payload can be customised
@ -102,7 +102,7 @@ describe('switch Node', function() {
try {
if(shouldReceive === true) {
msg.payload.should.equal(sendPayload);
done();
done();
} else {
should.fail(null, null, "We should never get an input!");
}
@ -118,127 +118,143 @@ describe('switch Node', function() {
}
});
}
it('should check if payload equals given value', function(done) {
genericSwitchTest("eq", "Hello", true, true, "Hello", done);
});
it('should return nothing when the payload doesn\'t equal to desired string', function(done) {
genericSwitchTest("eq", "Hello", true, false, "Hello!", done);
});
it('should check if payload NOT equals given value', function(done) {
genericSwitchTest("neq", "Hello", true, true, "HEllO", done);
});
it('should return nothing when the payload does equal to desired string', function(done) {
genericSwitchTest("neq", "Hello", true, false, "Hello", done);
});
it('should check if payload equals given numeric value', function(done) {
genericSwitchTest("eq", 3, true, true, 3, done);
});
it('should return nothing when the payload doesn\'t equal to desired numeric value', function(done) {
genericSwitchTest("eq", 2, true, false, 4, done);
});
it('should check if payload NOT equals given numeric value', function(done) {
genericSwitchTest("neq", 55667744, true, true, -1234, done);
});
it('should return nothing when the payload does equal to desired numeric value', function(done) {
genericSwitchTest("neq", 10, true, false, 10, done);
});
it('should check if payload is less than given value', function(done) {
genericSwitchTest("lt", 3, true, true, 2, done);
});
it('should return nothing when the payload is not less than desired string', function(done) {
genericSwitchTest("lt", 3, true, false, 4, done);
});
it('should check if payload less than equals given value', function(done) {
genericSwitchTest("lte", 3, true, true, 3, done);
});
it('should check if payload is greater than given value', function(done) {
genericSwitchTest("gt", 3, true, true, 6, done);
});
it('should return nothing when the payload is not greater than desired string', function(done) {
genericSwitchTest("gt", 3, true, false, -1, done);
});
it('should check if payload is greater than/equals given value', function(done) {
genericSwitchTest("gte", 3, true, true, 3, done);
});
it('should return nothing when the payload is not greater than desired string', function(done) {
genericSwitchTest("gt", 3, true, false, -1, done);
});
it('should check if payload is greater than/equals given value', function(done) {
genericSwitchTest("gte", 3, true, true, 3, done);
});
it('should check if payload is between given values', function(done) {
twoFieldSwitchTest("btwn", 3, 5, true, true, 4, done);
});
it('should check if payload is not between given values', function(done) {
twoFieldSwitchTest("btwn", 3, 5, true, false, 12, done);
});
it('should check if payload contains given value', function(done) {
genericSwitchTest("cont", "Hello", true, true, "Hello World!", done);
});
it('should return nothing when the payload doesn\'t contain desired string', function(done) {
genericSwitchTest("cont", "Hello", true, false, "This is not a greeting!", done);
});
it('should match regex', function(done) {
genericSwitchTest("regex", "[abc]+", true, true, "abbabac", done);
});
it('should match regex with ignore-case flag set true', function(done) {
var flow = [{id:"switchNode1",type:"switch",name:"switchNode",property:"payload",rules:[{"t":"regex","v":"onetwothree","case":true}],checkall:true,outputs:1,wires:[["helperNode1"]]},
{id:"helperNode1", type:"helper", wires:[]}];
customFlowSwitchTest(flow, true, "oneTWOthree", done);
});
it('should not match regex with ignore-case flag unset', function(done) {
var flow = [{id:"switchNode1",type:"switch",name:"switchNode",property:"payload",rules:[{"t":"regex","v":"onetwothree"}],checkall:true,outputs:1,wires:[["helperNode1"]]},
{id:"helperNode1", type:"helper", wires:[]}];
customFlowSwitchTest(flow, false, "oneTWOthree", done);
});
it('should not match regex with ignore-case flag set false', function(done) {
var flow = [{id:"switchNode1",type:"switch",name:"switchNode",property:"payload",rules:[{"t":"regex","v":"onetwothree",case:false}],checkall:true,outputs:1,wires:[["helperNode1"]]},
{id:"helperNode1", type:"helper", wires:[]}];
customFlowSwitchTest(flow, false, "oneTWOthree", done);
});
it('should return nothing when the payload doesn\'t match regex', function(done) {
genericSwitchTest("regex", "\\d+", true, false, "This is not a digit", done);
});
it('should return nothing when the payload doesn\'t contain desired string', function(done) {
genericSwitchTest("cont", "Hello", true, false, "This is not a greeting!", done);
});
it('should check if input is true', function(done) {
singularSwitchTest(true, true, true, true, done);
});
it('sends nothing when input is false and checking for true', function(done) {
singularSwitchTest(true, true, false, false, done);
});
it('should check if input is indeed false', function(done) {
singularSwitchTest(false, true, true, false, done);
});
it('sends nothing when input is false and checking for true', function(done) {
singularSwitchTest(false, true, false, true, done);
});
it('should check if input is indeed null', function(done) {
var flow = [{id:"switchNode1",type:"switch",name:"switchNode",property:"payload",rules:[{"t":"null"}],checkall:true,outputs:1,wires:[["helperNode1"]]},
{id:"helperNode1", type:"helper", wires:[]}];
helper.load(switchNode, flow, function() {
var switchNode1 = helper.getNode("switchNode1");
var helperNode1 = helper.getNode("helperNode1");
helperNode1.on("input", function(msg) {
if(msg.payload) {
try {
should.fail(null, null, "msg.payload should be undefined!");
should.fail(null, null, "msg.payload should be undefined!");
} catch (err) {
done(err);
}
@ -249,12 +265,12 @@ describe('switch Node', function() {
switchNode1.receive({payload:undefined});
});
});
it('should check if input is indeed not null', function(done) {
var flow = [{id:"switchNode1",type:"switch",name:"switchNode",property:"payload",rules:[{"t":"nnull"}],checkall:false,outputs:1,wires:[["helperNode1"]]},
{id:"helperNode1", type:"helper", wires:[]}];
helper.load(switchNode, flow, function() {
var switchNode1 = helper.getNode("switchNode1");
var helperNode1 = helper.getNode("helperNode1");
@ -272,24 +288,24 @@ describe('switch Node', function() {
switchNode1.receive({payload:"Anything here"});
});
});
it('sends a message when the "else/otherwise" statement is selected' , function(done) {
singularSwitchTest("else", true, true, 123456, done);
});
it('handles more than one switch statement' , function(done) {
var flow = [{id:"switchNode1",type:"switch",name:"switchNode",property:"payload",rules:[{"t":"eq","v":"Hello"},{"t":"cont","v":"ello"}, {"t":"else"}],checkall:true,outputs:3,wires:[["helperNode1"], ["helperNode2"], ["helperNode3"]]},
{id:"helperNode1", type:"helper", wires:[]},
{id:"helperNode2", type:"helper", wires:[]},
{id:"helperNode3", type:"helper", wires:[]}];
helper.load(switchNode, flow, function() {
var switchNode1 = helper.getNode("switchNode1");
var helperNode1 = helper.getNode("helperNode1");
var helperNode2 = helper.getNode("helperNode2");
var helperNode3 = helper.getNode("helperNode3");
var nodeHitCount = 0;
helperNode1.on("input", function(msg) {
try {
@ -307,7 +323,7 @@ describe('switch Node', function() {
done();
} else {
try {
should.fail(null, null, "Both statements should be triggered!");
should.fail(null, null, "Both statements should be triggered!");
} catch (err) {
done(err);
}
@ -318,7 +334,7 @@ describe('switch Node', function() {
});
helperNode3.on("input", function(msg) {
try {
should.fail(null, null, "The otherwise/else statement should not be triggered here!");
should.fail(null, null, "The otherwise/else statement should not be triggered here!");
} catch (err) {
done(err);
}
@ -326,20 +342,20 @@ describe('switch Node', function() {
switchNode1.receive({payload:"Hello"});
});
});
it('stops after first statement' , function(done) {
var flow = [{id:"switchNode1",type:"switch",name:"switchNode",property:"payload",rules:[{"t":"eq","v":"Hello"},{"t":"cont","v":"ello"}, {"t":"else"}],checkall:"false",outputs:3,wires:[["helperNode1"], ["helperNode2"], ["helperNode3"]]},
{id:"helperNode1", type:"helper", wires:[]},
{id:"helperNode2", type:"helper", wires:[]},
{id:"helperNode3", type:"helper", wires:[]}];
helper.load(switchNode, flow, function() {
var switchNode1 = helper.getNode("switchNode1");
var helperNode1 = helper.getNode("helperNode1");
var helperNode2 = helper.getNode("helperNode2");
var helperNode3 = helper.getNode("helperNode3");
helperNode1.on("input", function(msg) {
try {
msg.payload.should.equal("Hello");
@ -350,14 +366,14 @@ describe('switch Node', function() {
});
helperNode2.on("input", function(msg) {
try {
should.fail(null, null, "The otherwise/else statement should not be triggered here!");
should.fail(null, null, "The otherwise/else statement should not be triggered here!");
} catch (err) {
done(err);
}
});
helperNode3.on("input", function(msg) {
try {
should.fail(null, null, "The otherwise/else statement should not be triggered here!");
should.fail(null, null, "The otherwise/else statement should not be triggered here!");
} catch (err) {
done(err);
}
@ -365,5 +381,5 @@ describe('switch Node', function() {
switchNode1.receive({payload:"Hello"});
});
});
});