csso-rails 0.3.1 → 0.3.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    csso-rails (0.3.1)
+    csso-rails (0.3.2)
       execjs (>= 1)
 
 GEM

data/Rakefile

@@ -37,9 +37,17 @@ end
 directory 'vendor/csso'
 lib_template = 'lib/csso/csso.js.erb'
 file Csso::CSSO_JS_LIB => [lib_template, 'csso', 'vendor/csso', 'csso/.git/HEAD', 'csso/.git/refs/heads/master'] do
+  puts "Generating #{Csso::CSSO_JS_LIB}"
   `erb #{lib_template} > #{Csso::CSSO_JS_LIB}`
 end
 
 task :generate_files => [Csso::CSSO_JS_LIB]
 
+task :rm_generated do
+  puts "Removing #{Csso::CSSO_JS_LIB}"
+  `rm #{Csso::CSSO_JS_LIB}`
+end
+
+task :regenerate => [:rm_generated, :generate_files]
+
 task :build => :generate_files

data/csso-rails.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |s|
   s.homepage    = "https://github.com/Vasfed/csso-rails"
   s.summary     = %q{CSS Stylesheet optimizer/compressor for Rails}
   s.description = %q{Invoke the CSSO from Ruby}
+  s.license     = 'MIT'
 
   s.rubyforge_project = "csso-rails"
 

data/lib/csso/version.rb

@@ -1,4 +1,4 @@
 module Csso
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
   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.7 revision 115eabd536a6224b08a59a57c64e2fdecb0f1350
+ Based on CSSO 1.3.8 revision 7061510a0f2b896cd7899836889b91453c4c6e2a
 */
 
 console = {
@@ -2838,6 +2838,7 @@ CSSOCompressor.prototype.freezeRulesets = function(token, rule, container, i) {
     info.freeze = this.freezeNeeded(selector);
     info.freezeID = this.selectorSignature(selector);
     info.pseudoID = this.composePseudoID(selector);
+    info.pseudoSignature = this.pseudoSelectorSignature(selector, this.allowedPClasses, true);
     this.markSimplePseudo(selector);
 
     return token;
@@ -2892,7 +2893,7 @@ CSSOCompressor.prototype.selectorSignature = function(selector) {
     return a.join(',');
 };
 
-CSSOCompressor.prototype.pseudoSelectorSignature = function(selector, exclude) {
+CSSOCompressor.prototype.pseudoSelectorSignature = function(selector, exclude, dontAppendExcludeMark) {
     var a = [], b = {}, ss, wasExclude = false;
     exclude = exclude || {};
 
@@ -2914,7 +2915,7 @@ CSSOCompressor.prototype.pseudoSelectorSignature = function(selector, exclude) {
 
     a.sort();
 
-    return a.join(',') + wasExclude;
+    return a.join(',') + (dontAppendExcludeMark? '' : wasExclude);
 };
 
 CSSOCompressor.prototype.notFPClasses = {
@@ -3381,7 +3382,6 @@ CSSOCompressor.prototype.restructureBlock = function(token, rule, container, j,
     var x, p, v, imp, t,
         pre = this.pathUp(path) + '/' + selector + '/',
         ppre;
-
     for (var i = token.length - 1; i > -1; i--) {
         x = token[i];
         if (x[1] === 'declaration') {
@@ -3401,7 +3401,7 @@ CSSOCompressor.prototype.restructureBlock = function(token, rule, container, j,
                     } else {
                         token.splice(i, 1);
                     }
-                } 
+                }
             } else if (this.needless(p, props, pre, imp, v, x, freeze)) {
                 token.splice(i, 1);
             } else {
@@ -3561,7 +3561,7 @@ CSSOCompressor.prototype.rejoinRuleset = function(token, rule, container, i) {
 
     if (!tb.length) return null;
 
-    if (ps.length && pb.length) {
+    if (ps.length && pb.length && token[0].pseudoSignature == p[0].pseudoSignature) {
         if (token[1] !== p[1]) return;
         // try to join by selectors
         ph = this.getHash(ps);
@@ -3628,7 +3628,7 @@ CSSOCompressor.prototype.restructureRuleset = function(token, rule, container, i
 
     if (!tb.length) return null;
 
-    if (ps.length && pb.length) {
+    if (ps.length && pb.length && token[0].pseudoSignature == p[0].pseudoSignature) {
         if (token[1] !== p[1]) return;
         // try to join by properties
         r = this.analyze(token, p);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csso-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-30 00:00:00.000000000 Z
+date: 2013-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -85,7 +85,8 @@ files:
 - spec/csso/csso_spec.rb
 - vendor/csso/csso.js
 homepage: https://github.com/Vasfed/csso-rails
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -98,7 +99,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2484248260249532687
+      hash: -4417280419298130483
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -107,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2484248260249532687
+      hash: -4417280419298130483
 requirements: []
 rubyforge_project: csso-rails
 rubygems_version: 1.8.24