From e386428ceea148ed85c5f7a7273bde518dbfd7a0 Mon Sep 17 00:00:00 2001
From: Mael <mael.thomas@data.gouv.fr>
Date: Tue, 25 Sep 2018 17:22:32 +0000
Subject: [PATCH] =?UTF-8?q?La=20librairie=20permet=20d'=C3=A9tendre=20la?=
 =?UTF-8?q?=20base=20d=C3=A9faut=20avec=20de=20nouvelles=20r=C3=A8gles?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/engine/index.js         | 14 +++++++++++---
 sas => source/règles/sasu.yaml |  0
 test/library.test.js           | 35 +++++++++++++++++++++++++++++++---
 3 files changed, 43 insertions(+), 6 deletions(-)
 rename sas => source/règles/sasu.yaml (100%)

diff --git a/source/engine/index.js b/source/engine/index.js
index b1846f54f..780d8ddf2 100644
--- a/source/engine/index.js
+++ b/source/engine/index.js
@@ -17,10 +17,18 @@ let nestedSituationToStateSelector = nestedSituation => dottedName =>
 		...nestedSituationToPathMap(nestedSituation)
 	}[dottedName])
 
+let enrichYaml = string => yaml.safeLoad(string).map(enrichRule)
+
 export default {
-	evaluate: (targetNames, nestedSituation, rulesYaml) => {
-		let rules = rulesYaml
-			? (rules = parseAll(yaml.safeLoad(rulesYaml).map(enrichRule)))
+	evaluate: (targetNames, nestedSituation, rulesConfig) => {
+		let rules = rulesConfig
+			? do {
+					let { base, extra } = rulesConfig
+					parseAll([
+						...(base ? enrichYaml(base) : rulesFr),
+						...(extra ? enrichYaml(extra) : [])
+					])
+			  }
 			: defaultRules
 
 		return analyseMany(rules, targetNames)(
diff --git a/sas b/source/règles/sasu.yaml
similarity index 100%
rename from sas
rename to source/règles/sasu.yaml
diff --git a/test/library.test.js b/test/library.test.js
index ddf90bc55..d6d60621d 100644
--- a/test/library.test.js
+++ b/test/library.test.js
@@ -2,7 +2,7 @@ import { expect } from 'chai'
 import Syso from '../source/engine/index'
 import { propEq } from 'ramda'
 import dedent from 'dedent-js'
-console.log(Syso)
+import sasuYaml from 'yaml-loader!../source/règles/sasu.yaml'
 
 describe('library', function() {
 	it('should evaluate one target with no input data', function() {
@@ -17,15 +17,44 @@ describe('library', function() {
 	})
 
 	it('should let the user replace the default rules', function() {
-		let newRules = `
+		let rules = `
 - nom: yo
   formule: 90890
 - nom: ya
   formule:  yo + 1
 `
 
-		let evaluated = Syso.evaluate(['ya'], {}, newRules)
+		let evaluated = Syso.evaluate(['ya'], {}, { base: rules })
 
 		expect(evaluated.targets[0].nodeValue).to.equal(90891)
 	})
+	it('should let the user add rules to the default ones', function() {
+		let rules = `
+- nom: yo
+  formule: 1
+- nom: ya
+  formule:  contrat salarié . salaire . net + yo
+`
+
+		let evaluated = Syso.evaluate(
+			['ya'],
+			{
+				'contrat salarié . salaire . brut de base': 2300
+			},
+			{ extra: rules }
+		)
+
+		expect(evaluated.targets[0].nodeValue).to.be.closeTo(1780.41, 1)
+	})
+	it('should let the user extend the rules constellation in a serious manner', function() {
+		let evaluated = Syso.evaluate(
+			['ya'],
+			{
+				'contrat salarié . salaire . brut de base': 2300
+			},
+			{ extra: sasuYaml }
+		)
+
+		expect(evaluated.targets[0].nodeValue).to.be.closeTo(1780.41, 1)
+	})
 })