change "selector" to "selectors" array

tj · tj · commit dc259639527c · 2012-07-26T05:56:49.000-07:00
diff --git a/Readme.md b/Readme.md
@@ -19,7 +19,7 @@ object returned:
   "stylesheet": {
     "rules": [
       {
-        "selector": "tobi",
+        "selectors": ["tobi"],
         "declarations": [
           {
             "property": "name",
diff --git a/index.js b/index.js
@@ -96,7 +96,7 @@ module.exports = function(css){
   function selector() {
     var m = match(/^([^{]+)/);
     if (!m) return;
-    return m[0].trim();
+    return m[0].trim().split(/\s*,\s*/);
   }
 
   /**
@@ -245,7 +245,7 @@ module.exports = function(css){
     var sel = selector();
     if (!sel) return;
     comments();
-    return { selector: sel, declarations: declarations() };
+    return { selectors: sel, declarations: declarations() };
   }
   
   return stylesheet();
diff --git a/test/cases/comment.json b/test/cases/comment.json
@@ -2,7 +2,9 @@
   "stylesheet": {
     "rules": [
       {
-        "selector": "foo",
+        "selectors": [
+          "foo"
+        ],
         "declarations": [
           {
             "property": "bar",
diff --git a/test/cases/media.json b/test/cases/media.json
@@ -5,7 +5,9 @@
         "media": "screen, projection",
         "rules": [
           {
-            "selector": "html",
+            "selectors": [
+              "html"
+            ],
             "declarations": [
               {
                 "property": "background",
@@ -18,7 +20,9 @@
             ]
           },
           {
-            "selector": "body",
+            "selectors": [
+              "body"
+            ],
             "declarations": [
               {
                 "property": "max-width",
@@ -36,7 +40,9 @@
         "media": "print",
         "rules": [
           {
-            "selector": "html",
+            "selectors": [
+              "html"
+            ],
             "declarations": [
               {
                 "property": "background",
@@ -49,7 +55,9 @@
             ]
           },
           {
-            "selector": "body",
+            "selectors": [
+              "body"
+            ],
             "declarations": [
               {
                 "property": "padding",
diff --git a/test/cases/media.messed.json b/test/cases/media.messed.json
@@ -5,7 +5,9 @@
         "media": "screen, projection",
         "rules": [
           {
-            "selector": "html",
+            "selectors": [
+              "html"
+            ],
             "declarations": [
               {
                 "property": "background",
@@ -18,7 +20,9 @@
             ]
           },
           {
-            "selector": "body",
+            "selectors": [
+              "body"
+            ],
             "declarations": [
               {
                 "property": "max-width",
@@ -36,7 +40,9 @@
         "media": "print",
         "rules": [
           {
-            "selector": "html",
+            "selectors": [
+              "html"
+            ],
             "declarations": [
               {
                 "property": "background",
@@ -49,7 +55,9 @@
             ]
           },
           {
-            "selector": "body",
+            "selectors": [
+              "body"
+            ],
             "declarations": [
               {
                 "property": "padding",
diff --git a/test/cases/messed-up.json b/test/cases/messed-up.json
@@ -2,7 +2,9 @@
   "stylesheet": {
     "rules": [
       {
-        "selector": "body",
+        "selectors": [
+          "body"
+        ],
         "declarations": [
           {
             "property": "foo\n  ",
@@ -11,7 +13,9 @@
         ]
       },
       {
-        "selector": "body",
+        "selectors": [
+          "body"
+        ],
         "declarations": [
           {
             "property": "foo",
@@ -24,7 +28,9 @@
         ]
       },
       {
-        "selector": "body",
+        "selectors": [
+          "body"
+        ],
         "declarations": [
           {
             "property": "foo\n     ",
diff --git a/test/cases/no-semi.json b/test/cases/no-semi.json
@@ -2,7 +2,9 @@
   "stylesheet": {
     "rules": [
       {
-        "selector": "tobi loki jane",
+        "selectors": [
+          "tobi loki jane"
+        ],
         "declarations": [
           {
             "property": "are",
diff --git a/test/cases/props.json b/test/cases/props.json
@@ -2,7 +2,9 @@
   "stylesheet": {
     "rules": [
       {
-        "selector": "tobi loki jane",
+        "selectors": [
+          "tobi loki jane"
+        ],
         "declarations": [
           {
             "property": "are",
diff --git a/test/cases/rule.json b/test/cases/rule.json
@@ -2,7 +2,9 @@
   "stylesheet": {
     "rules": [
       {
-        "selector": "foo",
+        "selectors": [
+          "foo"
+        ],
         "declarations": [
           {
             "property": "bar",
diff --git a/test/cases/rules.json b/test/cases/rules.json
@@ -2,7 +2,9 @@
   "stylesheet": {
     "rules": [
       {
-        "selector": "tobi",
+        "selectors": [
+          "tobi"
+        ],
         "declarations": [
           {
             "property": "name",
@@ -11,7 +13,9 @@
         ]
       },
       {
-        "selector": "loki",
+        "selectors": [
+          "loki"
+        ],
         "declarations": [
           {
             "property": "name",

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ object returned:`
`19`	`19`	`"stylesheet": {`
`20`	`20`	`"rules": [`
`21`	`21`	`{`
`22`		`- "selector": "tobi",`
	`22`	`+ "selectors": ["tobi"],`
`23`	`23`	`"declarations": [`
`24`	`24`	`{`
`25`	`25`	`"property": "name",`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,9 @@`
`2`	`2`	`"stylesheet": {`
`3`	`3`	`"rules": [`
`4`	`4`	`{`
`5`		`- "selector": "foo",`
	`5`	`+ "selectors": [`
	`6`	`+ "foo"`
	`7`	`+ ],`
`6`	`8`	`"declarations": [`
`7`	`9`	`{`
`8`	`10`	`"property": "bar",`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,9 @@`
`5`	`5`	`"media": "screen, projection",`
`6`	`6`	`"rules": [`
`7`	`7`	`{`
`8`		`- "selector": "html",`
	`8`	`+ "selectors": [`
	`9`	`+ "html"`
	`10`	`+ ],`
`9`	`11`	`"declarations": [`
`10`	`12`	`{`
`11`	`13`	`"property": "background",`
`@@ -18,7 +20,9 @@`
`18`	`20`	`]`
`19`	`21`	`},`
`20`	`22`	`{`
`21`		`- "selector": "body",`
	`23`	`+ "selectors": [`
	`24`	`+ "body"`
	`25`	`+ ],`
`22`	`26`	`"declarations": [`
`23`	`27`	`{`
`24`	`28`	`"property": "max-width",`
`@@ -36,7 +40,9 @@`
`36`	`40`	`"media": "print",`
`37`	`41`	`"rules": [`
`38`	`42`	`{`
`39`		`- "selector": "html",`
	`43`	`+ "selectors": [`
	`44`	`+ "html"`
	`45`	`+ ],`
`40`	`46`	`"declarations": [`
`41`	`47`	`{`
`42`	`48`	`"property": "background",`
`@@ -49,7 +55,9 @@`
`49`	`55`	`]`
`50`	`56`	`},`
`51`	`57`	`{`
`52`		`- "selector": "body",`
	`58`	`+ "selectors": [`
	`59`	`+ "body"`
	`60`	`+ ],`
`53`	`61`	`"declarations": [`
`54`	`62`	`{`
`55`	`63`	`"property": "padding",`