Merge branch 'master' into 1.x

Conflicts:
	coffee/docxgenTest.coffee
	coffee/xmlTemplater.coffee

Author: edi9999

coffee/docxgenTest.coffee

@@ -1,5 +1,4 @@
 docX={}
-docXData={}
 
 expressions= require('angular-expressions')
 angularParser= (tag) ->
@@ -127,10 +126,10 @@ describe "DocxGenTemplatingForLoop", () ->
 				"prenom":"Edgar"
 				"telephone":"0652455478"
 				"description":"New Website"
-				"offre":[{"titre":"titre1","prix":"1250"},{"titre":"titre2","prix":"2000"},{"titre":"titre3","prix":"1400"}]
+				"offre":[{"titre":"titre1","prix":"1250"},{"titre":"titre2","prix":"2000"},{"titre":"titre3","prix":"1400", "nom": "Offre"}]
 			docX['tagLoopExample.docx'].setTags Tags
 			docX['tagLoopExample.docx'].applyTags()
-			expect(docX['tagLoopExample.docx'].getFullText()).toEqual('Votre proposition commercialePrix: 1250Titre titre1Prix: 2000Titre titre2Prix: 1400Titre titre3HippEdgar')
+			expect(docX['tagLoopExample.docx'].getFullText()).toEqual('Votre proposition commercialeHippPrix: 1250Titre titre1HippPrix: 2000Titre titre2OffrePrix: 1400Titre titre3HippEdgar')
 		it "should work with loops inside loops", () ->
 			Tags = {"products":[{"title":"Microsoft","name":"DOS","reference":"Win7","avantages":[{"title":"Everyone uses it","proof":[{"reason":"it is quite cheap"},{"reason":"it is quit simple"},{"reason":"it works on a lot of different Hardware"}]}]},{"title":"Linux","name":"Ubuntu","reference":"Ubuntu10","avantages":[{"title":"It's very powerful","proof":[{"reason":"the terminal is your friend"},{"reason":"Hello world"},{"reason":"it's free"}]}]},{"title":"Apple","name":"Mac","reference":"OSX","avantages":[{"title":"It's very easy","proof":[{"reason":"you can do a lot just with the mouse"},{"reason":"It's nicely designed"}]}]},]}
 			docX['tagProduitLoop.docx'].setTags Tags
@@ -262,9 +261,7 @@ describe "getTags", () ->
 	it "should work with loop document", () ->
 		docX['tagLoopExample.docx']=new DocxGen docX['tagLoopExample.docx'].loadedContent,{},{intelligentTagging:off}
 		tempVars= docX['tagLoopExample.docx'].getTags()
-		expect(tempVars).toEqual([ { fileName : 'word/document.xml', vars : { offre : { prix : true, titre : true }, nom : true, prenom : true } }, { fileName : 'word/footer1.xml', vars : { nom : true, prenom : true, telephone : true } }, { fileName : 'word/header1.xml', vars : { nom : true, prenom : true } } ])
-
-
+		expect(tempVars).toEqual([ { fileName : 'word/document.xml', vars : { offre : { nom: true, prix : true, titre : true }, nom : true, prenom : true } }, { fileName : 'word/footer1.xml', vars : { nom : true, prenom : true, telephone : true } }, { fileName : 'word/header1.xml', vars : { nom : true, prenom : true } } ])
 
 describe "xmlTemplater", ()->
 	it "should work with simpleContent", ()->
@@ -594,6 +591,17 @@ describe 'SubContent', () ->
 		xmlt=new DocXTemplater(content,{Tags:{name:"Henry"}}).applyTags()
 		expect(xmlt.content).toContain('Henry</w:t><w:t')
 
+describe 'getting parents context',()->
+	it 'should work with simple loops',()->
+		content= """{#loop}{name}{/loop}"""
+		xmlt=new DocXTemplater(content,{Tags:{loop:[1],name:"Henry"}}).applyTags()
+		expect(xmlt.content).toBe("Henry")
+
+	it 'should work with double loops',()->
+		content= """{#loop_first}{#loop_second}{name_inner} {name_outer}{/loop_second}{/loop_first}"""
+		xmlt=new DocXTemplater(content,{Tags:{loop_first:[1],loop_second:[{name_inner:"John"}],name_outer:"Henry"}}).applyTags()
+		expect(xmlt.content).toBe("John Henry")
+
 describe 'error messages', ()->
 	it 'should work with unclosed', ()->
 		content= """<w:t>{tag {age}</w:t>"""

coffee/scopeManager.coffee

@@ -2,27 +2,31 @@
 DocUtils=require('./docUtils')
 
 module.exports=class ScopeManager
-	constructor:(@tags,@scopePath,@usedTags,@currentScope,@parser)->
+	constructor:(@tags,@scopePath,@usedTags,@scopeList,@parser)->
 	loopOver:(tag,callback,inverted=false)->
 		value = @getValue(tag)
 		type = typeof value
 		if inverted
-			return callback(@currentScope) unless value
+			return callback(@scopeList[@num]) unless value
 			return if type == 'string'
 			if type == 'object' && value.length < 1
-				callback(@currentScope)
+				callback(@scopeList[@num])
 			return
 		return unless value?
 		if type == 'object'
 			for scope,i in value
 				callback(scope)
 		if value == true
-			callback(@currentScope)
-	getValue:(tag)->
+			callback(@scopeList[@num])
+	getValue:(tag,@num=@scopeList.length-1)->
+		scope=@scopeList[@num]
 		parser=@parser(DocUtils.wordToUtf8(tag))
-		result=parser.get(@currentScope)
+		result=parser.get(scope)
+		if result==undefined and @num>0 then return @getValue(tag,@num-1)
+		result
 	getValueFromScope: (tag) ->
-		result=@getValue(tag)
+		# search in the scopes (in reverse order) and keep the first defined value
+		result = @getValue(tag)
 		if result?
 			if typeof result=='string'
 				@useTag(tag)

coffee/xmlTemplater.coffee

@@ -11,7 +11,6 @@ module.exports=class XmlTemplater #abstract class !!
 		@currentClass=XmlTemplater #This is used because tags are recursive, so the class needs to be able to instanciate an object of the same class. I created a variable so you don't have to Override all functions relative to recursivity
 		@fromJson(options)
 		@templaterState= new TemplaterState
-		@currentScope=@Tags
 	load: (@content) ->
 		xmlMatcher=new XmlMatcher(@content).parse(@tagXml)
 		@templaterState.matches = xmlMatcher.matches
@@ -21,16 +20,18 @@ module.exports=class XmlTemplater #abstract class !!
 		@DocxGen= if options.DocxGen? then options.DocxGen else null
 		@intelligentTagging=if options.intelligentTagging? then options.intelligentTagging else off
 		@scopePath=if options.scopePath? then options.scopePath else []
+		@scopeList= if options.scopeList? then options.scopeList else [@Tags]
 		@usedTags=if options.usedTags? then options.usedTags else {}
 		@imageId=if options.imageId? then options.imageId else 0
 		@parser= if options.parser? then options.parser else DocUtils.defaultParser
 		@fileName=options.fileName
-		@scopeManager=new ScopeManager(@Tags,@scopePath,@usedTags,@Tags,@parser)
+		@scopeManager=new ScopeManager(@Tags,@scopePath,@usedTags,@scopeList,@parser)
 	toJson: () ->
 		Tags:DocUtils.clone @scopeManager.tags
 		DocxGen:@DocxGen
 		intelligentTagging:DocUtils.clone @intelligentTagging
 		scopePath:DocUtils.clone @scopeManager.scopePath
+		scopeList: DocUtils.clone @scopeManager.scopeList
 		usedTags:@scopeManager.usedTags
 		localImageCreator:@localImageCreator
 		imageId:@imageId
@@ -177,6 +178,7 @@ module.exports=class XmlTemplater #abstract class !!
 		if argOptions?
 			if argOptions.Tags?
 				options.Tags=argOptions.Tags
+				options.scopeList = options.scopeList.concat(argOptions.Tags)
 				options.scopePath= options.scopePath.concat(@templaterState.loopOpen.tag)
 		subfile= new @currentClass innerTagsContent,options
 		subsubfile=subfile.applyTags()

examples/tagLoopExample.docx

@@ -11,7 +11,7 @@ var server=null;
 
 try {
     var Blink1 = require('node-blink1');
-    var blink1 = new Blink1('20002C4A');
+    var blink1 = new Blink1();
 } catch (e) {
     blink1={
         fadeToRGB:function(){

gulpfile.js

@@ -1,6 +1,6 @@
 {
   "name": "docxtemplater",
-  "version": "0.7.6",
+  "version": "0.7.7",
   "author": "Edgar Hipp",
   "description": "A docX templater",
   "contributors": [