Fixed js-yaml library usage

* ormDriver function in the generators fixed to use database.yml right * locales and utils fixed to get first document from YAML file (there is no needs in the multiple documents per file support)
sagivo · Jun 4, 2012 · 7d71b2a · 7d71b2a
1 parent 799d45e
commit 7d71b2a
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/lib/generators.js b/lib/generators.js
@@ -675,13 +675,39 @@ exports.list = function () {
         return template.replace(/PREPEND_MIDDLEWARE/g, mw.join('\n    '));
     };
 
+    function loadConfig(filename) {
+        var filenameExt = /\.([^\.]+)$/.exec(filename)[1];
+        switch (filenameExt) {
+          case '~':
+            var config = null;
+            ['.json','.yml'].forEach(function(testExt){
+              try {
+                var testFilename = filename.replace(/\.~$/, testExt)
+                var stats = fs.lstatSync(testFilename);
+                if (stats.isFile())
+                  config = loadConfig(testFilename);
+              }
+              catch(e) {}
+            });
+            if (config != null) return config;
+            throw new Error( sys.format('Can not find configuration file by path template"%s"', filename) );
+            break;
+          case 'json':
+            return JSON.parse(require('fs').readFileSync(filename, 'utf8'));
+          case 'yml':
+            return require(filename).shift();
+          default:
+            throw new Error( sys.format('Unknown configuration file name extension "%s"', filenameExt) );
+        }
+    };
+
     /**
      * Return default ORM driver, based on config/database.json
      * @deprecated
      */
     function ormDriver() {
         if (!ormDriver.config) {
-            ormDriver.config = JSON.parse(require('fs').readFileSync(process.cwd() + '/config/database.json', 'utf8')).development;
+            ormDriver.config = loadConfig(process.cwd() + '/config/database.~').development;
         }
         return ormDriver.config.driver;
     }

diff --git a/lib/locales.js b/lib/locales.js
@@ -37,7 +37,7 @@ exports.load = function (dir) {
         var obj;
         try {
             if (file.match(/\.ya?ml$/)) {
-                obj = require(filename);
+                obj = require(filename).shift();
             } else if (file.match(/\.json/)) {
                 obj = JSON.parse(code);
             } else if (file.match(/\.coffee/)) {

diff --git a/lib/railway_utils.js b/lib/railway_utils.js
@@ -192,7 +192,7 @@ exports.addSpaces = addSpaces;
 
 function readYaml(file) {
     try {
-        return require(file);
+        return require(file).shift();
     } catch (e) {
         console.log('Error in reading', file);
         console.log(e.message);