csswaxer 0.0.6 → 0.0.7

data/README.md

@@ -16,13 +16,19 @@ Ruby command that prettifies CSS files grouping lines by property rather than by
 * Accept CSS files with commands split on multiple lines
 * Accept different media types, not only screen
 * Contain every possible CSS property
+* Align TABS for each property
+* Also expand shorthand property list-style (css_parser does not)
+* Recreate shorthand formats in the final output
 
 ## History ##
 
-v0.0.6  2010/04/32
+v0.0.7  2010/04/03
+        Expanded shorthand properties: background, font, margin, padding
+
+v0.0.6  2010/04/02
         Requires CSS Parser > 1.1.0 which includes load_file!
 
-v0.0.5  2010/04/32
+v0.0.5  2010/04/02
         Fixed a bug; now respects multiple property values for the same selector
 
 v0.0.4  2010/03/31

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/csswaxer.rb

@@ -22,6 +22,7 @@ module CssWaxer
       properties = {}
       # First make sure to take the most important property values for each selector
       parser.each_selector(:screen).each do |ruleset|
+        ruleset[:rules].expand_shorthand! # NOTE: list-style is not affected
         declarations = ruleset[:rules].instance_variable_get(:@declarations)
         ruleset[:rules].selectors.each do |selector|
           declarations.each do |property, values|
@@ -59,7 +60,7 @@ module CssWaxer
         puts titleize(family)
         properties.each do |property|
           next unless merged.has_key? property
-          puts "\n/* #{property} */"
+          puts "/* #{property} */"
           merged[property].each do |values, selectors|
             important = " !important" if values[1]
             puts "#{selectors.join(", ")}\t{#{property}: #{values[0]}#{important}}"
@@ -71,7 +72,7 @@ module CssWaxer
       unless merged.empty?
         puts titleize("Unrecognized properties")
         merged.each do |property, values_and_selectors|
-          puts "\n/* #{property} */"
+          puts "/* #{property} */"
           values_and_selectors.each do |values, selectors|
             important = " !important" if values[1]
             puts "#{selectors.join(", ")}\t{#{property}: #{values[0]}#{important}}"
@@ -90,7 +91,7 @@ module CssWaxer
     def css_families
       # Based on the list from http://www.eskimo.com/~bloo/indexdot/css/
       [
-        ['Typography', %w{font-family font-size font-style font-variant font-weight font font-size-adjust font-stretch}],
+        ['Typography', %w{font-family font-size font-style font-variant font-weight font font-size-adjust font-stretch line-height}],
         ['Text', %w{word-spacing letter-spacing white-space word-wrap text-align text-align-last text-decoration text-transform text-shadow text-indent text-underline-position}],
         ['Colors', %w{color background-color layer-background-color border-top-color border-right-color border-bottom-color border-left-color border-color scrollbar-face-color scrollbar-arrow-color scrollbar-base-color scrollbar-shadow-color scrollbar-darkshadow-color scrollbar-highlight-color scrollbar-3dlight-color scrollbar-track-color outline-color}],
         ['Backgrounds', %w{layer-background-image background-image background-repeat background-attachment background-position background-position-x background-position-y background}], 
@@ -98,7 +99,7 @@ module CssWaxer
         ['Lists', %w{marker-offset list-style-type list-style-position list-style-image list-style}],
         ['Tables', %w{border-collapse border-spacing caption-side empty-cells speak-header table-layout}],
         ['Layout', %w{display visibility position float clear}],
-        ['Sizes', %w{width min-width max-width line-height 	height min-height max-height}],
+        ['Sizes', %w{width min-width max-width height min-height max-height}],
         ['Positions', %w{top right bottom left vertical-align 	overflow overflow-x overflow-y text-overflow clip z-index}],
         ['Margins', %w{margin-top margin-right margin-bottom margin-left margin}],
         ['Paddings', %w{padding-top padding-right padding-bottom padding-left padding}],

data/lib/example.css

@@ -1,4 +1,6 @@
 a {line-height:12px; font-size: 12px;}
 b,c {font-size:40px;}
-b {font-size:12px;}
+b {font-size:12px; font-weight: bold;}
 c, d {line-height: 12px}
+e {font-weight: bold; font-variant: small-caps;}
+f {font: italic normal bold 1em/1.5em Arial, sans-serif;}

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Claudio Baccigalupo
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-02 00:00:00 +02:00
+date: 2010-04-03 00:00:00 +02:00
 default_executable: csswaxer
 dependencies: 
 - !ruby/object:Gem::Dependency