Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/node_modules
npm-debug.log
.vscode
.idea
.idea
.DS_Store
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
2.0.1 / 2017-07-05
* Bugfix rule result serialization

2.0.0 / 2017-04-21
* Publishing 2.0.0

Expand Down
29 changes: 29 additions & 0 deletions src/rule-result.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
'use strict'

import deepClone from 'lodash.clonedeep'

export default class RuleResult {
constructor (conditions, event, priority) {
this.conditions = deepClone(conditions)
this.event = deepClone(event)
this.priority = deepClone(priority)
this.result = null
}

setResult (result) {
this.result = result
}

toJSON (stringify = true) {
let props = {
conditions: this.conditions.toJSON(false),
event: this.event,
priority: this.priority,
result: this.result
}
if (stringify) {
return JSON.stringify(props)
}
return props
}
}
11 changes: 4 additions & 7 deletions src/rule.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
'use strict'

import Condition from './condition'
import RuleResult from './rule-result'
import { EventEmitter } from 'events'
import deepClone from 'lodash.clonedeep'

let debug = require('debug')('json-rules-engine')

Expand Down Expand Up @@ -132,11 +132,7 @@ class Rule extends EventEmitter {
* @return {Promise(RuleResult)} rule evaluation result
*/
async evaluate (almanac) {
let ruleResult = {
conditions: deepClone(this.conditions),
event: deepClone(this.event),
priority: deepClone(this.priority)
}
let ruleResult = new RuleResult(this.conditions, this.event, this.priority)

/**
* Evaluates the rule conditions
Expand Down Expand Up @@ -251,7 +247,8 @@ class Rule extends EventEmitter {
* @param {Boolean} result
*/
let processResult = (result) => {
ruleResult.result = result
ruleResult.setResult(result)

if (result) this.emit('success', ruleResult.event, almanac, ruleResult)
else this.emit('failure', ruleResult.event, almanac, ruleResult)
return ruleResult
Expand Down
13 changes: 13 additions & 0 deletions test/engine-event.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -276,4 +276,17 @@ describe('Engine: event', () => {
expect(successSpy.callCount).to.equal(0)
})
})

context('rule events: json serializing', () => {
beforeEach(() => simpleSetup())
it('serializes properties', async () => {
let successSpy = sinon.spy()
let rule = engine.rules[0]
rule.on('success', successSpy)
await engine.run()
let ruleResult = successSpy.getCall(0).args[2]
let expected = '{"conditions":{"priority":1,"any":[{"operator":"greaterThanInclusive","value":21,"fact":"age"},{"operator":"equal","value":true,"fact":"qualified"}]},"event":{"type":"setDrinkingFlag","params":{"canOrderDrinks":true}},"priority":100,"result":true}'
expect(JSON.stringify(ruleResult)).to.equal(expected)
})
})
})