csscutter 0.3.2.alpha → 0.4.beta

data/lib/csscutter.rb

@@ -32,5 +32,6 @@ class CssCutter
       .minify_hex
       .minify_floats
       .replace_none_value_with_zero
+      .minify_font_weight
   end
 end

data/lib/csscutter/cleaner.rb

@@ -1,21 +1,12 @@
 class CssCutter::Cleaner < String
   def remove_whitespace
     strip
-      .gsub(/\s+/, ' ')
-      .gsub(/\s*\{\s*/, '{')
-      .gsub(/\s*\}\s*/, '}')
-      .gsub(/(\S+)\s*:\s*([^\{\};]+?)(?=[\};])/, '\1:\2')
-      .gsub(/(\([^\)]*)(\S)\s*:\s*/, '\1\2:')
-      .gsub(/\s*([,;=\+\>~])\s*/, '\1')
-      .gsub('( ', '(')
-      .gsub(' )', ')')
-      .gsub('[ ', '[')
-      .gsub(' ]', ']')
-      .gsub(' ~=', '~=')
-      .gsub(' $=', '$=')
-      .gsub(' *=', '*=')
-      .gsub(' |=', '|=')
-      .gsub(' ^=', '^=')
+      .remove_repeated
+      .remove_around_curly_brackets
+      .remove_between_property_and_value
+      .remove_in_selectors
+      .remove_around_other_brackets
+      .remove_in_attribute_selectors
   end
 
   def remove_trailing_semicolons
@@ -30,4 +21,32 @@ class CssCutter::Cleaner < String
   def remove_comments
     gsub /\/\*.*?\*\//, ''
   end
+
+  def remove_repeated
+    gsub(/\s+/, ' ')
+  end
+
+  def remove_around_curly_brackets
+    gsub(/\s*\{\s*/, '{')
+      .gsub(/\s*\}\s*/, '}')
+  end
+
+  def remove_between_property_and_value
+    gsub(/(?:^|\})[^\{:]+\s+:+[^\{]*\{/) { |m| m.gsub ':', '_COLON_' }
+      .gsub(/\s?:\s?/, ':')
+      .gsub('_COLON_', ':')
+  end
+
+  def remove_around_other_brackets
+    gsub(/([\(\[]) /, '\1')
+      .gsub(/ ([\)\]])/, '\1')
+  end
+
+  def remove_in_selectors
+    gsub(/\s?([,;=\+\>~])\s?/, '\1')
+  end
+
+  def remove_in_attribute_selectors
+    gsub(/ ([\~\$\*\|\^])=/, '\1=')
+  end
 end

data/lib/csscutter/simplifier.rb

@@ -31,6 +31,11 @@ class CssCutter::Simplifier < String
     gsub /((\{|;)\s*\w+\s*):(\s*)none(\s*(;|\}))/, '\1:\30\4'
   end
 
+  def minify_font_weight
+    gsub(/(font|font-weight)(\s*):([^;\}]*\W)?normal([\s;\}])/, '\1\2:\3400\4')
+    .gsub(/(font|font-weight)(\s*):([^;\}]*\W)?bold([\s;\}])/, '\1\2:\3700\4')
+  end
+
   private
   def dec_to_hex(number)
     "%02x" % number.to_i

data/lib/csscutter/version.rb

@@ -1,3 +1,3 @@
 class CssCutter
-  VERSION = '0.3.2.alpha'
+  VERSION = '0.4.beta'
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: csscutter
 version: !ruby/object:Gem::Version
-  version: 0.3.2.alpha
-  prerelease: 6
+  version: 0.4.beta
+  prerelease: 4
 platform: ruby
 authors:
 - m16a1
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-12 00:00:00.000000000 Z
+date: 2013-01-17 00:00:00.000000000 Z
 dependencies: []
 description: CSS minifier inspired by cssmin
 email: a741su@gmail.com
@@ -17,10 +17,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/csscutter/cleaner.rb
 - lib/csscutter/simplifier.rb
-- lib/csscutter/version.rb
 - lib/csscutter/whitespace_keeper.rb
+- lib/csscutter/cleaner.rb
+- lib/csscutter/version.rb
 - lib/csscutter.rb
 - License
 homepage: https://github.com/m16a1/csscutter
@@ -37,7 +37,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2739630844775803242
+      hash: -876732536316891254
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: