Add output_style option to build_directory()

dahlia · dahlia · commit 607b141c7f26 · 2014-10-27T05:04:17.000+09:00
diff --git a/docs/changes.rst b/docs/changes.rst
@@ -22,6 +22,8 @@ To be released.
   :const:`bool` instead of :const:`str`.  String values like ``'none'``,
   ``'line_numbers'``, and ``'map'`` become deprecated, and will be obsolete
   soon.
+- :func:`~sassutils.builder.build_directory()` function has a new optional
+  parameter ``output_style``.
 
 __ https://github.com/sass/libsass/releases/tag/3.0
 .. _partial import: http://sass-lang.com/documentation/file.SASS_REFERENCE.html#partials
diff --git a/sasstests.py b/sasstests.py
@@ -305,40 +305,58 @@ def test_regression_issue_11(self):
 
 class BuilderTestCase(unittest.TestCase):
 
+    def setUp(self):
+        self.temp_path = tempfile.mkdtemp()
+        self.sass_path = os.path.join(self.temp_path, 'sass')
+        self.css_path = os.path.join(self.temp_path, 'css')
+        shutil.copytree('test', self.sass_path)
+
+    def tearDown(self):
+        shutil.rmtree(self.temp_path)
+
     def test_builder_build_directory(self):
-        temp_path = tempfile.mkdtemp()
-        sass_path = os.path.join(temp_path, 'sass')
-        css_path = os.path.join(temp_path, 'css')
-        shutil.copytree('test', sass_path)
-        result_files = build_directory(sass_path, css_path)
-        assert len(result_files) == 6
-        assert result_files['a.scss'] == 'a.scss.css'
+        css_path = self.css_path
+        result_files = build_directory(self.sass_path, css_path)
+        self.assertEqual(6, len(result_files))
+        self.assertEqual('a.scss.css', result_files['a.scss'])
         with open(os.path.join(css_path, 'a.scss.css'), **utf8_if_py3) as f:
             css = f.read()
-        assert css == A_EXPECTED_CSS
-        assert result_files['b.scss'] == 'b.scss.css'
+        self.assertEqual(A_EXPECTED_CSS, css)
+        self.assertEqual('b.scss.css', result_files['b.scss'])
         with open(os.path.join(css_path, 'b.scss.css'), **utf8_if_py3) as f:
             css = f.read()
-        assert css == B_EXPECTED_CSS
-        assert result_files['c.scss'] == 'c.scss.css'
+        self.assertEqual(B_EXPECTED_CSS, css)
+        self.assertEqual('c.scss.css', result_files['c.scss'])
         with open(os.path.join(css_path, 'c.scss.css'), **utf8_if_py3) as f:
             css = f.read()
-        assert css == C_EXPECTED_CSS
-        assert result_files['d.scss'] == 'd.scss.css'
+        self.assertEqual(C_EXPECTED_CSS, css)
+        self.assertEqual('d.scss.css', result_files['d.scss'])
         with open(os.path.join(css_path, 'd.scss.css'), **utf8_if_py3) as f:
             css = f.read()
         self.assertEqual(D_EXPECTED_CSS, css)
-        assert result_files['e.scss'] == 'e.scss.css'
+        self.assertEqual('e.scss.css', result_files['e.scss'])
         with open(os.path.join(css_path, 'e.scss.css'), **utf8_if_py3) as f:
             css = f.read()
-        assert css == E_EXPECTED_CSS
-        assert (result_files[os.path.join('subdir', 'recur.scss')] ==
-                os.path.join('subdir', 'recur.scss.css'))
+        self.assertEqual(E_EXPECTED_CSS, css)
+        self.assertEqual(
+            os.path.join('subdir', 'recur.scss.css'),
+            result_files[os.path.join('subdir', 'recur.scss')]
+        )
         with open(os.path.join(css_path, 'subdir', 'recur.scss.css'),
                   **utf8_if_py3) as f:
             css = f.read()
         self.assertEqual(SUBDIR_RECUR_EXPECTED_CSS, css)
-        shutil.rmtree(temp_path)
+
+    def test_output_style(self):
+        css_path = self.css_path
+        result_files = build_directory(self.sass_path, css_path,
+                                       output_style='compressed')
+        self.assertEqual(6, len(result_files))
+        self.assertEqual('a.scss.css', result_files['a.scss'])
+        with open(os.path.join(css_path, 'a.scss.css'), **utf8_if_py3) as f:
+            css = f.read()
+        self.assertEqual('body{background-color:green}body a{color:blue}',
+                         css)
 
 
 class ManifestTestCase(unittest.TestCase):
diff --git a/sassutils/builder.py b/sassutils/builder.py
@@ -25,17 +25,25 @@
 SUFFIX_PATTERN = re.compile('[.](' + '|'.join(map(re.escape, SUFFIXES)) + ')$')
 
 
-def build_directory(sass_path, css_path, _root_sass=None, _root_css=None):
+def build_directory(sass_path, css_path, output_style='nested',
+                    _root_sass=None, _root_css=None):
     """Compiles all SASS/SCSS files in ``path`` to CSS.
 
     :param sass_path: the path of the directory which contains source files
                       to compile
     :type sass_path: :class:`str`, :class:`basestring`
     :param css_path: the path of the directory compiled CSS files will go
     :type css_path: :class:`str`, :class:`basestring`
+    :param output_style: an optional coding style of the compiled result.
+                         choose one of: ``'nested'`` (default), ``'expanded'``,
+                         ``'compact'``, ``'compressed'``
+    :type output_style: :class:`str`
     :returns: a dictionary of source filenames to compiled CSS filenames
     :rtype: :class:`collections.Mapping`
 
+    .. versionadded:: 0.6.0
+       The ``output_style`` parameter.
+
     """
     if _root_sass is None or _root_css is None:
         _root_sass = sass_path
@@ -50,15 +58,19 @@ def build_directory(sass_path, css_path, _root_sass=None, _root_css=None):
                 # Do not compile if it's partial
                 continue
             css_fullname = os.path.join(css_path, name) + '.css'
-            css = compile(filename=sass_fullname, include_paths=[_root_sass])
+            css = compile(filename=sass_fullname,
+                          output_style=output_style,
+                          include_paths=[_root_sass])
             with io.open(css_fullname, 'w', encoding='utf-8') as css_file:
                 css_file.write(css)
             result[os.path.relpath(sass_fullname, _root_sass)] = \
                 os.path.relpath(css_fullname, _root_css)
         elif os.path.isdir(sass_fullname):
             css_fullname = os.path.join(css_path, name)
             subresult = build_directory(sass_fullname, css_fullname,
-                                        _root_sass, _root_css)
+                                        output_style=output_style,
+                                        _root_sass=_root_sass,
+                                        _root_css=_root_css)
             result.update(subresult)
     return result
 
