Fixes a bug with nested media queries

There was a double issue, one with spacing and apparently media queries
can be nested.

Author: zmoazeni

CHANGELOG.md

@@ -3,6 +3,7 @@
 * Fixes attribute parsing bug that includes comments with braces
 * Fixes parsing bug with empty media selectors #67
 * Fixes parsing bug with quoted brackets #72
+* Fixes parsing bug with nested media queries #73
 
 ## 1.3.1 - 4/20/2013 ##
 

lib/csscss/parser/css.rb

@@ -66,7 +66,8 @@ class Parser < Parslet::Parser
             str("@") >>
             match["^{}"].repeat(1) >>
             str("{") >>
-            (comment | ruleset).repeat(1) >>
+            space? >>
+            (comment | ruleset | nested_ruleset).repeat(1) >>
             str("}") >>
             space?
           ).as(:nested_ruleset)
@@ -94,8 +95,8 @@ class Parser < Parslet::Parser
       end
 
       class Transformer < Parslet::Transform
-        rule(nested_ruleset: sequence(:rulesets)) {
-          rulesets
+        rule(nested_ruleset: subtree(:rulesets)) { |context|
+          context[:rulesets].flatten
         }
 
         rule(import: simple(:import)) { [] }

test/csscss/parser/css_test.rb

@@ -119,6 +119,15 @@ module Css
             }
           }
 
+          @media only screen {
+            @-webkit-keyframes webkitSiblingBugfix {
+              from { position: relative; }
+              to { position: relative; }
+            }
+
+            a { position: relative }
+          }
+
           h1 {
             outline: 1px;
           }
@@ -127,6 +136,9 @@ module Css
         trans(css).must_equal([
           rs(sel("#foo"), [dec("background-color", "black")]),
           rs(sel("#bar"), [dec("display", "none")]),
+          rs(sel("from"), [dec("position", "relative")]),
+          rs(sel("to"), [dec("position", "relative")]),
+          rs(sel("a"), [dec("position", "relative")]),
           rs(sel("h1"), [dec("outline", "1px")])
         ])
       end