Honor strip_extension in SassMiddleware

asottile · asottile · commit 92d58f9bd152 · 2018-11-08T17:58:55.000-08:00
diff --git a/sasstests.py b/sasstests.py
@@ -731,6 +731,27 @@ def test_wsgi_sass_middleware(self):
             self.assertEqual(b'/static/not-exists.sass.css', r.data)
             assert r.mimetype == 'text/plain'
 
+    def test_wsgi_sass_middleware_without_extension(self):
+        with tempdir() as css_dir:
+            src_dir = os.path.join(css_dir, 'src')
+            shutil.copytree('test', src_dir)
+            app = SassMiddleware(
+                self.sample_wsgi_app, {
+                    __name__: {
+                        'sass_path': src_dir,
+                        'css_path': css_dir,
+                        'wsgi_path': '/static',
+                        'strip_extension': True,
+                    },
+                },
+            )
+            client = Client(app, Response)
+            r = client.get('/static/a.css')
+            assert r.status_code == 200
+            expected = A_EXPECTED_CSS_WITH_MAP.replace('.scss.css', '.css')
+            self.assertEqual(expected.encode(), r.data)
+            assert r.mimetype == 'text/css'
+
 
 class DistutilsTestCase(BaseTestCase):
 
diff --git a/sassutils/builder.py b/sassutils/builder.py
@@ -188,6 +188,20 @@ def resolve_filename(self, package_dir, filename):
         css_path = os.path.join(package_dir, self.css_path, css_filename)
         return sass_path, css_path
 
+    def unresolve_filename(self, filename):
+        """Retrieves the probable source path from the output filename.  Pass
+        in a .css path to get out a .scss path.
+
+        :param filename: the css filename
+        :type filename: :class:`str`
+        :returns: the scss filename
+        :rtype: :class:`str`
+        """
+        filename, _ = os.path.splitext(filename)
+        if self.strip_extension:
+            filename = filename + '.scss'
+        return filename
+
     def build(self, package_dir, output_style='nested'):
         """Builds the Sass/SCSS files in the specified :attr:`sass_path`.
         It finds :attr:`sass_path` and locates :attr:`css_path`
diff --git a/sassutils/wsgi.py b/sassutils/wsgi.py
@@ -125,7 +125,7 @@ def __call__(self, environ, start_response):
                 if not path.startswith(prefix):
                     continue
                 css_filename = path[len(prefix):]
-                sass_filename = css_filename[:-4]
+                sass_filename = manifest.unresolve_filename(css_filename)
                 try:
                     result = manifest.build_one(
                         package_dir,
