From 03ddc34aee761f9735a5dd86ec14486590c4ed17 Mon Sep 17 00:00:00 2001
From: coderaiser <mnemonic.enemy@gmail.com>
Date: Fri, 29 Nov 2013 16:37:40 +0000
Subject: [PATCH] feature(files) add options

---
 cloudcmd.js         | 6 +++---
 lib/server/files.js | 7 +++++--
 test/test.js        | 8 ++++----
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/cloudcmd.js b/cloudcmd.js
index 91fd04ad..da518df0 100644
--- a/cloudcmd.js
+++ b/cloudcmd.js
@@ -144,12 +144,12 @@
         if (Config.ssl)
             lFiles.push(KEY, CERT);
         
-        files.read(lFiles, function(pErrors, pFiles) {
+        files.read(lFiles, 'utf-8', function(pErrors, pFiles) {
             if (pErrors)
                 Util.log(pErrors);
             else {
-                FileTemplate    = pFiles[FILE_TMPL].toString();
-                PathTemplate    = pFiles[PATH_TMPL].toString();
+                FileTemplate    = pFiles[FILE_TMPL];
+                PathTemplate    = pFiles[PATH_TMPL];
                 
                 if (Config.ssl)
                     lParams.ssl = {
diff --git a/lib/server/files.js b/lib/server/files.js
index 3809e56a..6a3cb71f 100644
--- a/lib/server/files.js
+++ b/lib/server/files.js
@@ -16,7 +16,7 @@
         CloudFunc   = main.cloudfunc,
         Util        = main.util;
     
-    object.read     = function(pFiles, pCallBack) {
+    object.read     = function(pFiles, pOptions, pCallBack) {
         var lDone = [],
             lFiles,
             lErrors,
@@ -55,6 +55,9 @@
                 }
             };
         
+        if (!pCallBack)
+            pCallback = pOptions;
+        
         if (Util.isArray(pFiles))
             lFiles = pFiles;
         else
@@ -64,7 +67,7 @@
             lName = lFiles.pop();
             lDone.push(lName);
             
-            fs.readFile(lName, Util.call(lDoneFunc, lName));
+            fs.readFile(lName, pOptions, Util.call(lDoneFunc, lName));
         }
     };
     
diff --git a/test/test.js b/test/test.js
index aa989413..59c6ccae 100644
--- a/test/test.js
+++ b/test/test.js
@@ -55,15 +55,15 @@
             '</li>';
     
     
-    files.read(Files, function(pErrors, pFiles){
+    files.read(Files, 'utf-8', function(pErrors, pFiles){
         if(pErrors)
             Util.log(pErrors);
         else{
             console.time('CloudFunc.buildFromJSON');
             
-            var lTemplate       = pFiles[TEMPLATEPATH].toString(),
-                lPathTemplate   = pFiles[PATHTEMPLATE_PATH].toString(),
-                lExpect         = pFiles[EXPECT_PATH].toString(),
+            var lTemplate       = pFiles[TEMPLATEPATH],
+                lPathTemplate   = pFiles[PATHTEMPLATE_PATH],
+                lExpect         = pFiles[EXPECT_PATH],
                 
                 lResult         = CloudFunc.buildFromJSON(lJSON, lTemplate, lPathTemplate);