Gonzales 3.0: Update space-before-closing-brace

Author: tonyganch

lib/options/space-before-closing-brace.js

@@ -1,9 +1,13 @@
+var gonzales = require('gonzales-pe');
+
 module.exports = (function() {
     function getLastWhitespaceNode(node) {
-        var lastNode = node[node.length - 1];
+        var lastNode = node.last();
+
+        if (!lastNode || !lastNode.content) return null;
 
-        if (typeof lastNode !== 'object' || lastNode[0] === 'block') return null;
-        if (lastNode[0] === 's') return lastNode;
+        if (lastNode.is('block')) return null;
+        if (lastNode.is('s')) return lastNode;
 
         return getLastWhitespaceNode(lastNode);
     }
@@ -22,33 +26,50 @@ module.exports = (function() {
 
         /**
          * Processes tree node.
-         * @param {String} nodeType
          * @param {node} node
-         * @param {Number} level
          */
-        process: function(nodeType, node, level) {
-            if (nodeType !== 'block' && nodeType !== 'atrulers') return;
-
+        process: function(node) {
             var value = this.getValue('space-before-closing-brace');
+            var blockIndent = this.getValue('block-indent');
 
-            // If found block node stop at the next one for space check
-            // For the pre-block node, find its last (the deepest) child
-            var whitespaceNode = getLastWhitespaceNode(node);
+            if (!node.is('stylesheet')) return;
 
-            if (value.indexOf('\n') > -1) {
-                var blockIndent = this.getValue('block-indent');
-                // TODO: Check that it works for '' block indent value <tg>
-                if (blockIndent) value += new Array(level + 1).join(blockIndent);
-            }
+            function processBlock(x, level) {
+                level = level || 0;
+
+                for (var i = 0; i < x.content.length; i++) {
+                    node = x.get(i);
+                    if (!node) continue;
 
-            // If it's spaces, modify this node
-            // If it's something different from spaces, add a space node to the end
+                    if (node.is('block') || node.is('atrulers')) {
+                        // If found block node stop at the next one for space check
+                        // For the pre-block node, find its last (the deepest) child
+                        var whitespaceNode = getLastWhitespaceNode(node);
 
-            if (whitespaceNode) {
-                whitespaceNode[1] = value;
-            } else if (value !== '') {
-                node.push(['s', value]);
+                        if (value.indexOf('\n') > -1) {
+                            // TODO: Check that it works for '' block indent value <tg>
+                            if (blockIndent) value += new Array(level + 1).join(blockIndent);
+                        }
+
+                        // If it's spaces, modify this node
+                        // If it's something different from spaces, add a space node to the end
+
+                        if (whitespaceNode) {
+                            whitespaceNode.content = value;
+                        } else if (value !== '') {
+                            var space = gonzales.createNode({ type: 's', content: value });
+                            if (Array.isArray(node.content))
+                                node.content.push(space);
+                        }
+
+                        level++;
+                    }
+
+                    processBlock(node, level);
+                }
             }
+
+            processBlock(node);
         },
 
         /**

test/options/space-before-closing-brace/test.js

@@ -1,4 +1,4 @@
-describe.skip('options/space-before-closing-brace:', function() {
+describe('options/space-before-closing-brace:', function() {
     it('Array value => should not change anything', function() {
         this.comb.configure({ 'space-before-closing-brace': ['', ' '] });
         this.shouldBeEqual('test.css');
@@ -29,39 +29,39 @@ describe.skip('options/space-before-closing-brace:', function() {
         this.shouldBeEqual('test.css', 'test-3.expected.css');
     });
 
-    it('Should detect no whitespace', function() {
+    it.skip('Should detect no whitespace', function() {
         this.shouldDetect(
             ['space-before-closing-brace'],
             'a{top:0}',
             { 'space-before-closing-brace': '' }
         );
     });
 
-    it('Should detect no whitespace (2 blocks)', function() {
+    it.skip('Should detect no whitespace (2 blocks)', function() {
         this.shouldDetect(
             ['space-before-closing-brace'],
             'a{top:0} b { color: tomato; }',
             { 'space-before-closing-brace': '' }
         );
     });
 
-    it('Should detect whitespace', function() {
+    it.skip('Should detect whitespace', function() {
         this.shouldDetect(
             ['space-before-closing-brace'],
             'a { top:0 }',
             { 'space-before-closing-brace': ' ' }
         );
     });
 
-    it('Should detect whitespace (2 blocks)', function() {
+    it.skip('Should detect whitespace (2 blocks)', function() {
         this.shouldDetect(
             ['space-before-closing-brace'],
             'a { top:0 } b{color:tomato;}',
             { 'space-before-closing-brace': ' ' }
         );
     });
 
-    it('Should detect whitespace (mix with block indent)', function() {
+    it.skip('Should detect whitespace (mix with block indent)', function() {
         this.shouldDetect(
             ['space-before-closing-brace', 'block-indent'],
             'a {\n  top:0\n  }\nb{\n  color:tomato;\n  }',