update api for 1.x

Author: edi9999

coffee/docxgen.coffee

@@ -9,17 +9,20 @@ JSZip=require('jszip')
 
 DocxGen=class DocxGen
 	templatedFiles=["word/document.xml","word/footer1.xml","word/footer2.xml","word/footer3.xml","word/header1.xml","word/header2.xml","word/header3.xml"]
-	constructor:(content) ->
+	constructor:(content,options) ->
 		@setOptions({})
-		if content? then if content.length>0 then @load(content)
+		if content? then @load(content,options)
 	setOptions:(@options={})->
 		@intelligentTagging= if @options.intelligentTagging? then @options.intelligentTagging else on
 		if @options.parser? then @parser=options.parser
 		this
-	load: (content)->
-		@zip = new JSZip content
+	load: (content,options)->
+		if content.file?
+			@zip=content
+		else
+			@zip = new JSZip content,options
 		this
-	applyTags:(@Tags=@Tags)->
+	render:()->
 		#Loop inside all templatedFiles (basically xml files with content). Sometimes they dont't exist (footer.xml for example)
 		for fileName in templatedFiles when @zip.files[fileName]?
 			currentFile= new DocXTemplater(@zip.files[fileName].asText(),{
@@ -29,10 +32,8 @@ DocxGen=class DocxGen
 				parser:@parser
 				fileName:fileName
 			})
-			@setData(fileName,currentFile.applyTags().content)
+			@zip.file(fileName,currentFile.render().content)
 		this
-	setData:(fileName,data,options={})->
-		@zip.file(fileName,data,options)
 	getTags:()->
 		usedTags=[]
 		for fileName in templatedFiles when @zip.files[fileName]?
@@ -42,17 +43,15 @@ DocxGen=class DocxGen
 				intelligentTagging:@intelligentTagging
 				parser:@parser
 			})
-			usedTemplateV= currentFile.applyTags().usedTags
+			usedTemplateV= currentFile.render().usedTags
 			if DocUtils.sizeOfObject(usedTemplateV)
 				usedTags.push {fileName,vars:usedTemplateV}
 		usedTags
-	setTags: (@Tags) ->
+	setData:(@Tags) ->
 		this
 	#output all files, if docx has been loaded via javascript, it will be available
-	output: (options={}) ->
-		if !options.type? then options.type="base64"
-		if !options.compression? then options.compression="DEFLATE"
-		@zip.generate({type:options.type, compression:options.compression})
+	getZip:()->
+		@zip
 	getFullText:(path="word/document.xml") ->
 		usedData=@zip.files[path].asText()
 		(new DocXTemplater(usedData,{DocxGen:this,Tags:@Tags,intelligentTagging:@intelligentTagging})).getFullText()