v0.0.3

Author: mishanga

README.md

@@ -33,6 +33,8 @@ Example configuration:
 ```javascript
 {
     "exclude": ["node_modules/**"],
+    "colon-space": true,
+    "stick-brace": true,
     "strip-spaces": true
 }
 ```

lib/csscomb.js

@@ -9,7 +9,7 @@ var vfs = require('vow-fs');
  * @name Comb
  */
 var Comb = function() {
-    this._rules = {
+    this._options = {
         'colon-space': {},
         'rule-indent': {},
         'sort-order': {},
@@ -24,18 +24,15 @@ Comb.prototype = {
 
     /**
      * Loads configuration from JSON.
-     * Activates and configures required rules.
+     * Activates and configures required options.
      *
      * @param {Object} config
      */
     configure: function(config) {
-        for (var rule in config) {
-            if (config.hasOwnProperty(rule) && config[rule] && this._rules[rule]) {
-                var beautifier;
+        for (var option in config) {
+            if (config.hasOwnProperty(option) && config[option] && this._options[option]) {
                 try {
-                    beautifier = require('./rules/' + rule);
-                    beautifier.value = config[rule];
-                    this._config[rule] = beautifier;
+                    this._config[option] = require('./options/' + option).setValue(config[option]);
                 } catch (e) {}
             }
         }
@@ -65,9 +62,9 @@ Comb.prototype = {
         node.forEach(function(node) {
             if (!Array.isArray(node)) return;
             var nodeType = node.shift();
-            for (var rule in config) {
-                if (config.hasOwnProperty(rule)) {
-                    config[rule].process(nodeType, node);
+            for (var option in config) {
+                if (config.hasOwnProperty(option)) {
+                    config[option].process(nodeType, node);
                 }
             }
             node.unshift(nodeType);

lib/options/colon-space.js

@@ -0,0 +1,39 @@
+module.exports = {
+
+    _value: false,
+
+    /**
+     * Sets handler value.
+     *
+     * @param {String|Boolean} value Option value
+     * @returns {Object}
+     */
+    setValue: function(value) {
+        if (!value) return this;
+        if (typeof value === 'string') {
+            this._value = value;
+        } else {
+            this._value = 'after'; // default
+        }
+        return this;
+    },
+
+    /**
+     * Processes tree node.
+     * @param {String} nodeType
+     * @param {node} node
+     */
+    process: function(nodeType, node) {
+        if (nodeType === 'property') {
+            if (node[node.length - 1][0] === 's') node.pop();
+            if (this._value === 'both' || this._value === 'before')
+                node.push(['s', ' ']);
+        }
+        if (nodeType === 'value') {
+            if (node[0][0] === 's') node.shift();
+            if (this._value === 'both' || this._value === 'after')
+                node.unshift(['s', ' ']);
+        }
+    }
+
+};

lib/options/stick-brace.js

@@ -0,0 +1,31 @@
+module.exports = {
+
+    _value: false,
+
+    /**
+     * Sets handler value.
+     *
+     * @param {String|Number|Boolean} value Option value
+     * @returns {Object}
+     */
+    setValue: function(value) {
+        if (!value) return this;
+        if (value === true) value = ' '; // 1 space by default
+        if (typeof value === 'number') this._value = new Array(Math.round(value) + 1).join(' ');
+        if (typeof value === 'string' && value.match(/^[ \t\n]*$/)) this._value = value;
+        return this;
+    },
+
+    /**
+     * Processes tree node.
+     * @param {String} nodeType
+     * @param {node} node
+     */
+    process: function(nodeType, node) {
+        if (nodeType === 'simpleselector') {
+            if (node[node.length - 1][0] === 's') node.pop();
+            node.push(['s', this._value]);
+        }
+    }
+
+};

lib/rules/strip-spaces.js lib/options/strip-spaces.jslib/rules/strip-spaces.js renamed to lib/options/strip-spaces.js

@@ -2,6 +2,17 @@ module.exports = {
 
     value: false,
 
+    /**
+     * Sets handler value.
+     *
+     * @param {String|Boolean} value Option value
+     * @returns {Object}
+     */
+    setValue: function(value) {
+        this._value = Boolean(value);
+        return this;
+    },
+
     /**
      * Processes tree node.
      * @param {String} nodeType

package.json

@@ -1,10 +1,10 @@
 {
     "name": "csscomb",
     "description": "Tool for beautify CSS",
-    "version": "0.0.2",
+    "version": "0.0.3",
     "homepage": "http://csscomb.com/",
     "author": "Mikhail Troshev <mishanga@yandex-team.ru>",
-    "repository": "https://github.com/mishanga/csscomb.js",
+    "repository": "https://github.com/csscomb/csscomb.js",
     "contributors": [
         {
             "name": "Slava Oliyanchuk",
@@ -18,7 +18,7 @@
         }
     ],
     "engines": {
-        "node": ">= 0.8.0"
+        "node": "0.8 | 0.10"
     },
     "dependencies": {
         "commander": "1.1.1",

test/test.css

@@ -45,9 +45,10 @@ div {
     }
 
     a{
-top:0;/* ololo */margin:0;}
-    b{
-top:0/* trololo */;margin:0;}
+top: 0;/* ololo */margin :0;}
+    b
+        {
+top :0/* trololo */;margin : 0;}