cssminify 1.0.0 → 1.0.1

data/CHANGES.md

@@ -1,3 +1,8 @@
+### 1.0.1
+
+Updated cssmin.rb to 1.0.1
+Updated tests
+
 ## 1.0.0
 
 First release

data/lib/cssminify/cssmin.rb

@@ -1,5 +1,5 @@
 #
-# cssmin.rb - 1.0.0
+# cssmin.rb - 1.0.1
 # Author: Matthias Siegel - https://github.com/matthiassiegel/cssmin
 # This is a Ruby port of the CSS minification tool
 # distributed with YUICompressor, based on the original Java
@@ -148,7 +148,7 @@ module CssCompressor
     #
     # Retain space for special IE6 cases
     #
-    css = css.gsub(/:first-(line|letter)(\{|,)/) { ":first-#{$1.to_s} #{$2.to_s}" }
+    css = css.gsub(/:first-(line|letter)(\{|,)/i) { ":first-#{$1.to_s.downcase} #{$2.to_s}" }
     
     #
     # No space after the end of a preserved comment
@@ -180,7 +180,7 @@ module CssCompressor
     #
     # Replace 0(px,em,%) with 0
     #
-    css = css.gsub(/([\s:])(0)(px|em|%|in|cm|mm|pc|pt|ex)/i) { $1.to_s + $2.to_s }
+    css = css.gsub(/(^|[^0-9])(?:0?\.)?0(?:px|em|%|in|cm|mm|pc|pt|ex|deg|g?rad|m?s|k?hz)/i) { $1.to_s + '0' }
     
     #
     # Replace 0 0 0 0; with 0
@@ -204,7 +204,7 @@ module CssCompressor
     # Shorten colors from rgb(51,102,153) to #336699
     # This makes it more likely that it'll get further compressed in the next step.
     #
-    css = css.gsub(/rgb\s*\(\s*([0-9,\s]+)\s*\)/i) {
+    css = css.gsub(/rgb\s*\(\s*([0-9,\s]+)\s*\)(\d+%)?/i) {
       rgbcolors = $1.to_s.split(',')
       i = 0
       
@@ -218,6 +218,10 @@ module CssCompressor
         i += 1
       end
       
+      unless $2.to_s.empty?
+        rgbcolors << (' ' + $2.to_s)
+      end
+      
       '#' + rgbcolors.join('')
     }
     
@@ -234,7 +238,7 @@ module CssCompressor
     rest = css
     new_css = ''
     
-    while m = rest.match(/(\=\s*?["']?)?#([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])(:?\}|[^0-9a-fA-F{][^{]*?\})/i) do
+    while m = rest.match(/(\=\s*?["']?)?#([0-9a-f])([0-9a-f])([0-9a-f])([0-9a-f])([0-9a-f])([0-9a-f])(:?\}|[^0-9a-f{][^{]*?\})/i) do
       #
       # Normal color value
       #
@@ -271,7 +275,7 @@ module CssCompressor
     #
     # border: none -> border:0
     #
-    css = css.gsub(/(border|border-top|border-right|border-bottom|border-right|outline|background):none(;|\})/i) { "#{$1.to_s.downcase}:0#{$2.to_s}" }
+    css = css.gsub(/(border|border-top|border-right|border-bottom|border-left|outline|background):none(;|\})/i) { "#{$1.to_s.downcase}:0#{$2.to_s}" }
     
     #
     # Shorter opacity IE filter

data/lib/cssminify/version.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
 
 class CSSminify
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/tests/zeros.css

@@ -2,5 +2,11 @@ a {
   margin: 0px 0pt 0em 0%;
   _padding-top: 0ex;
   background-position: 0 0;
-  padding: 0in 0cm 0mm 0pc
+  padding: 0in 0cm 0mm 0pc;
+  transition: opacity .0s;
+  transition-delay: 0.0ms;
+  transform: rotate3d(0grad, 0rad, 0deg);
+  pitch: 0khz;
+  pitch:
+0hz /* intentionally on next line */;
 }

data/spec/tests/zeros.css.min

@@ -1 +1 @@
-a{margin:0;_padding-top:0;background-position:0 0;padding:0}
+a{margin:0;_padding-top:0;background-position:0 0;padding:0;transition:opacity 0;transition-delay:0;transform:rotate3d(0,0,0);pitch:0;pitch:0}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cssminify
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-29 00:00:00.000000000 Z
+date: 2012-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2154137260 !ruby/object:Gem::Requirement
+  requirement: &2161788620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154137260
+  version_requirements: *2161788620
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2154136540 !ruby/object:Gem::Requirement
+  requirement: &2161787120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154136540
+  version_requirements: *2161787120
 description: ! '    The CSSminify gem provides CSS compression using YUI compressor.
   Instead of wrapping around the Java or Javascript version of YUI compressor it uses
   a native Ruby port of the CSS engine. Therefore this gem has no dependencies except