csso-rails 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f348466dbf9fcc505bfac786253c5015f5b75e41
-  data.tar.gz: e6429cbdbe44a344e4913aee08b545eb8139bbc7
+  metadata.gz: 6cb8a4eb6367349f29c00704f908afde8f9d7fda
+  data.tar.gz: 4776678150e433ac596ae766e674006067e83b47
 SHA512:
-  metadata.gz: fc6c958f36d17d9e59894d9db0a2d987e0c7fd7a645a6edae72261412da36e6eb4f5420dac23fa59864f10ec9aeb3c5e51b6623cab7a03e28c9467cfd1dc31b2
-  data.tar.gz: 80b063cba7ed2f87b66575c98d33e6920f4756cea73d7aa7391aed09286ddf365f293370d8d013c2cc3f39f5bd7448f922ced6cbb9d9a013f6479cad10c7af09
+  metadata.gz: 1d270266a5098ec9771d77053ae1fb7368c607abf68b915b4e4a675291261501f5bcccf99c6f4158714f451fe558635cd0e0cd14725150915fb17253276402d6
+  data.tar.gz: 1985e583db9f94894a41654a923fed65958be938ced6b4b8e8d096fbc044c5b33edd55112ee7d1901585f65ab1ad5b129d77c411812064c0cf1e958e73a10015

data/Gemfile.lock

@@ -1,15 +1,15 @@
 PATH
   remote: .
   specs:
-    csso-rails (0.3.3)
+    csso-rails (0.3.4)
       execjs (>= 1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    execjs (2.0.1)
-    minitest (5.0.3)
-    rake (10.0.4)
+    execjs (2.0.2)
+    minitest (5.3.1)
+    rake (10.1.1)
 
 PLATFORMS
   ruby

data/lib/csso/version.rb

@@ -1,4 +1,4 @@
 module Csso
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
   CSSO_JS_LIB = 'vendor/csso/csso.js'
 end

data/vendor/csso/csso.js

@@ -2,7 +2,7 @@
  THIS FILE IS AUTOGENERATED! DO NOT EDIT!
  See lib/csso/csso.js.erb instead.
 
- Based on CSSO 1.3.10 revision ed443db03803fb9e04918e1c6307053c2a731160
+ Based on CSSO 1.3.11 revision b3268f562bd252091c6384a918d54d6759ba7fad
 */
 
 console = {
@@ -3022,7 +3022,7 @@ CSSOCompressor.prototype.cleanWhitespace = function(token, rule, container, i) {
 
     if (nr === 'unknown') token[2] = '\n';
     else {
-        if (!(container[1] === 'atrulerq' && !pr) && !this.issue16(container, i)) {
+        if (!(container[1] === 'atrulerq' && !pr) && !this.issue16(container, i) && !this.issue165(container, pr, nr)) {
             if (nr !== null && pr !== null) {
                 if (this._cleanWhitespace(nr, false) || this._cleanWhitespace(pr, true)) return null;
             } else return null;
@@ -3039,6 +3039,11 @@ CSSOCompressor.prototype.issue16 = function(container, i) {
     return (i !== 2 && i !== container.length - 1 && container[i - 1][1] === 'uri');
 };
 
+//See https://github.com/css/csso/issues/165
+CSSOCompressor.prototype.issue165 = function(container, pr, nr) {
+    return container[1] === 'atrulerq' && pr === 'braces' && nr === 'ident';
+};
+
 CSSOCompressor.prototype._cleanWhitespace = function(r, left) {
     switch(r) {
         case 's':
@@ -3159,11 +3164,26 @@ CSSOCompressor.prototype.compressFunctionColor = function(token) {
             if (t === 'number') v.push(body[i]);
             else if (t !== 'operator') { v = []; break }
         }
+
+        // check if color is followed by number
+        var parent = token[0].parent;
+        var parentIx = parent.indexOf(token);
+        var appendSpace = parent[parentIx + 1] && parent[parentIx + 1][1] != 's';
+
         if (v.length === 3) {
             h += (t = Number(v[0][2]).toString(16)).length === 1 ? '0' + t : t;
             h += (t = Number(v[1][2]).toString(16)).length === 1 ? '0' + t : t;
             h += (t = Number(v[2][2]).toString(16)).length === 1 ? '0' + t : t;
-            if (h.length === 6) return this._compressHashColor(h, {});
+            if (h.length === 6) {
+                var vhash = this._compressHashColor(h, {});
+                if (appendSpace) {
+                    // che: I guess this is not right: modify color token with
+                    // indentation, but I can't find any better solution right now
+                    vhash[2] += ' ';
+                }
+
+                return vhash;
+            }
         }
     }
 };
@@ -3171,9 +3191,9 @@ CSSOCompressor.prototype.compressFunctionColor = function(token) {
 CSSOCompressor.prototype.compressDimension = function(token) {
     var declaration;
     if (token[2][2] === '0') {
-        if (token[3][2] === 's' && (declaration = this.findDeclaration(token))) {
+        if ((token[3][2] === 's' || token[3][2] === 'ms') && (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-transition' || declName === 'transition') return; // https://github.com/css/csso/issues/82, also support recent Fx versions
             if  (declName === '-moz-animation' || declName === 'animation') return; // https://github.com/css/csso/issues/100
         }
         return token[2];

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: csso-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Vasily Fedoseyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-27 00:00:00.000000000 Z
+date: 2014-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Invoke the CSSO from Ruby
@@ -60,8 +60,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -88,17 +88,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: csso-rails
-rubygems_version: 2.0.14
+rubygems_version: 2.2.0.rc.1
 signing_key: 
 specification_version: 4
 summary: CSS Stylesheet optimizer/compressor for Rails