Merge branch 'feature/issue-59' into develop

dist/yaml.js

@@ -1465,7 +1465,8 @@ module.exports = Unescaper;
 
 
 },{"./Pattern":7,"./Utils":9}],9:[function(require,module,exports){
-var Pattern, Utils;
+var Pattern, Utils,
+  hasProp = {}.hasOwnProperty;
 
 Pattern = require('./Pattern');
 
@@ -1534,7 +1535,20 @@ Utils = (function() {
   };
 
   Utils.isEmpty = function(value) {
-    return !value || value === '' || value === '0' || (value instanceof Array && value.length === 0);
+    return !value || value === '' || value === '0' || (value instanceof Array && value.length === 0) || this.isEmptyObject(value);
+  };
+
+  Utils.isEmptyObject = function(value) {
+    var k;
+    return value instanceof Object && ((function() {
+      var results;
+      results = [];
+      for (k in value) {
+        if (!hasProp.call(value, k)) continue;
+        results.push(k);
+      }
+      return results;
+    })()).length === 0;
   };
 
   Utils.subStrCount = function(string, subString, start, length) {

src/Utils.coffee

@@ -79,15 +79,23 @@ class Utils
         return str.replace(regexRight, '')
 
 
-    # Checks if the given value is empty (null, undefined, empty string, string '0')
+    # Checks if the given value is empty (null, undefined, empty string, string '0', empty Array, empty Object)
     #
     # @param [Object] value The value to check
     #
     # @return [Boolean] true if the value is empty
     #
     @isEmpty: (value) ->
-        return not(value) or value is '' or value is '0' or (value instanceof Array and value.length is 0)
+        return not(value) or value is '' or value is '0' or (value instanceof Array and value.length is 0) or @isEmptyObject(value)
 
+    # Checks if the given value is an empty object
+    #
+    # @param [Object] value The value to check
+    #
+    # @return [Boolean] true if the value is empty and is an object
+    #
+    @isEmptyObject: (value) ->
+        return value instanceof Object and (k for own k of value).length is 0
 
     # Counts the number of occurences of subString inside string
     #
@@ -100,22 +108,22 @@ class Utils
     #
     @subStrCount: (string, subString, start, length) ->
         c = 0
-        
+
         string = '' + string
         subString = '' + subString
-        
+
         if start?
             string = string[start..]
         if length?
             string = string[0...length]
-        
+
         len = string.length
         sublen = subString.length
         for i in [0...len]
             if subString is string[i...sublen]
                 c++
                 i += sublen - 1
-        
+
         return c
 
 
@@ -308,7 +316,7 @@ class Utils
                             callback(null)
                 xhr.open 'GET', path, true
                 xhr.send null
-            
+
             else
                 # Sync
                 xhr.open 'GET', path, false

test/spec/YamlSpec.coffee

@@ -934,7 +934,10 @@ describe 'Dumped YAML Inline Collections', ->
         expect YAML.parse(YAML.dump({key:[]}))
         .toEqual({key:[]})
 
+    it 'can be dumpted empty inline collections', ->
 
+        expect YAML.parse(YAML.dump({key:{}}))
+        .toEqual({key:{}})
 
 describe 'Dumped YAML Basic Types', ->