Merge pull request reworkcss#1 from elegantcoder/master

improved atimport() for other at-rules.

Author: tj

index.js

@@ -200,9 +200,28 @@ module.exports = function(css){
    */
 
   function atimport() {
-    var m = match(/^@import *([^;\n]+);\s*/);
+    return _atruleSimple('import')
+  }
+
+  /**
+   * Parse charset
+   */
+
+  function atcharset() {
+    return _atruleSimple('charset');
+  }
+
+  /**
+   * Parse non-block at-rules
+   */
+
+  function _atruleSimple(ruleName) {
+    var m = match(new RegExp('^@'+ruleName+' *([^;\\n]+);\\s*'));
     if (!m) return;
-    return { import: m[1].trim() };
+
+    var ret = {}
+    ret[ruleName] = m[1].trim();
+    return ret;
   }
 
   /**
@@ -233,7 +252,8 @@ module.exports = function(css){
   function atrule() {
     return keyframes()
       || media()
-      || atimport();
+      || atimport()
+      || atcharset();
   }
 
   /**
@@ -248,4 +268,4 @@ module.exports = function(css){
   }
 
   return stylesheet();
-};
+};

test/cases/charset.css

@@ -0,0 +1,2 @@
+@charset "UTF-8";       /* Set the encoding of the style sheet to Unicode UTF-8*/
+@charset 'iso-8859-15'; /* Set the encoding of the style sheet to Latin-9 (Western European languages, with euro sign) */

test/cases/charset.json

@@ -0,0 +1,12 @@
+{
+  "stylesheet": {
+    "rules": [
+      {
+        "charset": "\"UTF-8\""
+      },
+      {
+        "charset": "'iso-8859-15'"
+      }
+    ]
+  }
+}