Merge lp:~sidnei/lazr-js/faster-url-rewrite into lp:lazr-js

[Sidnei da Silva]

- Use re.sub() for faster rewriting of the URLs. Sidestep the
  serializer completely unless asked for minification.

[Paul Hummer (rockstar)]

review: Approve

=== modified file 'src-py/lazr/js/build.py'
--- src-py/lazr/js/build.py	2011-01-03 23:59:53 +0000
+++ src-py/lazr/js/build.py	2011-01-03 23:59:53 +0000
@@ -22,6 +22,7 @@
 
 ESCAPE_STAR_PROPERTY_RE = re.compile(r'\*([a-zA-Z0-9_-]+):')
 UNESCAPE_STAR_PROPERTY_RE = re.compile(r'([a-zA-Z0-9_-]+)_ie_star_hack:')
+URL_RE = re.compile("url\([ \"\']*([^ \"\']+)[ \"\']*\)")
 
 from jsmin import JavascriptMinify
 
@@ -167,32 +168,29 @@
 
     def filter_file_content(self, file_content, path):
         """URLs are made relative to the target and the CSS is minified."""
-        if not (self.minify or self.rewrite_urls):
-            return file_content + "\n"
+        if self.rewrite_urls:
+            src_dir = os.path.dirname(path)
+            def fix_relative_url(match):
+                url = match.group(1)
+                return "url(%s)" % self.fix_relative_url(url, src_dir)
+            file_content = URL_RE.sub(fix_relative_url, file_content)
 
-        old_serializer = cssutils.ser
-        cssutils.setSerializer(cssutils.serialize.CSSSerializer())
-        try:
-            if self.minify:
+        if self.minify:
+            old_serializer = cssutils.ser
+            cssutils.setSerializer(cssutils.serialize.CSSSerializer())
+            try:
                 cssutils.ser.prefs.useMinified()
 
-            stylesheet = ESCAPE_STAR_PROPERTY_RE.sub(
-                r'\1_ie_star_hack:', file_content)
-            parser = cssutils.CSSParser(raiseExceptions=True)
-            css = parser.parseString(stylesheet)
-
-            if self.rewrite_urls:
-                def fix_relative_url(url):
-                    src_dir = os.path.dirname(path)
-                    return self.fix_relative_url(url, src_dir)
-
-                cssutils.replaceUrls(css, fix_relative_url)
-
-            stylesheet = UNESCAPE_STAR_PROPERTY_RE.sub(
-                r'*\1:', css.cssText)
-            return stylesheet + "\n"
-        finally:
-            cssutils.setSerializer(old_serializer)
+                stylesheet = ESCAPE_STAR_PROPERTY_RE.sub(
+                    r'\1_ie_star_hack:', file_content)
+                parser = cssutils.CSSParser(raiseExceptions=True)
+                css = parser.parseString(stylesheet)
+                stylesheet = UNESCAPE_STAR_PROPERTY_RE.sub(
+                    r'*\1:', css.cssText)
+                return stylesheet + "\n"
+            finally:
+                cssutils.setSerializer(old_serializer)
+        return file_content + "\n"
 
 
 class Builder:

=== modified file 'src-py/lazr/js/tests/test_combo.py'
--- src-py/lazr/js/tests/test_combo.py	2011-01-03 23:59:53 +0000
+++ src-py/lazr/js/tests/test_combo.py	2011-01-03 23:59:53 +0000
@@ -113,34 +113,33 @@
             self.makeSampleFile(
                 test_dir,
                 os.path.join("widget", "assets", "skins", "sam", "widget.css"),
-                """\
-                /* widget skin */
-                .yui-widget {
-                   background: url("img/bg.png");
-                }
-                """),
+                "\n".join(
+                    ('/* widget skin */',
+                     '.yui-widget {',
+                     '   background: url("img/bg.png");',
+                     '}'))
+                ),
             self.makeSampleFile(
                 test_dir,
                 os.path.join("editor", "assets", "skins", "sam", "editor.css"),
-                """\
-                /* editor skin */
-                .yui-editor {
-                   background: url("img/bg.png");
-                }
-                """),
+                "\n".join(('/* editor skin */',
+                           '.yui-editor {',
+                           '   background: url("img/bg.png");',
+                           '}'))
+                ),
             ]
 
         expected = "\n".join(
             ("/* widget/assets/skins/sam/widget.css */",
              "/* widget skin */",
              ".yui-widget {",
-             "    background: url(widget/assets/skins/sam/img/bg.png)",
-             "    }",
+             "   background: url(widget/assets/skins/sam/img/bg.png);",
+             "}",
              "/* editor/assets/skins/sam/editor.css */",
              "/* editor skin */",
              ".yui-editor {",
-             "    background: url(editor/assets/skins/sam/img/bg.png)",
-             "    }",
+             "   background: url(editor/assets/skins/sam/img/bg.png);",
+             "}",
              ))
         self.assertEquals(
             "".join(combine_files(["widget/assets/skins/sam/widget.css",