v0.0.5

Author: mishanga

lib/csscomb.js

@@ -38,7 +38,6 @@ Comb.prototype = {
                     var handler = require('./options/' + option).setValue(config[option]);
                     handler && _this._handlers.push(handler);
                 } catch (e) {
-                    throw new Error('Handler ' + option + ' was not found.');
                 }
             }
         });

lib/options/colon-space.js

@@ -7,6 +7,7 @@ module.exports = {
      * @returns {Object}
      */
     setValue: function(value) {
+        this._value = false;
         if (value === true) this._value = 'after';
         if (typeof value === 'string' && value.match(/after|before|both/)) this._value = value;
         if (!this._value) return;

lib/options/stick-brace.js

@@ -7,6 +7,7 @@ module.exports = {
      * @returns {Object}
      */
     setValue: function(value) {
+        this._value = false;
         if (value === true) value = ' ';
         if (typeof value === 'string' && value.match(/^[ \t\n]*$/)) this._value = value;
         if (!this._value) return;
@@ -19,9 +20,15 @@ module.exports = {
      * @param {node} node
      */
     process: function(nodeType, node) {
-        if (nodeType === 'simpleselector') {
-            if (node[node.length - 1][0] === 's') node.pop();
-            node.push(['s', this._value]);
+        if (nodeType === 'selector') {
+            for (var i = node.length; i--;) {
+                var nodeItem = node[i];
+                if (nodeItem[0] === 'simpleselector') {
+                    if (nodeItem[nodeItem.length - 1][0] === 's') nodeItem.pop();
+                    nodeItem.push(['s', this._value]);
+                    break;
+                }
+            }
         }
     }
 

package.json

@@ -1,7 +1,7 @@
 {
     "name": "csscomb",
     "description": "Tool for beautify CSS",
-    "version": "0.0.4",
+    "version": "0.0.5",
     "homepage": "http://csscomb.com/",
     "author": "Mikhail Troshev <mishanga@yandex-team.ru>",
     "repository": "https://github.com/csscomb/csscomb.js",

test/integral.expect.css

@@ -0,0 +1,58 @@
+/* Фигурные скобки. Вариант 1 */
+a, b, i /* foobar */
+{
+  padding: 0;
+  margin: 0;
+  }
+  div p
+{
+    font-size: 1px;
+      top: 0;
+    }
+    div p em
+{
+        font-style: italic;
+        border-bottom: 1px solid red;
+}
+
+/* Фигурные скобки. Вариант 2 */
+div
+{
+  padding: 0;
+  margin: 0;
+}
+  div p
+{
+    font-size: 1px;
+      top: 0;
+  }
+    div p em
+{
+        font-style: italic;/* inline comment*/
+        border-bottom: 1px solid red;
+    }
+
+/* Фигурные скобки. Вариант 3 */
+div
+{
+  padding: 0;
+  margin: 0;
+}
+/* foo */  div p
+{
+    font-size: 1px;
+      top: 0
+  }
+    div p em
+{
+        /* upline comment*/
+        font-style: italic;
+        border-bottom: 1px solid red
+    }
+
+    a
+{
+top: 0;/* ololo */margin: 0;}
+    b
+{
+top: 0/* trololo */;margin: 0}

test/integral.js

@@ -0,0 +1,26 @@
+var Comb = require('../lib/csscomb');
+var assert = require('assert');
+var vow = require('vow');
+var vfs = require('vow-fs');
+
+describe('integral test', function() {
+    var comb;
+    it('Process result must be equal to expect.css', function() {
+        comb = new Comb();
+        comb.configure(require('../.csscomb.json'));
+        vow.all(['origin', 'expect'].map(function(type) {
+            var fileName = './test/integral.' + type + '.css';
+            return vfs.read(fileName, 'utf8').then(function(data) {
+                return data;
+            });
+        }))
+        .then(function(results) {
+            try {
+                assert.equal(comb.processString(results[0]), results[1]);
+                done();
+            } catch (e) {
+                done(e);
+            }
+        });
+    });
+});

test/test.css test/integral.origin.csstest/test.css renamed to test/integral.origin.css

@@ -1,5 +1,5 @@
 /* Фигурные скобки. Вариант 1 */
-div{
+a, b, i /* foobar */ {
   padding:0;
   margin:0;
   }
@@ -34,21 +34,21 @@ div {
   padding:0;
   margin:0;
 }
-  div p {
+/* foo */  div p {
     font-size:1px;
-      top:0;
+      top:0
   }
     div p em {
         /* upline comment*/
         font-style:italic;
-        border-bottom:1px solid red;
+        border-bottom:1px solid red
     }
 
     a{
 top: 0;/* ololo */margin :0;}
     b
         {
-top :0/* trololo */;margin : 0;}
+top :0/* trololo */;margin : 0}
 
 
 

test/stick-brace.js

@@ -18,11 +18,13 @@ describe('options/stick-brace', function() {
         assert.equal(
             comb.processString(
                 'a { color: red }' +
+                'a,\nb /* i */\n{ color: red }' +
                 'a{color:red}' +
                 'a \t\t \n{color:red}' +
                 'a /* foo */ {color:red}'
             ),
             'a { color: red }' +
+            'a,\nb /* i */ { color: red }' +
             'a {color:red}' +
             'a {color:red}' +
             'a /* foo */ {color:red}'
@@ -33,11 +35,13 @@ describe('options/stick-brace', function() {
         assert.equal(
             comb.processString(
                 'a { color: red }' +
+                'a, b /* i */ { color: red }' +
                 'a{color:red}' +
                 'a \t\t \n{color:red}' +
                 'a /* foo */ {color:red}'
             ),
             'a\n{ color: red }' +
+            'a, b /* i */\n{ color: red }' +
             'a\n{color:red}' +
             'a\n{color:red}' +
             'a /* foo */\n{color:red}'