csso-rails 0.0.1 → 0.0.2

data/README.md

@@ -1,36 +1,59 @@
-csso-rails: Stylesheet Optimizer(CSSO) for Rails Asset pipeline
-=======
+# csso-rails: Stylesheet Optimizer (CSSO) for Rails Asset pipeline
 
-Ruby adapter for <https://github.com/afelix/csso>
+Ruby adapter for [github.com/afelix/csso](https://github.com/afelix/csso).
 
-about
------
-  CSSO does structure-optimization for css.
-  (readme and tests/comparison - coming later)
-  Css is usually reduced more that in half in uncompressed and around 15% in gzipped.
+## About
+CSSO does structure-optimization for CSS.
+CSS is usually reduced more than in half in uncompressed and around 15% in gzipped.
 
-usage
-------
+### A Real-World Example
+A living rails application CSS – some written in less, some handwritten):
 
-From ruby:
-  require 'csso'
-  Csso.optimize("a{ color: #FF0000; }")
-  # produces "a{color:red}"
+|        | Original     |  sass  | yui 2.4.7  | csso  | % of original
+|:-------|:------------:|:------:|:-----:|:-----:|:------:
+|Plain   | 129497       | 107006 | 60758 | 60874 | 47%
+|GZipped | 14046        | 12047  | 10558 | 10472 | 74%
 
-In Rails 3.1+:  
-  add this gem to your gemfile, and that's it!
-  gem 'csso-rails', :git => ''
-  Upon including it becomes the default compressor,
-  More explicit way - set in config: config.assets.css_compressor = :csso
+Very close to yui compressor, wining in gzipped (you’re using nginx `mod\_gzip_static`, don’t you?)
 
-In command line:
-  ruby_csso non_optimized.css > optimized.css
+A more hard example – twitter bootstrap.css, already minified:
 
+|        | Original     | lessc | yui 2.4.7  | csso  | % of original
+|:-------|:------------:|:-----:|:-----:|:-----:|:------:
+|Plain   | 81443        | 71520 | 68755 | 67679 | 83%
+|GZipped | 12384        | 11633 | 11652 | 11477 | 92%
 
-MIT-License
--------
+Please note than benchmark was taken in summer of 2012, since then things may have changed.
 
-> Original CSSO code - Copyright (C) 2011 by Sergey Kryzhanovsky
+## Usage
+
+### In Rails 3.1+
+add `gem 'csso-rails'` to your gemfile, and that’s it!
+
+Upon including it becomes the default compressor even if sass is included too.
+More explicit way – set in config: `config.assets.css_compressor = :csso`.
+
+
+### In Plain Ruby
+
+```ruby
+ require 'rubygems'
+ gem 'csso-rails'
+ require 'csso'
+ puts Csso.optimize("a{ color: #FF0000; }") # produces "a{color:red}"
+```
+
+In _maniac mode_(`Csso.optimize(css, true)`, default for pipeline) CSS is processed several times until it stops getting lighter (there're cases when original csso does not do all optimizations for no reason).
+
+### In Command Line
+
+    ruby_csso non_optimized.css > optimized.css
+
+
+## MIT-License
+
+> Original CSSO code - Copyright (C) 2011 by Sergey Kryzhanovsky.
+>
 > ruby gem - Copyright(C) 2012 Vasily Fedoseyev
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -49,4 +72,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.

data/bin/ruby_csso

@@ -20,6 +20,6 @@ if ($stdin.tty? && ARGV.empty?) || ARGV.delete('-h') || ARGV.delete('--help')
 else
   # Well, lets read those files
   css = ARGF.read
-  
+
   puts Csso.optimize(css, maniac)
-end
+end

data/csso-rails.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "therubyracer", "~> 0.9.9"
+  s.add_dependency "therubyracer", ">= 0.10.2"
   s.add_dependency "commonjs", "~> 0.2.0"
 
   s.add_development_dependency "rake"

data/lib/csso-rails.rb

@@ -3,5 +3,5 @@ require 'csso'
 if defined?(Rails)
   require 'csso/rails'
 else
-  require 'csso'  
+  require 'csso'
 end

data/lib/csso.rb

@@ -25,11 +25,11 @@ module Csso
       Optimizer.new.optimize(css, structural_optimization)
     end
   end
-  
-  
+
+
   class Optimizer
     include CallJS
-    
+
     def optimize(css, structural_optimization=true)
       return nil unless css.is_a?(String)
       return css if css.size <= 3
@@ -38,5 +38,5 @@ module Csso
       end
     end
   end
-  
-end
+
+end

data/lib/csso/js/compressor.js

@@ -163,11 +163,14 @@ TRBL.prototype.getString = function() {
 
     return r;
 };
+
 function CSSOCompressor() {}
 
 CSSOCompressor.prototype.init = function() {
     this.props = {};
     this.shorts = {};
+    this.shorts2 = {};
+
     this.ccrules = {}; // clean comment rules — special case to resolve ambiguity
     this.crules = {}; // compress rules
     this.prules = {}; // prepare rules
@@ -189,6 +192,10 @@ CSSOCompressor.prototype.init = function() {
     this.initRules(this.rjrules, this.defRJCfg);
     this.initRules(this.rrrules, this.defRRCfg);
     this.initRules(this.frules, this.defFCfg);
+
+    this.shortGroupID = 0;
+    this.lastShortGroupID = 0;
+    this.lastShortSelector = 0;
 };
 
 CSSOCompressor.prototype.initRules = function(r, cfg) {
@@ -216,6 +223,7 @@ CSSOCompressor.prototype.defCCfg = {
     'cleanWhitespace': 1,
     'cleanDecldelim': 1,
     'compressNumber': 1,
+    'cleanUnary': 1,
     'compressColor': 1,
     'compressDimension': 1,
     'compressString': 1,
@@ -269,6 +277,7 @@ CSSOCompressor.prototype.order = [
     'cleanComment',
     'cleanWhitespace',
     'compressNumber',
+    'cleanUnary',
     'compressColor',
     'compressDimension',
     'compressString',
@@ -301,6 +310,9 @@ CSSOCompressor.prototype.profile = {
     'compressNumber': {
         'number': 1
     },
+    'cleanUnary': {
+        'unary': 1
+    },
     'compressColor': {
         'vhash': 1,
         'funktion': 1,
@@ -411,6 +423,7 @@ CSSOCompressor.prototype.compress = function(tree, ro) {
 
     if (!ro) { // restructure ON
         xs = this.copyArray(x);
+        x = this.walk(this.rjrules, x, '/0');
         this.disjoin(x);
         x = this.walk(this.msrules, x, '/0');
         x = this.walk(this.csrules, x, '/0');
@@ -446,10 +459,12 @@ CSSOCompressor.prototype.injectInfo = function(token) {
 
 CSSOCompressor.prototype.disjoin = function(container) {
     var t, s, r, sr;
+
     for (var i = container.length - 1; i > -1; i--) {
         t = container[i];
         if (t && Array.isArray(t)) {
             if (t[1] === 'ruleset') {
+                t[0].shortGroupID = this.shortGroupID++;
                 s = t[2];
                 if (s.length > 3) {
                     sr = s.slice(0, 2);
@@ -726,7 +741,7 @@ CSSOCompressor.prototype.cleanDecldelim = function(token) {
     return token;
 };
 
-CSSOCompressor.prototype.compressNumber = function(token) {
+CSSOCompressor.prototype.compressNumber = function(token, rule, container, i) {
     var x = token[2];
 
     if (/^0*/.test(x)) x = x.replace(/^0+/, '');
@@ -739,6 +754,12 @@ CSSOCompressor.prototype.compressNumber = function(token) {
     return token;
 };
 
+CSSOCompressor.prototype.cleanUnary = function(token, rule, container, i) {
+    var next = container[i + 1];
+    if (next && next[1] === 'number' && next[2] === '0') return null;
+    return token;
+};
+
 CSSOCompressor.prototype.compressColor = function(token, rule, container, i) {
     switch(rule) {
         case 'vhash':
@@ -818,9 +839,9 @@ CSSOCompressor.prototype.compressString = function(token, rule, container) {
         if (c === '\\' && s.charAt(i + 1) === '\n') i++;
         else r += c;
     }
-    if (container[1] === 'attrib' && /^('|")[a-zA-Z0-9]*('|")$/.test(r)) {
-        r = r.substring(1, r.length - 1);
-    }
+//    if (container[1] === 'attrib' && /^('|")[a-zA-Z0-9]*('|")$/.test(r)) {
+//        r = r.substring(1, r.length - 1);
+//    }
     if (s.length !== r.length) return [{}, 'string', r];
 };
 
@@ -919,10 +940,12 @@ CSSOCompressor.prototype.markShorthands = function(token, rule, container, j, pa
             freeze = false,
             freezeID = 'fake';
     }
-    var x, p, v, imp, s, key,
-        pre = this.pathUp(path) + '/' + (freeze ? '&' + freezeID + '&' : '') + selector + '/';
+    var x, p, v, imp, s, key, sh,
+        pre = this.pathUp(path) + '/' + (freeze ? '&' + freezeID + '&' : '') + selector + '/',
+        createNew, shortsI, shortGroupID = container[0].shortGroupID;
 
     for (var i = token.length - 1; i > -1; i--) {
+        createNew = true;
         x = token[i];
         if (x[1] === 'declaration') {
             v = x[3];
@@ -931,30 +954,48 @@ CSSOCompressor.prototype.markShorthands = function(token, rule, container, j, pa
             x[0].id = path + '/' + i;
             if (p in TRBL.props) {
                 key = pre + TRBL.extractMain(p);
-                if (s = this.shorts[key]) {
-                    if (imp && !s.imp) s.invalid = true;
-                } else {
-                    s = new TRBL(p, imp);
+
+                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;
+                        createNew = false;
+                    }
+                }
+
+                if (createNew) {
                     x[0].replaceByShort = true;
-                    x[0].shorthandKey = key;
+                    x[0].shorthandKey = { key: key, i: shortsI };
+                    sh = new TRBL(p, imp);
+                    shorts.push(sh);
                 }
-                if (!s.invalid) {
-                    s.add(p, v[0].s, v.slice(2), imp);
-                    this.shorts[key] = s;
+
+                if (!sh.invalid) {
                     x[0].removeByShort = true;
-                    x[0].shorthandKey = key;
+                    x[0].shorthandKey = { key: key, i: shortsI };
+                    sh.add(p, v[0].s, v.slice(2), imp);
                 }
+
+                this.shorts2[key] = shorts;
+
+                this.lastShortSelector = selector;
+                this.lastShortGroupID = shortGroupID;
             }
         }
     }
+
+
     return token;
 };
 
 CSSOCompressor.prototype.cleanShorthands = function(token) {
     if (token[0].removeByShort || token[0].replaceByShort) {
-        var s, t;
+        var s, t, sKey = token[0].shorthandKey;
 
-        s = this.shorts[token[0].shorthandKey];
+        s = this.shorts2[sKey.key][sKey.i];
 
         if (!s.invalid && s.isOkToMinimize()) {
             if (token[0].replaceByShort) {
@@ -966,6 +1007,12 @@ CSSOCompressor.prototype.cleanShorthands = function(token) {
     }
 };
 
+CSSOCompressor.prototype.dontRestructure = {
+    'src': 1, // https://github.com/afelix/csso/issues/50
+    'clip': 1, // https://github.com/afelix/csso/issues/57
+    'display': 1 // https://github.com/afelix/csso/issues/71
+};
+
 CSSOCompressor.prototype.restructureBlock = function(token, rule, container, j, path) {
     if (container[1] === 'ruleset') {
         var props = this.props,
@@ -984,6 +1031,7 @@ CSSOCompressor.prototype.restructureBlock = function(token, rule, container, j,
             pseudoID = 'fake',
             sg = {};
     }
+
     var x, p, v, imp, t,
         pre = this.pathUp(path) + '/' + selector + '/',
         ppre;
@@ -996,7 +1044,7 @@ CSSOCompressor.prototype.restructureBlock = function(token, rule, container, j,
             p = x[2][0].s;
             ppre = this.buildPPre(pre, p, v, x, freeze);
             x[0].id = path + '/' + i;
-            if (p !== 'src' && (t = props[ppre])) { // see https://github.com/afelix/csso/issues/50 about 'src'
+            if (!this.dontRestructure[p] && (t = props[ppre])) {
                 if ((isPseudo && freezeID === t.freezeID) || // pseudo from equal selectors group
                     (!isPseudo && pseudoID === t.pseudoID) || // not pseudo from equal pseudo signature group
                     (isPseudo && pseudoID === t.pseudoID && this.hashInHash(sg, t.sg))) { // pseudo from covered selectors group
@@ -1105,7 +1153,7 @@ CSSOCompressor.prototype.nlTable = {
 
 CSSOCompressor.prototype.needless = function(name, props, pre, imp, v, d, freeze) {
     var hack = name.charAt(0);
-    if (hack === '*' || hack === '_') name = name.substr(1);
+    if (hack === '*' || hack === '_' || hack === '$') name = name.substr(1);
     else if (hack === '/' && name.charAt(1) === '/') {
         hack = '//';
         name = name.substr(2);
@@ -1118,6 +1166,7 @@ CSSOCompressor.prototype.needless = function(name, props, pre, imp, v, d, freeze
 
     var prop = name.substr(vendor.length),
         x, t, ppre;
+
     if (prop in this.nlTable) {
         x = this.nlTable[prop];
         for (i = 0; i < x.length; i++) {
@@ -1138,9 +1187,11 @@ CSSOCompressor.prototype.rejoinRuleset = function(token, rule, container, i) {
     if (!tb.length) return null;
 
     if (ps.length && pb.length) {
+        if (token[1] !== p[1]) return;
         // try to join by selectors
         ph = this.getHash(ps);
         th = this.getHash(ts);
+
         if (this.equalHash(th, ph)) {
             p[3] = p[3].concat(token[3].splice(2));
             return null;
@@ -1203,8 +1254,10 @@ CSSOCompressor.prototype.restructureRuleset = function(token, rule, container, i
     if (!tb.length) return null;
 
     if (ps.length && pb.length) {
+        if (token[1] !== p[1]) return;
         // try to join by properties
         r = this.analyze(token, p);
+
         if (r.eq.length && (r.ne1.length || r.ne2.length)) {
             if (r.ne1.length && !r.ne2.length) { // p in token
                 var ns = token[2].slice(2), // TODO: copypaste
@@ -1275,9 +1328,12 @@ CSSOCompressor.prototype.cleanSelector = function(token) {
 };
 
 CSSOCompressor.prototype.analyze = function(r1, r2) {
+    var r = { eq: [], ne1: [], ne2: [] };
+
+    if (r1[1] !== r2[1]) return r;
+
     var b1 = r1[3], b2 = r2[3],
         d1 = b1.slice(2), d2 = b2.slice(2),
-        r = { eq: [], ne1: [], ne2: [] },
         h1, h2, i, x;
 
     h1 = this.getHash(d1);

data/lib/csso/js/csso.js

@@ -0,0 +1,70 @@
+var fs = require('fs'),
+    print = require('util').print,
+    csso = require('./cssoapi.js'),
+    src, x;
+
+var args = process.argv.slice(2),
+    opts = args.length ? getOpts(args, [
+            '-v', '--version',
+            '-h', '--help',
+            '-dp', '--parser',
+            '-off', '--restructure-off'
+           ], [
+            '-r', '--rule',
+            '-i', '--input',
+            '-o', '--output'
+           ]) : null,
+    single = opts && opts.single,
+    pairs = opts && opts.pairs,
+    other = opts && opts.other,
+    ro = single && single.contains(['-off', '--restructure-off']),
+    inFile = (pairs && (pairs['-i'] || pairs['--input'])) || (other && other[0]),
+    outFile = (pairs && (pairs['-o'] || pairs['--output'])) || (other && other[1]),
+    rule = pairs && (pairs['-r'] || pairs['--rule']) || 'stylesheet';
+
+if (single && single.contains(['-v', '--version'])) {
+    printFile('VERSION');
+} else if (!inFile || !opts || (single && single.contains(['-h', '--help'])) || other.length > 2) {
+    printFile('USAGE');
+} else {
+    src = fs.readFileSync(inFile).toString().trim();
+
+    if (single.contains(['-dp', '--parser'])) csso.printTree(csso.cleanInfo(csso.parse(src, rule)));
+    else {
+        if (!outFile) print(csso.justDoIt(src, ro));
+        else fs.writeFileSync(outFile, csso.justDoIt(src, ro));
+    }
+}
+
+// Utils
+
+function getOpts(argv, o_single, o_pairs) {
+    var opts = { single : [], pairs : {}, other : [] },
+        arg,
+        i = 0;
+
+    for (; i < argv.length;) {
+        arg = argv[i];
+        if (o_single && o_single.indexOf(arg) !== -1 && (!o_pairs || o_pairs.indexOf(arg) === -1)) {
+            opts.single.push(arg);
+        } else if (o_pairs && o_pairs.indexOf(arg) !== -1 && (!o_single || o_single.indexOf(arg) === -1)) {
+            opts.pairs[arg] = argv[++i];
+        } else opts.other.push(arg);
+        i++;
+    }
+
+    opts.single.contains = function(value) {
+        if (typeof value === 'string') {
+            return this.indexOf(value) !== -1;
+        } else {
+            for (var i = 0; i < value.length; i++) if (this.indexOf(value[i]) !== -1) return true;
+        }
+        return false;
+    };
+
+    return opts;
+}
+
+function printFile(filename) {
+    print(fs.readFileSync(__dirname.slice(0, __dirname.lastIndexOf('/')) + '/' + filename).toString());
+}

data/lib/csso/js/parser.js

@@ -502,7 +502,7 @@ CSSOParser.prototype.declaration = function() {
 };
 CSSOParser.prototype.filtern = function() {
     var _b_;
-    if (_b_ = this.$()._o('.-filter','._filter','.*filter','.-ms-filter','.filter')._()) {
+    if (_b_ = this.$()._o('.-filter','.$filter','._filter','.*filter','.-ms-filter','.filter')._()) {
         return [this._info(), 'ident', _b_[0]];
     }
 };
@@ -767,7 +767,7 @@ CSSOParser.prototype.mw = function() {
 CSSOParser.prototype.mnumber = function() {
     var s = this._src,
         sl = s.length,
-        f = this._gi() + 1, c, i,
+        f = this._gi() + 1, c, i, v = '',
         n0 = '', d = '', n1 = '';
     for (i = f; i < sl; i++) {
         c = s.charAt(i);
@@ -794,7 +794,7 @@ CSSOParser.prototype.mident = function() {
         f = this._gi() + 1, i = f, v = '', c, n;
     if (s.charAt(i) === '-') v = '-', i++; // special case
     c = s.charAt(i); n = s.charAt(i + 1);
-    if (/^[_a-zA-Z*]$/.test(c)) v += c; // first char
+    if (/^[_$a-zA-Z*]$/.test(c)) v += c; // first char
     else if (c === '\\') {
         v += c;
         if (n) v += n, i++;

data/lib/csso/loader.rb

@@ -20,13 +20,13 @@ module Csso
       @js_path = js_path || Pathname(__FILE__).dirname.join('js').to_s
       @cxt = V8::Context.new
       @environment = ModifiedEnvironment.new(@cxt, :path => @js_path)
-      
+
       [Util, Path, Fs].each do |native|
         @environment.native(native.to_s.downcase, native.new)
       end
-      
+
       [Process, Console].each do|replace|
-        @cxt[replace.to_s.downcase] = replace.new      
+        @cxt[replace.to_s.downcase] = replace.new
       end
     end
 
@@ -71,4 +71,4 @@ module Csso
       end
     end
   end
-end
+end

data/lib/csso/rails.rb

@@ -1,9 +1,9 @@
 require "action_controller/railtie"
 
 module Csso
-  
+
   COMPRESSOR_SYM = :csso
-  
+
   class Railtie < ::Rails::Railtie
     initializer "csso.environment", :after => "sprockets.environment" do
       CssCompressor.register
@@ -15,19 +15,19 @@ module Csso
         app.config.assets.css_compressor = :csso
       end
     end
-        
+
   end
-  
+
   class CssCompressor
     def compress(css)
       require 'csso'
       #TODO: settings?
       Csso.optimize(css, true)
-    end    
-    
+    end
+
     def self.register
       Sprockets::Compressors.register_css_compressor(COMPRESSOR_SYM, 'Csso::CssCompressor', :default => true)
     end
   end
-  
-end
+
+end

data/lib/csso/version.rb

@@ -1,3 +1,3 @@
 module Csso
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/spec/csso/csso_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Csso do
-  
+
   it "should optimize css" do
     subject.optimize("a  {\ncolor: white; }").should == "a{color:#fff}"
   end
@@ -9,20 +9,20 @@ describe Csso do
   it "should optimize structure" do
     subject.optimize("a  {\ncolor: white; } a{color: red;}").should == "a{color:red}"
   end
-  
+
   it "should optimize structure" do
     pending "original csso is a bit broken at the moment"
     # FIXME: csso produces "a{color:#fff;color:red}" on this :(
     subject.optimize("a  {\ncolor: white; } a{color: #ff0000;}").should == "a{color:red}"
   end
-  
+
   it "should optimize structure in maniac mode" do
     subject.optimize("a  {\ncolor: white; } a{color: #ff0000;}", true).should == "a{color:red}"
   end
-  
+
   it 'should produce no error on empty input' do
     subject.optimize(nil).should == nil
     subject.optimize("").should == ""
   end
-  
-end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csso-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-09 00:00:00.000000000Z
+date: 2013-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &70109118748280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: 0.10.2
   type: :runtime
   prerelease: false
-  version_requirements: *70109118748280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.2
 - !ruby/object:Gem::Dependency
   name: commonjs
-  requirement: &70109108381060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70109108381060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70109108380680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70109108380680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70109108380140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +69,12 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70109108380140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: Invoke the CSSO from Ruby
 email:
 - vasilyfedoseyev@gmail.com
@@ -74,6 +94,7 @@ files:
 - lib/csso-rails.rb
 - lib/csso.rb
 - lib/csso/js/compressor.js
+- lib/csso/js/csso.js
 - lib/csso/js/cssoapi.js
 - lib/csso/js/parser.js
 - lib/csso/js/translator.js
@@ -96,19 +117,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2273465511458410944
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2273465511458410944
 requirements: []
 rubyforge_project: csso-rails
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: CSS Stylesheet optimizer/compressor for Rails
 test_files:
 - spec/csso/csso_spec.rb
 - spec/spec_helper.rb
-has_rdoc: