v0.0.12

Author: mishanga

.csscomb.json

@@ -8,6 +8,7 @@
     "colon-space": true,
     "color-case": "lower",
     "color-shorthand": true,
+    "combinator-space": true,
     "element-case": "lower",
     "leading-zero": false,
     "rule-indent": true,
@@ -174,7 +175,6 @@
             "-ms-animation-iteration-count",
             "-o-animation-iteration-count",
             "animation-iteration-count",
-            "animation-iteration-count",
             "-webkit-animation-direction",
             "-moz-animation-direction",
             "-ms-animation-direction",
@@ -195,7 +195,6 @@
             "text-indent",
             "-ms-text-justify",
             "text-justify",
-            "text-transform",
             "letter-spacing",
             "word-spacing",
             "-ms-writing-mode",
@@ -225,7 +224,6 @@
             "-ms-interpolation-mode",
             "color",
             "border",
-            "border-collapse",
             "border-width",
             "border-style",
             "border-color",

.gitignore

@@ -1 +1,4 @@
 node_modules
+
+.idea
+*.iml

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.0.12 - 2013-09-11
+- Option: combinator-space
+- Readme update
+- Some CLI fixes
+- Contributor added: @anton-rudeshko
+
 ## 0.0.11 - 2013-09-10
 - Option: element-case
 - Fixed block-indent bug with space after at-rule opening brace

CONTRIBUTE.md

@@ -28,7 +28,9 @@ git checkout -b <topic-branch-name>
 4. Patches and features will not be accepted without tests.
    Run `npm test` to check that all tests pass after you've made changes.
 
-5. Locally rebase the upstream development branch into your topic branch:
+5. Update the `README.md` if there were corresponding changes or new options.
+
+6. Locally rebase the upstream development branch into your topic branch:
 ```bash
 git pull --rebase upstream dev
 ```
@@ -38,7 +40,7 @@ git pull --rebase upstream dev
 git push origin <topic-branch-name>
 ```
 
-8. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/) with a clear title and description.
+8. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/) to a `dev` branch with a clear title and description.
 
 <a name="maintainers"></a>
 ## Maintainers

README.md

@@ -1,4 +1,5 @@
-# CSSCOMB [![Build Status](https://secure.travis-ci.org/csscomb/csscomb.js.png?branch=master)](http://travis-ci.org/csscomb/csscomb.js)
+# CSSComb [![CSSComb](logo.png)](http://csscomb.com/)
+[![Build Status](https://secure.travis-ci.org/csscomb/csscomb.js.png?branch=master)](http://travis-ci.org/csscomb/csscomb.js)
 
 CSSComb is a coding style formatter for CSS.
 You can easily write your own [configuration](#configuration) to make your style sheets beautiful and consistent.
@@ -164,6 +165,44 @@ b { color: #ffcc00 }
 b { color: #fc0 }
 ```
 
+### combinator-space
+
+Available values:
+  * `{Boolean}`: `true` sets one space, `false` removes the spaces.
+  * `{String}`: any combination of whitespaces.
+  * `{Array}` with two `{String}` values: for setting left and right whitespace.
+
+Example: `{ "combinator-space": true }`
+
+```css
+/* before */
+a>b { color: red }
+
+/* after */
+a > b { color: red }
+```
+
+Example: `{ "combinator-space": "" }`
+
+```css
+/* before */
+a > b { color: red }
+
+/* after */
+a>b { color: red }
+```
+
+Example: `{ "combinator-space": [" ", "\n"] }`
+
+```css
+/* before */
+a>b { color: red }
+
+/* after */
+a >
+b { color: red }
+```
+
 ### element-case
 
 Available values: `{String}` `lower` or `upper`
@@ -281,8 +320,8 @@ Available value: `{Boolean}` true
 
 Example: `{ "strip-spaces": true }`
 
-Before:
-```a { color: red } \nb { font-weight: normal }\n\n\n`
+Before: `a { color: red } \nb { font-weight: normal }\n\n\n`
+
 After: `a { color: red }\nb { font-weight: normal }\n`
 
 ### unitless-zero
@@ -318,7 +357,8 @@ Thanks for assistance and contributions:
 [@puzankov](https://github.com/puzankov),
 [@L0stSoul](https://github.com/L0stSoul),
 [@ignovak](https://github.com/ignovak),
-[@kizu](https://github.com/kizu)
+[@kizu](https://github.com/kizu),
+[@anton-rudeshko](https://github.com/anton-rudeshko)
 
 ## License
 

lib/cli.js

@@ -1,5 +1,5 @@
 /**
- * Command line implementation for CSScomb
+ * Command line implementation for CSSComb
  *
  * Usage example:
  * ./node_modules/.bin/csscomb file1 [dir1 [fileN [dirN]]]
@@ -15,19 +15,22 @@ program
     .option('-c, --config [path]', 'configuration file path')
     .parse(process.argv);
 
-var comb = new Comb();
+if (!program.args.length) {
+    console.log('No input paths specified');
+    program.help();
+}
+
 var configPath = program.config || (process.cwd() + '/.csscomb.json');
 
 if (fs.existsSync(configPath)) {
+    var comb = new Comb();
     comb.configure(require(configPath));
-    if (program.args.length > 0) {
-        vow.all(program.args.map(function(path) {
-            return comb.processPath(path);
-        })).fail(function(e) {
-            console.log('stack: ', e.stack);
-            process.exit(1);
-        });
-    }
+    vow.all(program.args.map(function(path) {
+        return comb.processPath(path);
+    })).fail(function(e) {
+        console.log('stack: ', e.stack);
+        process.exit(1);
+    });
 } else {
     console.log('Configuration file ' + configPath + ' was not found.');
     process.exit(1);

lib/csscomb.js

@@ -6,10 +6,10 @@ var vfs = require('vow-fs');
 /**
  * Starts Code Style processing process.
  *
+ * @constructor
  * @name Comb
  */
 var Comb = function() {
-    this._handlers;
     this._options = [
         'always-semicolon',
         'color-case',
@@ -19,12 +19,12 @@ var Comb = function() {
         'strip-spaces',
         'stick-brace',
         'colon-space',
+        'combinator-space',
         'rule-indent',
         'block-indent',
         'unitless-zero',
         'sort-order'
     ];
-    this._config = {};
     this._exclude = null;
 };
 
@@ -37,17 +37,18 @@ Comb.prototype = {
      * @param {Object} config
      */
     configure: function(config) {
-        var _this = this;
         this._handlers = [];
         this._options.forEach(function(option) {
-            if (config[option] !== undefined) {
-                try {
-                    var handler = require('./options/' + option).setValue(config[option]);
-                    handler && _this._handlers.push(handler);
-                } catch (e) {
-                }
+            if (typeof config[option] === 'undefined') return;
+
+            try {
+                var handler = require('./options/' + option).setValue(config[option]);
+                handler && this._handlers.push(handler);
+            } catch (e) {
+                console.warn('Error loading "%s" handler: %s', option, e.message);
             }
-        });
+        }, this);
+
         this._exclude = (config.exclude || []).map(function(pattern) {
             return new minimatch.Minimatch(pattern);
         });
@@ -151,7 +152,7 @@ Comb.prototype = {
     },
 
     /**
-     * Processs directory or file.
+     * Process directory or file.
      *
      * @param {String} path
      */
@@ -177,7 +178,7 @@ Comb.prototype = {
     },
 
     /**
-     * Returns true if specified path is not in exluded list.
+     * Returns true if specified path is not in excluded list.
      *
      * @returns {Boolean}
      */

lib/options/combinator-space.js

@@ -0,0 +1,50 @@
+module.exports = {
+
+    /**
+     * Sets handler value.
+     *
+     * @param {String|Boolean|Array} value Option value
+     * @returns {Object}
+     */
+    setValue: function(value) {
+        this._value = false;
+        if (value === true) value = ' ';
+        if (value === false) value = '';
+        if (typeof value === 'string' && value.match(/^[ \t\n]*$/)) {
+            this._value = [value, value];
+        }
+        if (value.constructor === Array) this._value = value;
+        if (!this._value) return;
+        return this;
+    },
+
+    /**
+     * Processes tree node.
+     * @param {String} nodeType
+     * @param {node} node
+     */
+    process: function(nodeType, node) {
+        if (nodeType === 'selector') {
+            for (var i = node.length; i--;) {
+                var subSelector = node[i];
+                for (var j = subSelector.length; j--;) {
+                    if (subSelector[j][0] === 'combinator') {
+                        // Working with the whitespace after the combinator
+                        if (subSelector[j + 1][0] === 's') {
+                            subSelector[j + 1][1] = this._value[1];
+                        } else {
+                            subSelector.splice(j + 1, 0, ['s', this._value[1]]);
+                        }
+                        // Working with the whitespace before the combinator
+                        if (subSelector[j - 1][0] === 's') {
+                            subSelector[j - 1][1] = this._value[0];
+                        } else {
+                            subSelector.splice(j, 0, ['s', this._value[0]]);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+};

logo.png

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