csso-rails 0.0.2 → 0.0.3

data/.gitignore

@@ -4,3 +4,6 @@
 *.rbc
 .yardoc
 Gemfile.lock
+tmp
+.DS_Store
+

data/README.md

@@ -1,6 +1,6 @@
 # csso-rails: Stylesheet Optimizer (CSSO) for Rails Asset pipeline
 
-Ruby adapter for [github.com/afelix/csso](https://github.com/afelix/csso).
+Ruby adapter for [github.com/css/csso](https://github.com/css/csso).
 
 ## About
 CSSO does structure-optimization for CSS.

data/lib/csso/js/compressor.js

@@ -40,13 +40,14 @@ TRBL.prototype.impSum = function() {
 
 TRBL.prototype.add = function(name, sValue, tValue, imp) {
     var s = this.sides,
+        currentSide,
         i, x, side, a = [], last,
         imp = imp ? 1 : 0,
         wasUnary = false;
     if ((i = name.lastIndexOf('-')) !== -1) {
         side = name.substr(i + 1);
         if (side in s) {
-            if (!s[side]) {
+            if (!(currentSide = s[side]) || (imp && !currentSide.imp)) {
                 s[side] = { s: imp ? sValue.substring(0, sValue.length - 10) : sValue, t: [tValue[0]], imp: imp };
                 if (tValue[0][1] === 'unary') s[side].t.push(tValue[1]);
             }
@@ -145,7 +146,7 @@ TRBL.prototype.getValue = function() {
     }
     r = r.concat(a[i].t);
 
-    if (this.imp) r.push([{ s: '!important'}, 'important']);
+    if (this.impSum()) r.push([{ s: '!important'}, 'important']);
 
     return r;
 };
@@ -407,18 +408,21 @@ CSSOCompressor.prototype.process = function(rules, token, container, i, path) {
 };
 
 CSSOCompressor.prototype.compress = function(tree, ro) {
+    tree = tree || ['stylesheet'];
     this.init();
-    this.info = typeof tree[0] !== 'string';
+    this.info = true;
 
-    var x = this.info ? tree : this.injectInfo([tree])[0],
+    var x = (typeof tree[0] !== 'string') ? tree : this.injectInfo([tree])[0],
         l0, l1 = 100000000000, ls,
-        x0, x1, xs;
+        x0, x1, xs,
+        protectedComment = this.findProtectedComment(tree);
 
     // compression without restructure
     x = this.walk(this.ccrules, x, '/0');
     x = this.walk(this.crules, x, '/0');
     x = this.walk(this.prules, x, '/0');
     x = this.walk(this.frrules, x, '/0');
+
     ls = translator.translate(cleanInfo(x)).length;
 
     if (!ro) { // restructure ON
@@ -442,7 +446,18 @@ CSSOCompressor.prototype.compress = function(tree, ro) {
 
     x = this.walk(this.frules, x, '/0');
 
-    return this.info ? x : cleanInfo(x);
+    if (protectedComment) x.splice(2, 0, protectedComment);
+
+    return x;
+};
+
+CSSOCompressor.prototype.findProtectedComment = function(tree) {
+    var token;
+    for (var i = 2; i < tree.length; i++) {
+        token = tree[i];
+        if (token[1] === 'comment' && token[2].length > 0 && token[2].charAt(0) === '!') return token;
+        if (token[1] !== 's') return;
+    }
 };
 
 CSSOCompressor.prototype.injectInfo = function(token) {
@@ -487,6 +502,7 @@ CSSOCompressor.prototype.walk = function(rules, container, path) {
     for (var i = container.length - 1; i > -1; i--) {
         t = container[i];
         if (t && Array.isArray(t)) {
+            t[0].parent = container;
             if (this.isContainer(t)) t = this.walk(rules, t, path + '/' + i); // go inside
             if (t === null) container.splice(i, 1);
             else {
@@ -754,6 +770,12 @@ CSSOCompressor.prototype.compressNumber = function(token, rule, container, i) {
     return token;
 };
 
+CSSOCompressor.prototype.findDeclaration = function(token) {
+    var parent = token;
+    while ((parent = parent[0].parent) && parent[1] !== 'declaration');
+    return parent;
+};
+
 CSSOCompressor.prototype.cleanUnary = function(token, rule, container, i) {
     var next = container[i + 1];
     if (next && next[1] === 'number' && next[2] === '0') return null;
@@ -829,7 +851,15 @@ CSSOCompressor.prototype.compressFunctionColor = function(token) {
 };
 
 CSSOCompressor.prototype.compressDimension = function(token) {
-    if (token[2][2] === '0') return token[2];
+    var declaration;
+    if (token[2][2] === '0') {
+        if (token[3][2] === 's' && (declaration = this.findDeclaration(token))) {
+            var declName = declaration[2][2][2];
+            if  (declName === '-moz-transition') return; // https://github.com/css/csso/issues/82
+            if  (declName === '-moz-animation' || declName === 'animation') return; // https://github.com/css/csso/issues/100
+        }
+        return token[2];
+    }
 };
 
 CSSOCompressor.prototype.compressString = function(token, rule, container) {
@@ -954,14 +984,13 @@ CSSOCompressor.prototype.markShorthands = function(token, rule, container, j, pa
             x[0].id = path + '/' + i;
             if (p in TRBL.props) {
                 key = pre + TRBL.extractMain(p);
-
                 var shorts = this.shorts2[key] || [];
                 shortsI = shorts.length === 0 ? 0 : shorts.length - 1;
 
                 if (!this.lastShortSelector || selector === this.lastShortSelector || shortGroupID === this.lastShortGroupID) {
                     if (shorts.length) {
                         sh = shorts[shortsI];
-                        if (imp && !sh.imp) sh.invalid = true;
+                        //if (imp && !sh.imp) sh.invalid = true;
                         createNew = false;
                     }
                 }
@@ -1077,9 +1106,11 @@ CSSOCompressor.prototype.buildPPre = function(pre, p, v, d, freeze) {
             0, // hsl
             0, // hsla
             0  // rgba
-        ];
+        ],
+        vID = '';
 
     for (var i = 0; i < _v.length; i++) {
+        if (!vID) vID = this.getVendorIDFromToken(_v[i]);
         switch(_v[i][1]) {
             case 'vhash':
             case 'ident':
@@ -1099,7 +1130,38 @@ CSSOCompressor.prototype.buildPPre = function(pre, p, v, d, freeze) {
         }
     }
 
-    return fp + pre + p + colorMark.join('');
+    return fp + pre + p + colorMark.join('') + (vID ? vID : '');
+};
+
+CSSOCompressor.prototype.vendorID = {
+    '-o-': 'o',
+    '-moz-': 'm',
+    '-webkit-': 'w',
+    '-ms-': 'i',
+    '-epub-': 'e',
+    '-apple-': 'a',
+    '-xv-': 'x',
+    '-wap-': 'p'
+};
+
+CSSOCompressor.prototype.getVendorIDFromToken = function(token) {
+    var vID;
+    switch(token[1]) {
+        case 'ident':
+            if (vID = this.getVendorFromString(token[2])) return this.vendorID[vID];
+            break;
+        case 'funktion':
+            if (vID = this.getVendorFromString(token[2][2])) return this.vendorID[vID];
+            break;
+    }
+};
+
+CSSOCompressor.prototype.getVendorFromString = function(string) {
+    var vendor = string.charAt(0), i;
+    if (vendor === '-') {
+        if ((i = string.indexOf('-', 2)) !== -1) return string.substr(0, i + 1);
+    } 
+    return '';
 };
 
 CSSOCompressor.prototype.deleteProperty = function(block, id) {
@@ -1159,17 +1221,13 @@ CSSOCompressor.prototype.needless = function(name, props, pre, imp, v, d, freeze
         name = name.substr(2);
     } else hack = '';
 
-    var vendor = name.charAt(0), i;
-    if (vendor === '-') {
-        if ((i = name.indexOf('-', 2)) !== -1) vendor = name.substr(0, i + 1);
-    } else vendor = '';
-
-    var prop = name.substr(vendor.length),
+    var vendor = this.getVendorFromString(name),
+        prop = name.substr(vendor.length),
         x, t, ppre;
 
     if (prop in this.nlTable) {
         x = this.nlTable[prop];
-        for (i = 0; i < x.length; i++) {
+        for (var i = 0; i < x.length; i++) {
             ppre = this.buildPPre(pre, hack + vendor + x[i], v, d, freeze);
             if (t = props[ppre]) return (!imp || t.imp);
         }

data/lib/csso/js/csso.js

@@ -29,10 +29,10 @@ if (single && single.contains(['-v', '--version'])) {
 } else {
     src = fs.readFileSync(inFile).toString().trim();
 
-    if (single.contains(['-dp', '--parser'])) csso.printTree(csso.cleanInfo(csso.parse(src, rule)));
+    if (single.contains(['-dp', '--parser'])) csso.printTree(csso.cleanInfo(csso.parse(src, rule, true)));
     else {
-        if (!outFile) print(csso.justDoIt(src, ro));
-        else fs.writeFileSync(outFile, csso.justDoIt(src, ro));
+        if (!outFile) print(csso.justDoIt(src, ro, true));
+        else fs.writeFileSync(outFile, csso.justDoIt(src, ro, true));
     }
 }
 

data/lib/csso/js/cssoapi.js

@@ -1,9 +1,11 @@
 var util = require('./util.js'),
-    parser = require('./parser.js'),
+    gonzales = require('./gonzales.cssp.node.js'),
     translator = require('./translator.js'),
     compressor = require('./compressor.js');
 
-var parse = exports.parse = parser.parse;
+var parse = exports.parse = function(s, rule, needInfo) {
+    return gonzales.srcToCSSP(s, rule, needInfo);
+};
 
 var cleanInfo = exports.cleanInfo = util.cleanInfo;
 
@@ -15,6 +17,6 @@ var translate = exports.translate = translator.translate;
 
 var compress = exports.compress = compressor.compress;
 
-exports.justDoIt = function(src, ro) {
-    return translate(cleanInfo(compress(parse(src, 'stylesheet'), ro)));
+exports.justDoIt = function(src, ro, needInfo) {
+    return translate(cleanInfo(compress(parse(src, 'stylesheet', needInfo), ro)));
 };