Merge pull request #260 from lunkwill42/strip-extensions-from-build-directory

asottile · web-flow · commit 8eedaa644074 · 2018-08-23T06:32:17.000-07:00
Honor strip_extension option when building entire directory structures from distutils
diff --git a/sasstests.py b/sasstests.py
@@ -635,7 +635,7 @@ def replace_source_path(s, name):
             )
 
 
-def test_manifest_strip_extension(tmpdir):
+def test_manifest_build_one_strip_extension(tmpdir):
     src = tmpdir.join('test').ensure_dir()
     src.join('a.scss').write('a{b: c;}')
 
@@ -645,6 +645,16 @@ def test_manifest_strip_extension(tmpdir):
     assert tmpdir.join('css/a.css').read() == 'a {\n  b: c; }\n'
 
 
+def test_manifest_build_strip_extension(tmpdir):
+    src = tmpdir.join('test').ensure_dir()
+    src.join('x.scss').write('a{b: c;}')
+
+    m = Manifest(sass_path='test', css_path='css', strip_extension=True)
+    m.build(package_dir=str(tmpdir))
+
+    assert tmpdir.join('css/x.css').read() == 'a {\n  b: c; }\n'
+
+
 class WsgiTestCase(BaseTestCase):
 
     @staticmethod
diff --git a/sassutils/builder.py b/sassutils/builder.py
@@ -27,7 +27,7 @@
 
 
 def build_directory(sass_path, css_path, output_style='nested',
-                    _root_sass=None, _root_css=None):
+                    _root_sass=None, _root_css=None, strip_extension=False):
     """Compiles all Sass/SCSS files in ``path`` to CSS.
 
     :param sass_path: the path of the directory which contains source files
@@ -58,6 +58,8 @@ def build_directory(sass_path, css_path, output_style='nested',
             if name[0] == '_':
                 # Do not compile if it's partial
                 continue
+            if strip_extension:
+                name, _ = os.path.splitext(name)
             css_fullname = os.path.join(css_path, name) + '.css'
             css = compile(filename=sass_fullname,
                           output_style=output_style,
@@ -73,7 +75,8 @@ def build_directory(sass_path, css_path, output_style='nested',
             subresult = build_directory(sass_fullname, css_fullname,
                                         output_style=output_style,
                                         _root_sass=_root_sass,
-                                        _root_css=_root_css)
+                                        _root_css=_root_css,
+                                        strip_extension=strip_extension)
             result.update(subresult)
     return result
 
@@ -201,7 +204,8 @@ def build(self, package_dir, output_style='nested'):
         css_path = os.path.join(package_dir, self.css_path)
         css_files = build_directory(
             sass_path, css_path,
-            output_style=output_style
+            output_style=output_style,
+            strip_extension=self.strip_extension
         ).values()
         return frozenset(os.path.join(self.css_path, filename)
                          for filename in css_files)
