Fixes attribute parsing bug where comments include braces

zmoazeni · zmoazeni · commit 2f54e7909080 · 2013-04-21T00:01:39.000-04:00
Also refactored out the dynamic bit in favor of present?/absent? logic. Slowly getting the hang of those conditionals. refs: zmoazeni#29
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## (Unreleased) ##
+
+* Fixes attribute parsing bug that includes comments with braces
+
 ## 1.3.1 - 4/20/2013 ##
 
 * Fixes --ignore-sass-mixins bug with @importing
diff --git a/lib/csscss/parser/css.rb b/lib/csscss/parser/css.rb
@@ -12,26 +12,22 @@ def parse(source)
       class Parser < Parslet::Parser
         include Common
 
-        rule(:comment) {
-          (space? >> str('/*') >> (str('*/').absent? >> any).repeat >> str('*/') >> space?).as(:comment)
-        }
-
-        rule(:css_space?) {
-          comment.repeat(1) | space?
+        rule(:raw_comment) {
+          space? >> str('/*') >> (str('*/').absent? >> any).repeat >> str('*/') >> space?
         }
+        rule(:comment) { raw_comment.as(:comment) }
 
         rule(:blank_attribute) { str(";") >> space? }
 
+        rule(:attribute_value) { (str('/*').absent? >> match["^;}"]) | raw_comment }
+
         rule(:attribute) {
           match["^:{}"].repeat(1).as(:property) >>
           str(":") >>
-          (match["^;}"].repeat(1).capture(:stuff) >> dynamic {|source, context|
-            if context.captures[:stuff].to_s =~ /data:/
-              str(";") >> match["^;}"].repeat(1)
-            else
-              any.present?
-            end
-          }).as(:value) >>
+          (
+            (stri("data:").absent? >> attribute_value) |
+            (stri("data:").present? >> attribute_value.repeat(1) >> str(";") >> attribute_value.repeat(1))
+          ).repeat(1).as(:value) >>
           str(";").maybe >>
           space?
         }
diff --git a/test/csscss/parser/css_test.rb b/test/csscss/parser/css_test.rb
@@ -23,14 +23,14 @@ module Css
         end
 
         it "parses comments" do
-          @parser.css_space?.must_parse "/* foo */"
-          @parser.css_space?.must_parse %$
+          @parser.comment.must_parse "/* foo */"
+          @parser.comment.must_parse %$
           /* foo
            * bar
            */
           $
 
-          @parser.css_space?.must_parse %$
+          @parser.comment.repeat(1).must_parse %$
             /* foo */
             /* bar */
           $
@@ -63,11 +63,13 @@ module Css
           */
           .bar { border: 1px solid black /* sdflk */ }
           .baz { background: white /* sdflk */ }
+          .baz2 { background: white /* {sdflk} */ }
         $
 
         trans(css).must_equal([
           rs(sel(".bar"), [dec("border", "1px solid black /* sdflk */")]),
-          rs(sel(".baz"), [dec("background", "white /* sdflk */")])
+          rs(sel(".baz"), [dec("background", "white /* sdflk */")]),
+          rs(sel(".baz2"), [dec("background", "white /* {sdflk} */")])
         ])
       end
 
