Merge branch 'master' of http://github.com/mintchaos/django_compressor

Author: heynemann

README.rst

@@ -129,7 +129,7 @@ be written to.
 ``COMPRESS_CSS_FILTERS``
 ------------------------
 
-:Default: ``[]``
+:Default: ``['compressor.filters.css_default.CssAbsoluteFilter]``
 
 A list of filters that will be applied to CSS.
 

compressor/conf/settings.py

@@ -8,7 +8,7 @@
 STORAGE = getattr(settings, 'COMPRESS_STORAGE', 'compressor.storage.CompressorFileStorage')
 
 COMPRESS = getattr(settings, 'COMPRESS', not settings.DEBUG)
-COMPRESS_CSS_FILTERS = getattr(settings, 'COMPRESS_CSS_FILTERS', [])
+COMPRESS_CSS_FILTERS = getattr(settings, 'COMPRESS_CSS_FILTERS', ['compressor.filters.css_default.CssAbsoluteFilter'])
 COMPRESS_JS_FILTERS = getattr(settings, 'COMPRESS_JS_FILTERS', ['compressor.filters.jsmin.JSMinFilter'])
 
 COMPRESS_LESSC_BINARY = getattr(settings, 'COMPRESS_LESSC_BINARY', 'lessc')

compressor/css.py

@@ -9,8 +9,7 @@ def __init__(self, content, output_prefix="css"):
         self.extension = ".css"
         self.template_name = "compressor/css.html"
         self.template_name_inline = "compressor/css_inline.html"
-        self.filters = ['compressor.filters.css_default.CssAbsoluteFilter']
-        self.filters.extend(settings.COMPRESS_CSS_FILTERS)
+        self.filters = list(settings.COMPRESS_CSS_FILTERS)
         self.type = 'css'
         super(CssCompressor, self).__init__(content, output_prefix)
 

compressor/filters/css_default.py

@@ -6,6 +6,9 @@
 from compressor.conf import settings
 from compressor.utils import get_hexdigest, get_mtime
 
+URL_PATTERN = re.compile(r'url\(([^\)]+)\)')
+
+
 class CssAbsoluteFilter(FilterBase):
     def input(self, filename=None, **kwargs):
         media_root = os.path.abspath(settings.MEDIA_ROOT)
@@ -28,8 +31,7 @@ def input(self, filename=None, **kwargs):
             self.media_url = '/'.join(parts[2:])
             self.protocol = '%s/' % '/'.join(parts[:2])
         self.directory_name = '/'.join([self.media_url, os.path.dirname(self.media_path)])
-        url_pattern = re.compile(r'url\(([^\)]+)\)')
-        output = url_pattern.sub(self.url_converter, self.content)
+        output = URL_PATTERN.sub(self.url_converter, self.content)
         return output
 
     def add_mtime(self, url):

setup.py

@@ -8,7 +8,7 @@ def read(fname):
 
 setup(
     name = "django_compressor",
-    version = "0.6a1",
+    version = "0.6a2",
     url = 'http://github.com/mintchaos/django_compressor',
     license = 'BSD',
     description = "Compresses linked and inline javascript or CSS into a single cached file.",