csspool 3.0.0 → 3.0.1

data/CHANGELOG.rdoc

@@ -1,3 +1,17 @@
+== 3.0.1
+
+* New Features
+
+  * 'Minified' CSS output: passing :minify => true to a to_css call will omit
+  line breaks
+  * Added Gemfile
+
+* Bugfixes
+
+  * Parse properties without semi-colons at the end of a declaration.
+  [stereobooster]
+  * Handle whitespaces after properties [stereobooster]
+
 == 3.0.0
 
 * New Features

data/README.rdoc

@@ -40,7 +40,7 @@ $ sudo gem install rexical
 
 (The MIT License)
 
-Copyright (c) 2007-2009
+Copyright (c) 2007-2012
 
 * {Aaron Patterson}[http://tenderlovemaking.com]
 * {John Barnette}[http://www.jbarnette.com/]

data/Rakefile

@@ -7,6 +7,8 @@ GENERATED_TOKENIZER = "lib/csspool/css/tokenizer.rb"
 GENERATED_PARSER    = "lib/csspool/css/parser.rb"
 
 Hoe.plugin :git
+Hoe.plugin :bundler
+Hoe.plugin :gemspec
 
 Hoe.spec('csspool') do
   developer('Aaron Patterson', 'aaronp@rubyforge.org')
@@ -15,12 +17,12 @@ Hoe.spec('csspool') do
   self.history_file  = 'CHANGELOG.rdoc'
   self.extra_rdoc_files  = FileList['*.rdoc']
 
-  %w{ racc rexical }.each do |dep|
+  %w{racc rexical hoe-git hoe-gemspec hoe-bundler}.each do |dep|
     self.extra_dev_deps << [dep, '>= 0']
   end
 end
 
-[:test, :check_manifest].each do |task_name|
+[:test, :check_manifest, "gem:spec"].each do |task_name|
   Rake::Task[task_name].prerequisites << :compile
 end
 
@@ -28,7 +30,7 @@ task :compile => [GENERATED_TOKENIZER, GENERATED_PARSER]
 
 file GENERATED_TOKENIZER => "lib/csspool/css/tokenizer.rex" do |t|
   begin
-    sh "rex -i --independent -o #{t.name} #{t.prerequisites.first}"
+    sh "bundle exec rex -i --independent -o #{t.name} #{t.prerequisites.first}"
   rescue
     abort "need rexical, sudo gem install rexical"
   end
@@ -36,8 +38,7 @@ end
 
 file GENERATED_PARSER => "lib/csspool/css/parser.y" do |t|
   begin
-    racc = `which racc`.strip
-    racc = "#{::Config::CONFIG['bindir']}/racc" if racc.empty?
+    racc = 'bundle exec racc'
     #sh "#{racc} -l -o #{t.name} #{t.prerequisites.first}"
     sh "#{racc} -o #{t.name} #{t.prerequisites.first}"
   rescue

data/lib/csspool.rb

@@ -13,7 +13,7 @@ require 'csspool/visitors'
 require 'csspool/collection'
 
 module CSSPool
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 
   def self.CSS doc
     CSSPool::CSS::Document.parse doc

data/lib/csspool/css/parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.7
+# This file is automatically generated by Racc 1.4.8
 # from Racc grammer file "".
 #
 
@@ -9,7 +9,7 @@ module CSSPool
   module CSS
     class Parser < Racc::Parser
 
-module_eval(<<'...end parser.y/module_eval...', 'parser.y', 312)
+module_eval(<<'...end parser.y/module_eval...', 'parser.y', 317)
 
 def numeric thing
   thing = thing.gsub(/[^\d.]/, '')
@@ -50,122 +50,138 @@ end
 ##### State transition tables begin ###
 
 racc_action_table = [
-    13,    17,    41,    51,    22,    25,    60,    55,   121,     4,
-     6,     9,    13,    17,    79,    42,    22,    25,    83,    61,
-    62,     4,     6,     9,    46,    34,    13,    17,    35,    51,
-    22,    25,     8,    10,    14,     4,     6,     9,    77,    72,
-     6,     9,    22,    25,     8,    10,    14,     4,     6,     9,
-    22,    73,    47,    65,    66,     4,     6,     9,     8,    10,
-    14,    22,    25,    10,    14,    71,     4,     6,     9,    22,
-    25,    10,    14,    90,     4,     6,     9,    22,    25,    10,
-    14,    22,     4,     6,     9,    58,     4,     6,     9,     8,
-    10,    14,    56,    91,     6,     9,    65,     8,    10,    14,
-   117,     6,     9,   118,   119,     8,    10,    14,   120,    80,
-    10,    14,   101,    86,   105,    87,   126,    10,    14,   122,
-    94,     6,     9,   124,    10,    14,    84,   112,    85,   115,
-   123,    93,    96,    98,   100,   103,   106,   108,   111,   114,
-   116,   101,    40,   105,    10,    14,    75,    34,    76,    94,
-     6,     9,    67,    68,    69,    70,   112,    88,   115,    89,
-    93,    96,    98,   100,   103,   106,   108,   111,   114,   116,
-   101,   128,   105,    10,    14,   129,   130,   131,    94,   132,
-    37,    36,    31,   136,     3,   112,   136,   115,   140,    93,
-    96,    98,   100,   103,   106,   108,   111,   114,   116,   101,
-   141,   105,   110,   142,   nil,   nil,   nil,    94,   nil,   nil,
-   nil,   nil,   nil,   nil,   112,   nil,   115,   nil,    93,    96,
-    98,   100,   103,   106,   108,   111,   114,   116,   101,   nil,
-   105,   nil,   nil,   nil,   nil,   nil,    94,   nil,   nil,   nil,
-   nil,   nil,   nil,   112,   nil,   115,   nil,    93,    96,    98,
-   100,   103,   106,   108,   111,   114,   116,   115,   nil,    93,
-    96,    98,   100,   103,   106,   108,   111,   114 ]
+     8,     9,    63,    48,    21,    15,    53,    45,     3,    22,
+    27,    29,     8,     9,    75,    64,    21,    15,    48,    54,
+    55,    22,    27,    29,    36,    84,     8,     9,    70,    83,
+    21,    15,    13,    28,    30,    22,    27,    29,    85,    27,
+    29,    82,    21,    74,    13,    28,    30,    22,    27,    29,
+    21,    15,    37,    70,    71,    22,    27,    29,    13,    28,
+    30,    21,    28,    30,   112,    73,    22,    27,    29,    21,
+    15,    28,    30,    72,    22,    27,    29,    21,    15,    28,
+    30,    69,    22,    27,    29,    27,    29,    21,    15,   119,
+    28,    30,    22,    27,    29,   121,    65,    13,    28,    30,
+    27,    29,    67,    42,    68,    13,    28,    30,    28,    30,
+    99,    42,   111,    62,    43,    13,    28,    30,    97,    27,
+    29,    27,    29,    28,    30,    96,   118,   110,   117,   101,
+   109,   103,   102,   104,   105,   106,   107,   108,    98,    99,
+   128,   111,    28,    30,    28,    30,   129,    97,    81,    78,
+    79,    80,   130,   115,    96,   116,   110,   131,   101,   109,
+   103,   102,   104,   105,   106,   107,   108,    98,    99,   132,
+   111,   136,   114,    61,   113,    51,    97,    50,   137,   138,
+   139,   140,   141,    96,   142,   110,   121,   101,   109,   103,
+   102,   104,   105,   106,   107,   108,    98,    99,    34,   111,
+   145,   123,   121,    31,   121,    97,   nil,   nil,   125,   nil,
+   nil,   nil,    96,   nil,   110,   124,   101,   109,   103,   102,
+   104,   105,   106,   107,   108,    98,    99,   nil,   111,   nil,
+   nil,   nil,   nil,   nil,    97,   nil,   nil,   nil,   nil,   nil,
+   nil,    96,   nil,   110,   nil,   101,   109,   103,   102,   104,
+   105,   106,   107,   108,    98,    99,   nil,   111,    88,   nil,
+   nil,   nil,   nil,    97,   nil,   nil,   nil,   nil,   nil,   nil,
+    96,   nil,   110,   nil,   101,   109,   103,   102,   104,   105,
+   106,   107,   108,    98,    99,   nil,   111,   nil,   nil,   nil,
+   nil,   nil,    97,   nil,   nil,   nil,   nil,   nil,   nil,    96,
+   nil,   110,   nil,   101,   109,   103,   102,   104,   105,   106,
+   107,   108,    98,   110,   nil,   101,   109,   103,   102,   104,
+   105,   106,   107,   108 ]
 
 racc_action_check = [
-     2,     2,    14,    21,     2,     2,    28,    21,    88,     2,
-     2,     2,    27,    27,    53,    14,    27,    27,    65,    28,
-    28,    27,    27,    27,    17,     8,    29,    29,     8,    52,
-    29,    29,     2,     2,     2,    29,    29,    29,    49,    42,
-     5,     5,    25,    25,    27,    27,    27,    25,    25,    25,
-    63,    42,    17,    33,    33,    63,    63,    63,    29,    29,
-    29,    12,    12,     5,     5,    40,    12,    12,    12,    19,
-    19,    25,    25,    72,    19,    19,    19,    16,    16,    63,
-    63,    58,    16,    16,    16,    26,    58,    58,    58,    12,
-    12,    12,    24,    74,    18,    18,    74,    19,    19,    19,
-    84,    15,    15,    85,    86,    16,    16,    16,    87,    54,
-    58,    58,    92,    69,    92,    69,    92,    18,    18,    89,
-    92,    11,    11,    92,    15,    15,    68,    92,    68,    92,
-    92,    92,    92,    92,    92,    92,    92,    92,    92,    92,
-    92,   127,    13,   127,    11,    11,    45,    45,    45,   127,
-    20,    20,    36,    36,    36,    36,   127,    70,   127,    70,
-   127,   127,   127,   127,   127,   127,   127,   127,   127,   127,
-   112,    95,   112,    20,    20,    99,   102,   104,   112,   107,
-    10,     9,     3,   113,     1,   112,   134,   112,   135,   112,
-   112,   112,   112,   112,   112,   112,   112,   112,   112,    80,
-   137,    80,    80,   139,   nil,   nil,   nil,    80,   nil,   nil,
-   nil,   nil,   nil,   nil,    80,   nil,    80,   nil,    80,    80,
-    80,    80,    80,    80,    80,    80,    80,    80,   110,   nil,
-   110,   nil,   nil,   nil,   nil,   nil,   110,   nil,   nil,   nil,
-   nil,   nil,   nil,   110,   nil,   110,   nil,   110,   110,   110,
-   110,   110,   110,   110,   110,   110,   110,   109,   nil,   109,
-   109,   109,   109,   109,   109,   109,   109,   109 ]
+     6,     6,    30,    14,     6,     6,    18,    14,     1,     6,
+     6,     6,     2,     2,    47,    30,     2,     2,    73,    18,
+    18,     2,     2,     2,     9,    66,     5,     5,    66,    64,
+     5,     5,     6,     6,     6,     5,     5,     5,    70,    23,
+    23,    64,    52,    47,     2,     2,     2,    52,    52,    52,
+    15,    15,     9,    41,    41,    15,    15,    15,     5,     5,
+     5,    51,    23,    23,    75,    46,    51,    51,    51,    12,
+    12,    52,    52,    44,    12,    12,    12,    10,    10,    15,
+    15,    40,    10,    10,    10,    25,    25,    11,    11,    83,
+    51,    51,    11,    11,    11,    87,    34,    12,    12,    12,
+    26,    26,    35,    35,    35,    10,    10,    10,    25,    25,
+   126,    13,   126,    29,    13,    11,    11,    11,   126,    19,
+    19,    24,    24,    26,    26,   126,    80,   126,    80,   126,
+   126,   126,   126,   126,   126,   126,   126,   126,   126,   136,
+    90,   136,    19,    19,    24,    24,    92,   136,    62,    62,
+    62,    62,    93,    79,   136,    79,   136,    94,   136,   136,
+   136,   136,   136,   136,   136,   136,   136,   136,   112,    95,
+   112,   112,    78,    28,    78,    17,   112,    16,   113,   114,
+   115,   116,   117,   112,   118,   112,   122,   112,   112,   112,
+   112,   112,   112,   112,   112,   112,   112,    89,     8,    89,
+   133,    89,   135,     3,   147,    89,   nil,   nil,    89,   nil,
+   nil,   nil,    89,   nil,    89,    89,    89,    89,    89,    89,
+    89,    89,    89,    89,    89,    89,    88,   nil,    88,   nil,
+   nil,   nil,   nil,   nil,    88,   nil,   nil,   nil,   nil,   nil,
+   nil,    88,   nil,    88,   nil,    88,    88,    88,    88,    88,
+    88,    88,    88,    88,    88,    74,   nil,    74,    74,   nil,
+   nil,   nil,   nil,    74,   nil,   nil,   nil,   nil,   nil,   nil,
+    74,   nil,    74,   nil,    74,    74,    74,    74,    74,    74,
+    74,    74,    74,    74,    96,   nil,    96,   nil,   nil,   nil,
+   nil,   nil,    96,   nil,   nil,   nil,   nil,   nil,   nil,    96,
+   nil,    96,   nil,    96,    96,    96,    96,    96,    96,    96,
+    96,    96,    96,   100,   nil,   100,   100,   100,   100,   100,
+   100,   100,   100,   100 ]
 
 racc_action_pointer = [
-   nil,   184,    -2,   182,   nil,    28,   nil,   nil,    19,   175,
-   174,   109,    55,   138,    -4,    89,    71,    20,    82,    63,
-   138,    -3,   nil,   nil,    83,    36,    77,    10,    -1,    24,
-   nil,   nil,   nil,    45,   nil,   nil,   138,   nil,   nil,   nil,
-    60,   nil,    33,   nil,   nil,   141,   nil,   nil,   nil,    28,
-   nil,   nil,    23,     4,    73,   nil,   nil,   nil,    75,   nil,
-   nil,   nil,   nil,    44,   nil,    12,   nil,   nil,   122,   109,
-   153,   nil,    55,   nil,    88,   nil,   nil,   nil,   nil,   nil,
-   195,   nil,   nil,   nil,    86,    89,    90,    94,    -6,   105,
-   nil,   nil,   108,   nil,   nil,   164,   nil,   nil,   nil,   168,
-   nil,   nil,   169,   nil,   170,   nil,   nil,   172,   nil,   236,
-   224,   nil,   166,   150,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   137,   nil,   nil,
-   nil,   nil,   nil,   nil,   153,   170,   nil,   195,   nil,   198,
-   nil,   nil,   nil ]
+   nil,     8,    10,   203,   nil,    24,    -2,   nil,   194,    20,
+    71,    81,    63,   105,    -3,    44,   168,   167,    -1,   107,
+   nil,   nil,   nil,    27,   109,    73,    88,   nil,   167,   107,
+    -4,   nil,   nil,   nil,    91,    97,   nil,   nil,   nil,   nil,
+    71,    45,   nil,   nil,    63,   nil,    60,     7,   nil,   nil,
+   nil,    55,    36,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   134,   nil,    23,   nil,    20,   nil,   nil,   nil,
+    32,   nil,   nil,    12,   251,    28,   nil,   nil,   168,   149,
+   122,   nil,   nil,    71,   nil,   nil,   nil,    62,   222,   193,
+   133,   nil,   139,   145,   150,   162,   280,   nil,   nil,   nil,
+   292,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   164,   164,   165,   166,   167,   168,   170,   nil,
+   nil,   nil,   153,   nil,   nil,   nil,   106,   nil,   nil,   nil,
+   nil,   nil,   nil,   182,   nil,   169,   135,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   171,   nil ]
 
 racc_action_default = [
-    -1,   -99,   -99,   -99,   -38,   -35,   -47,   -36,   -99,   -99,
-   -99,   -39,   -18,   -99,   -99,   -40,   -19,   -99,   -41,   -99,
-   -42,   -99,   -37,    -2,   -99,   -99,   -28,    -5,   -30,    -6,
-    -7,   143,   -34,   -99,   -15,   -22,   -99,   -48,   -43,   -16,
-   -99,   -56,   -99,   -44,   -17,   -99,   -12,   -13,   -45,   -99,
-   -46,   -65,   -60,   -99,   -99,   -24,   -26,   -25,   -99,    -3,
-   -31,   -32,   -33,   -99,    -4,   -99,   -21,   -55,   -99,   -99,
-   -99,    -8,   -99,   -57,   -99,   -10,   -11,   -20,   -59,   -23,
-   -99,   -27,   -29,   -14,   -99,   -99,   -99,   -99,   -99,   -99,
-   -58,    -9,   -71,   -87,   -81,   -72,   -95,   -73,   -89,   -74,
-   -88,   -85,   -75,   -90,   -76,   -98,   -91,   -77,   -92,   -99,
-   -99,   -93,   -99,   -64,   -94,   -96,   -83,   -50,   -49,   -51,
-   -52,   -54,   -53,   -67,   -68,   -70,   -66,   -99,   -97,   -84,
-   -82,   -80,   -78,   -86,   -64,   -99,   -63,   -99,   -69,   -99,
-   -79,   -61,   -62 ]
+    -1,  -102,  -102,  -102,    -2,    -5,    -6,    -7,  -102,  -102,
+   -18,   -19,  -102,  -102,  -102,  -102,  -102,   -28,   -30,   -35,
+   -36,   -37,   -38,   -39,   -40,   -41,   -42,   -47,  -102,  -102,
+  -102,   149,    -3,    -4,  -102,  -102,   -12,   -13,   -16,   -17,
+  -102,  -102,   -15,   -22,  -102,   -24,   -61,  -102,   -68,   -25,
+   -26,  -102,  -102,   -31,   -32,   -33,   -34,   -43,   -44,   -45,
+   -46,   -48,  -102,   -56,  -102,    -8,  -102,   -10,   -11,   -20,
+  -102,   -21,   -23,   -60,  -102,  -102,   -27,   -29,  -102,  -102,
+  -102,   -55,   -57,  -102,    -9,   -14,   -59,   -67,  -102,   -74,
+   -75,   -76,   -77,   -78,   -79,   -80,  -102,   -84,   -86,   -88,
+  -102,   -90,   -91,   -92,   -93,   -94,   -95,   -96,   -97,   -98,
+   -99,  -101,  -102,  -102,  -102,  -102,  -102,  -102,  -102,   -58,
+   -62,   -66,   -67,   -69,   -70,   -71,  -102,   -73,  -100,   -87,
+   -85,   -83,   -81,  -102,   -89,   -67,  -102,   -49,   -50,   -51,
+   -52,   -53,   -54,   -63,   -72,   -82,   -64,   -67,   -65 ]
 
 racc_goto_table = [
-   113,    33,    53,   137,    23,    32,    39,    81,    57,    82,
-    44,    38,   125,    49,    63,    43,    45,     2,    48,     1,
-    50,   127,   133,   nil,   139,   nil,   nil,   nil,   nil,    59,
-   134,    64,   135,    78,   nil,   nil,   nil,   nil,    74,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   138 ]
+    87,   120,    41,    56,    44,    76,    49,    57,    58,    59,
+    60,    77,    52,     4,   122,   127,    32,    33,    38,    39,
+    40,    35,   133,     2,    66,     1,   126,   134,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   143,   nil,   135,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   146,
+   nil,   nil,   144,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   148,   147,    86 ]
 
 racc_goto_check = [
-    26,     8,    13,    27,     2,    19,     6,    14,    12,    15,
-     6,    19,    26,     6,    17,    19,     7,     3,    19,     1,
-    19,    28,    31,   nil,    27,   nil,   nil,   nil,   nil,     2,
-    26,     2,    26,    13,   nil,   nil,   nil,   nil,     8,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    26 ]
+    26,    27,     8,    19,    13,    14,    12,    19,    19,    19,
+    19,    15,    17,     2,    26,    26,     2,     2,     6,     6,
+     6,     7,    26,     3,     8,     1,    28,    31,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    27,   nil,    26,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    27,
+   nil,   nil,    26,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    27,    26,    13 ]
 
 racc_goto_pointer = [
-   nil,    19,     2,    17,   nil,   nil,    -6,    -1,    -7,   nil,
-   nil,   nil,   -17,   -19,   -51,   -54,   nil,   -14,   nil,     0,
-   nil,   nil,   nil,   nil,   nil,   nil,   -80,  -110,   -71,   nil,
-   nil,   -87,   nil,   nil,   nil,   nil,   nil ]
+   nil,    25,    11,    23,   nil,   nil,     8,    12,   -11,   nil,
+   nil,   nil,    -9,   -10,   -46,   -41,   nil,    -6,   nil,   -16,
+   nil,   nil,   nil,   nil,   nil,   nil,   -74,   -86,   -63,   nil,
+   nil,   -73,   nil,   nil,   nil,   nil,   nil ]
 
 racc_goto_default = [
-   nil,   nil,   nil,   nil,    27,    29,    30,   nil,   nil,    12,
-    16,    19,    21,   nil,    24,    26,    28,   nil,     5,     7,
-    11,    15,    18,    20,    52,    54,   nil,   nil,   nil,    92,
-    95,    97,    99,   102,   104,   107,   109 ]
+   nil,   nil,   nil,   nil,     5,     6,     7,   nil,   nil,    10,
+    11,    12,    14,   nil,    16,    17,    18,   nil,    19,    20,
+    23,    24,    25,    26,    46,    47,   nil,   nil,   nil,    89,
+    90,    91,    92,    93,    94,    95,   100 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
@@ -227,50 +243,53 @@ racc_reduce_table = [
   2, 60, :_reduce_56,
   3, 60, :_reduce_57,
   4, 60, :_reduce_58,
+  3, 50, :_reduce_none,
   2, 50, :_reduce_none,
   1, 50, :_reduce_none,
-  5, 61, :_reduce_61,
-  6, 61, :_reduce_62,
-  1, 64, :_reduce_63,
-  0, 64, :_reduce_64,
-  1, 62, :_reduce_65,
+  4, 61, :_reduce_62,
+  5, 61, :_reduce_63,
+  5, 61, :_reduce_64,
+  6, 61, :_reduce_65,
+  1, 64, :_reduce_66,
+  0, 64, :_reduce_67,
+  1, 62, :_reduce_68,
   1, 65, :_reduce_none,
   1, 65, :_reduce_none,
   1, 65, :_reduce_none,
-  3, 63, :_reduce_69,
-  2, 63, :_reduce_70,
-  1, 63, :_reduce_71,
+  3, 63, :_reduce_72,
+  2, 63, :_reduce_73,
+  1, 63, :_reduce_74,
   1, 66, :_reduce_none,
   1, 66, :_reduce_none,
   1, 66, :_reduce_none,
   1, 66, :_reduce_none,
   1, 66, :_reduce_none,
   1, 66, :_reduce_none,
-  2, 72, :_reduce_78,
-  3, 72, :_reduce_79,
-  2, 71, :_reduce_80,
-  1, 71, :_reduce_81,
-  2, 70, :_reduce_82,
-  1, 70, :_reduce_83,
-  2, 69, :_reduce_84,
-  1, 69, :_reduce_85,
-  2, 68, :_reduce_86,
-  1, 68, :_reduce_87,
-  1, 68, :_reduce_88,
-  1, 68, :_reduce_89,
+  2, 72, :_reduce_81,
+  3, 72, :_reduce_82,
+  2, 71, :_reduce_83,
+  1, 71, :_reduce_84,
+  2, 70, :_reduce_85,
+  1, 70, :_reduce_86,
+  2, 69, :_reduce_87,
+  1, 69, :_reduce_88,
+  2, 68, :_reduce_89,
   1, 68, :_reduce_90,
   1, 68, :_reduce_91,
   1, 68, :_reduce_92,
   1, 68, :_reduce_93,
   1, 68, :_reduce_94,
-  1, 73, :_reduce_95,
-  1, 73, :_reduce_96,
-  2, 67, :_reduce_97,
-  1, 67, :_reduce_98 ]
+  1, 68, :_reduce_95,
+  1, 68, :_reduce_96,
+  1, 68, :_reduce_97,
+  1, 73, :_reduce_98,
+  1, 73, :_reduce_99,
+  2, 67, :_reduce_100,
+  1, 67, :_reduce_101 ]
 
-racc_reduce_n = 99
+racc_reduce_n = 102
 
-racc_shift_n = 143
+racc_shift_n = 149
 
 racc_token_table = {
   false => 0,
@@ -838,49 +857,65 @@ module_eval(<<'.,.,', 'parser.y', 201)
 
 # reduce 60 omitted
 
-module_eval(<<'.,.,', 'parser.y', 213)
-  def _reduce_61(val, _values, result)
+# reduce 61 omitted
+
+module_eval(<<'.,.,', 'parser.y', 214)
+  def _reduce_62(val, _values, result)
      @handler.property val.first, val[2], val[3] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 215)
-  def _reduce_62(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 216)
+  def _reduce_63(val, _values, result)
      @handler.property val.first, val[3], val[4] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 218)
-  def _reduce_63(val, _values, result)
+  def _reduce_64(val, _values, result)
+     @handler.property val.first, val[3], val[4] 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 220)
+  def _reduce_65(val, _values, result)
+     @handler.property val.first, val[4], val[5] 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 223)
+  def _reduce_66(val, _values, result)
      result = true 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 219)
-  def _reduce_64(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 224)
+  def _reduce_67(val, _values, result)
      result = false 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 222)
-  def _reduce_65(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 227)
+  def _reduce_68(val, _values, result)
      result = interpret_identifier val[0] 
     result
   end
 .,.,
 
-# reduce 66 omitted
+# reduce 69 omitted
 
-# reduce 67 omitted
+# reduce 70 omitted
 
-# reduce 68 omitted
+# reduce 71 omitted
 
-module_eval(<<'.,.,', 'parser.y', 231)
-  def _reduce_69(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 236)
+  def _reduce_72(val, _values, result)
             result = [val.first, val.last].flatten
         val.last.first.operator = val[1]
       
@@ -888,41 +923,41 @@ module_eval(<<'.,.,', 'parser.y', 231)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 234)
-  def _reduce_70(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 239)
+  def _reduce_73(val, _values, result)
      result = val.flatten 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 235)
-  def _reduce_71(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 240)
+  def _reduce_74(val, _values, result)
      result = val 
     result
   end
 .,.,
 
-# reduce 72 omitted
-
-# reduce 73 omitted
-
-# reduce 74 omitted
-
 # reduce 75 omitted
 
 # reduce 76 omitted
 
 # reduce 77 omitted
 
-module_eval(<<'.,.,', 'parser.y', 246)
-  def _reduce_78(val, _values, result)
+# reduce 78 omitted
+
+# reduce 79 omitted
+
+# reduce 80 omitted
+
+module_eval(<<'.,.,', 'parser.y', 251)
+  def _reduce_81(val, _values, result)
      result = val.first 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 248)
-  def _reduce_79(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 253)
+  def _reduce_82(val, _values, result)
             name = interpret_identifier val.first.sub(/\($/, '')
         if name == 'rgb'
           result = Terms::Rgb.new(*val[1])
@@ -934,50 +969,50 @@ module_eval(<<'.,.,', 'parser.y', 248)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 257)
-  def _reduce_80(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 262)
+  def _reduce_83(val, _values, result)
      result = val.first 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 258)
-  def _reduce_81(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 263)
+  def _reduce_84(val, _values, result)
      result = Terms::Hash.new val.first.sub(/^#/, '') 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 261)
-  def _reduce_82(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 266)
+  def _reduce_85(val, _values, result)
      result = val.first 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 262)
-  def _reduce_83(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 267)
+  def _reduce_86(val, _values, result)
      result = Terms::URI.new interpret_uri val.first 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 264)
-  def _reduce_84(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 269)
+  def _reduce_87(val, _values, result)
      result = val.first 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 265)
-  def _reduce_85(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 270)
+  def _reduce_88(val, _values, result)
      result = Terms::String.new interpret_string val.first 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 269)
-  def _reduce_86(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 274)
+  def _reduce_89(val, _values, result)
             result = val[1]
         val[1].unary_operator = val.first
       
@@ -985,24 +1020,24 @@ module_eval(<<'.,.,', 'parser.y', 269)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 273)
-  def _reduce_87(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 278)
+  def _reduce_90(val, _values, result)
             result = Terms::Number.new numeric val.first
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 276)
-  def _reduce_88(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 281)
+  def _reduce_91(val, _values, result)
             result = Terms::Number.new numeric(val.first), nil, '%'
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 279)
-  def _reduce_89(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 284)
+  def _reduce_92(val, _values, result)
             unit    = val.first.gsub(/[\s\d.]/, '')
         result = Terms::Number.new numeric(val.first), nil, unit
       
@@ -1010,24 +1045,24 @@ module_eval(<<'.,.,', 'parser.y', 279)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 283)
-  def _reduce_90(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 288)
+  def _reduce_93(val, _values, result)
             result = Terms::Number.new numeric(val.first), nil, 'em'
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 286)
-  def _reduce_91(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 291)
+  def _reduce_94(val, _values, result)
             result = Terms::Number.new numeric(val.first), nil, 'ex'
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 289)
-  def _reduce_92(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 294)
+  def _reduce_95(val, _values, result)
             unit    = val.first.gsub(/[\s\d.]/, '')
         result = Terms::Number.new numeric(val.first), nil, unit
       
@@ -1035,8 +1070,8 @@ module_eval(<<'.,.,', 'parser.y', 289)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 293)
-  def _reduce_93(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 298)
+  def _reduce_96(val, _values, result)
             unit    = val.first.gsub(/[\s\d.]/, '')
         result = Terms::Number.new numeric(val.first), nil, unit
       
@@ -1044,8 +1079,8 @@ module_eval(<<'.,.,', 'parser.y', 293)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 297)
-  def _reduce_94(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 302)
+  def _reduce_97(val, _values, result)
             unit    = val.first.gsub(/[\s\d.]/, '')
         result = Terms::Number.new numeric(val.first), nil, unit
       
@@ -1053,29 +1088,29 @@ module_eval(<<'.,.,', 'parser.y', 297)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 302)
-  def _reduce_95(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 307)
+  def _reduce_98(val, _values, result)
      result = :minus 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 303)
-  def _reduce_96(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 308)
+  def _reduce_99(val, _values, result)
      result = :plus 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 306)
-  def _reduce_97(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 311)
+  def _reduce_100(val, _values, result)
      result = val.first 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 307)
-  def _reduce_98(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 312)
+  def _reduce_101(val, _values, result)
      result = Terms::Ident.new interpret_identifier val.first 
     result
   end

data/lib/csspool/css/parser.y

@@ -206,14 +206,19 @@ rule
       }
     ;
   declarations
-    : declaration declarations
+    : declaration SEMI declarations
+    | declaration SEMI
     | declaration
     ;
   declaration
-    : property ':' expr prio SEMI
+    : property ':' expr prio
       { @handler.property val.first, val[2], val[3] }
-    | property ':' S expr prio SEMI
+    | property ':' S expr prio
       { @handler.property val.first, val[3], val[4] }
+    | property S ':' expr prio
+      { @handler.property val.first, val[3], val[4] }
+    | property S ':' S expr prio
+      { @handler.property val.first, val[4], val[5] }
     ;
   prio
     : IMPORTANT_SYM { result = true }

data/lib/csspool/node.rb

@@ -6,11 +6,19 @@ module CSSPool
       target.accept self
     end
 
-    def to_css
-      accept Visitors::ToCSS.new
+    def to_css options={}
+      if options[:minify]
+        to_minified_css
+      else
+        accept Visitors::ToCSS.new
+      end
     end
     alias :to_s :to_css
 
+    def to_minified_css
+      accept Visitors::ToMinifiedCSS.new
+    end
+
     def == other
       return false unless self.class == other.class
 

data/lib/csspool/visitors/to_css.rb

@@ -14,7 +14,7 @@ module CSSPool
 
       def initialize
         @indent_level = 0
-        @indent_space = '  '
+        @indent_space = indent_space
       end
 
       visitor_for CSS::Document do |target|
@@ -48,7 +48,7 @@ module CSSPool
             tokens << "#{indent}}"
           end
         }
-        tokens.join("\n")
+        tokens.join(line_break)
       end
 
       visitor_for CSS::Charset do |target|
@@ -66,9 +66,9 @@ module CSSPool
 
       visitor_for CSS::RuleSet do |target|
         "#{indent}" +
-          target.selectors.map { |sel| sel.accept self }.join(", ") + " {\n" +
-          target.declarations.map { |decl| decl.accept self }.join("\n") +
-          "\n#{indent}}"
+          target.selectors.map { |sel| sel.accept self }.join(", ") + " {#{line_break}" +
+          target.declarations.map { |decl| decl.accept self }.join(line_break) +
+          "#{line_break}#{indent}}"
       end
 
       visitor_for CSS::Declaration do |target|
@@ -197,6 +197,14 @@ module CSSPool
         "#{@indent_space * @indent_level}"
       end
 
+      def line_break
+        "\n"
+      end
+
+      def indent_space
+        '  '
+      end
+
       def escape_css_identifier text
         # CSS2 4.1.3 p2
         unsafe_chars = /[#{Regexp.escape CSS_IDENTIFIER_ILLEGAL_CHARACTERS}]/
@@ -213,5 +221,21 @@ module CSSPool
         text.gsub(/[\\"\n\r\f]/) {CSS_STRING_ESCAPE_MAP[$&]}
       end
     end
+
+    class ToMinifiedCSS < ToCSS
+      def line_break
+        ""
+      end
+
+      def indent_space
+        ' '
+      end
+
+      visitor_for CSS::RuleSet do |target|
+          target.selectors.map { |sel| sel.accept self }.join(", ") + " {" +
+          target.declarations.map { |decl| decl.accept self }.join +
+          " }"
+      end
+    end
   end
 end

data/test/test_parser.rb

@@ -87,5 +87,25 @@ module CSSPool
       eocss
       assert_match('foo(1, 2)', doc.to_css)
     end
+
+    def test_missing_semicolon
+      doc = CSSPool.CSS <<-eocss
+        div { border: none }
+      eocss
+      assert_match('none', doc.to_css)
+      doc = CSSPool.CSS <<-eocss
+        div { border: none; background: #fff }
+      eocss
+      assert_match('none', doc.to_css)
+      assert_match('#fff', doc.to_css)
+    end
+
+    def test_whitespaces
+      doc = CSSPool.CSS <<-eocss
+        div { border : none; }
+      eocss
+      assert_match('none', doc.to_css)
+      assert_match('border:', doc.to_css)
+    end
   end
 end

data/test/visitors/test_to_css.rb

@@ -260,6 +260,35 @@ module CSSPool
           assert_equal output, node.to_css
         end
       end
+
+      def test_minification
+        rawCSS = <<-eocss
+          p {
+            font: foo;
+            color: #f00;
+          }
+        eocss
+
+        doc = CSSPool.CSS rawCSS
+        parsed_doc = doc.to_minified_css
+
+        assert_equal "p { font: foo; color: #f00; }", parsed_doc
+      end
+
+      def test_minification_alt
+        rawCSS = <<-eocss
+          p {
+            font: foo;
+            color: #f00;
+          }
+        eocss
+
+        doc = CSSPool.CSS rawCSS
+        parsed_doc = doc.to_css :minify => true
+
+        assert_equal "p { font: foo; color: #f00; }", parsed_doc
+      end
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csspool
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-14 00:00:00.000000000 Z
+date: 2012-05-18 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &70178736571580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
+  type: :development
+  prerelease: false
+  version_requirements: *70178736571580
 - !ruby/object:Gem::Dependency
   name: racc
-  requirement: &70169574084020 !ruby/object:Gem::Requirement
+  requirement: &70178736571000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70169574084020
+  version_requirements: *70178736571000
 - !ruby/object:Gem::Dependency
   name: rexical
-  requirement: &70169574081520 !ruby/object:Gem::Requirement
+  requirement: &70178736570560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,29 +44,51 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70169574081520
+  version_requirements: *70178736570560
 - !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &70169574065400 !ruby/object:Gem::Requirement
+  name: hoe-git
+  requirement: &70178736586440 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70178736586440
+- !ruby/object:Gem::Dependency
+  name: hoe-gemspec
+  requirement: &70178736585440 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70178736585440
+- !ruby/object:Gem::Dependency
+  name: hoe-bundler
+  requirement: &70178736584560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70169574065400
+  version_requirements: *70178736584560
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70169574053500 !ruby/object:Gem::Requirement
+  requirement: &70178736583940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70169574053500
+  version_requirements: *70178736583940
 description: ! 'CSSPool is a CSS parser.  CSSPool provides a SAC interface for parsing
   CSS as
 
@@ -66,8 +99,8 @@ email:
 executables: []
 extensions: []
 extra_rdoc_files:
-- Manifest.txt
 - CHANGELOG.rdoc
+- Manifest.txt
 - README.rdoc
 files:
 - .autotest
@@ -155,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: csspool
-rubygems_version: 1.8.11
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: CSSPool is a CSS parser