Options.output_style field

Author: dahlia

sass.c

@@ -6,20 +6,44 @@ typedef struct {
     struct sass_options options;
 } sass_OptionsObject;
 
+static struct {
+    char *label;
+    int value;
+} sass_Options_output_style_enum[] = {
+    {"nested", SASS_STYLE_NESTED},
+    {"expanded", SASS_STYLE_EXPANDED},
+    {"compact", SASS_STYLE_COMPACT},
+    {"compressed", SASS_STYLE_COMPRESSED},
+    {NULL}
+};
+
 static int
 sass_Options_init(sass_OptionsObject *self, PyObject *args, PyObject *kwds)
 {
-    static char *sig[] = {"include_paths", "image_path", NULL};
-    PyObject *include_paths, *image_path, *item;
+    static char *sig[] = {"output_style", "include_paths", "image_path", NULL};
+    PyObject *output_style, *include_paths, *image_path, *item;
     char *include_paths_cstr, *item_buffer, *image_path_cstr;
     size_t include_paths_len, include_paths_size, i, offset, item_size,
            image_path_size;
-    if (!PyArg_ParseTupleAndKeywords(args, kwds, "OS", sig,
-                                     &include_paths, &image_path)) {
+    if (!PyArg_ParseTupleAndKeywords(args, kwds, "SOS", sig,
+                                     &output_style, &include_paths,
+                                     &image_path)) {
         return -1;
     }
 
-    self->options.output_style = SASS_STYLE_NESTED;
+    for (i = 0; sass_Options_output_style_enum[i].label; ++i) {
+        if (0 == strncmp(PyString_AsString(output_style),
+                         sass_Options_output_style_enum[i].label,
+                         PyString_Size(output_style))) {
+            self->options.output_style =
+                sass_Options_output_style_enum[i].value;
+            break;
+        }
+    }
+    if (sass_Options_output_style_enum[i].label == NULL) {
+        PyErr_SetString(PyExc_ValueError, "invalid output_style option");
+        return -1;
+    }
 
     if (include_paths == Py_None) {
         PyErr_SetString(PyExc_TypeError, "include_paths must not be None");
@@ -104,6 +128,27 @@ sass_Options_dealloc(sass_OptionsObject *self)
     self->ob_type->tp_free((PyObject *) self);
 }
 
+static PyObject *
+sass_Options_get_output_style(sass_OptionsObject *self, void *closure)
+{
+    int value;
+    PyObject *label;
+    size_t i;
+
+    value = self->options.output_style;
+    for (i = 0; sass_Options_output_style_enum[i].label; ++i) {
+        if (value == sass_Options_output_style_enum[i].value) {
+            label = PyString_FromString(
+                sass_Options_output_style_enum[i].label);
+            Py_INCREF(label);
+            return label;
+        }
+    }
+
+    PyErr_Format(PyExc_ValueError, "output_style is invalid (%d)", value);
+    return NULL;
+}
+
 static PyObject *
 sass_Options_get_include_paths(sass_OptionsObject *self, void *closure)
 {
@@ -145,6 +190,8 @@ sass_Options_get_image_path(sass_OptionsObject *self, void *closure)
 }
 
 static PyGetSetDef sass_Options_getset[] = {
+    {"output_style", (getter) sass_Options_get_output_style, NULL,
+     "The string value of output style option."},
     {"include_paths", (getter) sass_Options_get_include_paths, NULL,
      "The list of paths to include."},
     {"image_path", (getter) sass_Options_get_image_path, NULL,

sasstests.py

@@ -9,27 +9,42 @@
 suite = Tests()
 
 
+@suite.test
+def options_output_style():
+    for style in 'nested', 'expanded', 'compact', 'compressed':
+        o = Options(output_style=style, include_paths='a:b', image_path='')
+        assert o.output_style == style
+    with raises(TypeError):
+        Options(output_style=None, include_paths='a:b', image_path='')
+    with raises(TypeError):
+        Options(output_style=123, include_paths='a:b', image_path='')
+    with raises(TypeError):
+        Options(output_style=['abc'], include_paths='a:b', image_path='')
+    with raises(ValueError):
+        Options(output_style='abc', include_paths='a:b', image_path='')
+
+
 @suite.test
 def options_include_paths():
-    o = Options(include_paths='ab/cd:de/fg', image_path='')
+    o = Options('nested', include_paths='ab/cd:de/fg', image_path='')
     assert o.include_paths == ['ab/cd', 'de/fg']
-    o = Options(include_paths=['li/st', 'te/st'], image_path='')
+    o = Options('nested', include_paths=['li/st', 'te/st'], image_path='')
     assert o.include_paths == ['li/st', 'te/st']
-    o = Options(include_paths=('tup/le', 'te/st'), image_path='')
+    o = Options('nested', include_paths=('tup/le', 'te/st'), image_path='')
     assert o.include_paths == ['tup/le', 'te/st']
     with raises(TypeError):
-        Options(include_paths=None, image_path='a/b')
+        Options('nested', include_paths=None, image_path='a/b')
     with raises(TypeError):
-        Options(include_paths=123, image_path='a/b')
+        Options('nested', include_paths=123, image_path='a/b')
 
 
 @suite.test
 def options_image_path():
-    o = Options(include_paths='a:b', image_path='image/path')
+    o = Options('nested', include_paths='a:b', image_path='image/path')
     assert o.image_path == 'image/path'
     with raises(TypeError):
-        Options(include_paths='a:b', image_path=None)
+        Options('nested', include_paths='a:b', image_path=None)
     with raises(TypeError):
-        Options(include_paths='a:b', image_path=123)
+        Options('nested', include_paths='a:b', image_path=123)
     with raises(TypeError):
-        Options(include_paths='a:b', image_path=['a/b', 'c/d'])
+        Options('nested', include_paths='a:b', image_path=['a/b', 'c/d'])