Add additional tests. Fix asynchronous loading.

2 files changed, 7 insertions, 5 deletions

diff --git a/lib/Utils.js b/lib/Utils.js
index 4f1f3da..30a1023 100644
--- a/lib/Utils.js
+++ b/lib/Utils.js
@@ -264,7 +264,7 @@ Utils = (function() {
           if (err) {
             return callback(null);
           } else {
-            return callback(data);
+            return callback(String(data));
           }
         });
       } else {
diff --git a/lib/Yaml.js b/lib/Yaml.js
index 8ab695f..67bd634 100644
--- a/lib/Yaml.js
+++ b/lib/Yaml.js
@@ -34,10 +34,12 @@ Yaml = (function() {
     if (callback != null) {
       return Utils.getStringFromFile(path, (function(_this) {
         return function(input) {
+          var result;
+          result = null;
           if (input != null) {
-            return _this.parse(input, exceptionOnInvalidType, objectDecoder);
+            result = _this.parse(input, exceptionOnInvalidType, objectDecoder);
           }
-          return null;
+          callback(result);
         };
       })(this));
     } else {
@@ -79,11 +81,11 @@ Yaml = (function() {
     }
   };
 
-  Yaml.prototype.stringify = function(input, inline, indent, exceptionOnInvalidType, objectEncoder) {
+  Yaml.stringify = function(input, inline, indent, exceptionOnInvalidType, objectEncoder) {
     return this.dump(input, inline, indent, exceptionOnInvalidType, objectEncoder);
   };
 
-  Yaml.prototype.load = function(path, callback, exceptionOnInvalidType, objectDecoder) {
+  Yaml.load = function(path, callback, exceptionOnInvalidType, objectDecoder) {
     return this.parseFile(path, callback, exceptionOnInvalidType, objectDecoder);
   };