From 10ecc0e1248fcc8fd923d8ed8b6a7d45d9d82125 Mon Sep 17 00:00:00 2001 From: Maor Ben-Dayan Date: Sun, 17 Jul 2011 19:38:43 +0300 Subject: [PATCH] Added COMPRESS_COMPASS_IMAGES_DIR option to allow a more flexible support of sprites. Closes #87. --- compressor/conf.py | 4 ++++ compressor/filters/compass.py | 4 ++-- docs/settings.txt | 3 +++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/compressor/conf.py b/compressor/conf.py index b51085c..8f8eeef 100644 --- a/compressor/conf.py +++ b/compressor/conf.py @@ -43,6 +43,7 @@ class CompressorSettings(AppSettings): COMPASS_BINARY = 'compass' COMPASS_ARGUMENTS = ' --no-line-comments --output-style expanded' COMPASS_PLUGINS = [] + COMPASS_IMAGES_DIR = 'images/' # the cache backend to use CACHE_BACKEND = None @@ -115,4 +116,7 @@ class CompressorSettings(AppSettings): "must be a list or tuple. Check for missing commas.") return value + def configure_compass_images_dir(self, value): + return self.configure_url(value) + settings = CompressorSettings(prefix="COMPRESS") diff --git a/compressor/filters/compass.py b/compressor/filters/compass.py index 740bb5b..743401f 100644 --- a/compressor/filters/compass.py +++ b/compressor/filters/compass.py @@ -31,10 +31,10 @@ class CompassFilter(CompilerFilter): ('tmpdir', tmpdir), ('sassdir', parentdir), ('outfile', path.join(tmpdir, outfile_name)), - ('imagedir', settings.COMPRESS_URL), + ('imagesdir', settings.COMPRESS_COMPASS_IMAGES_DIR), ) for plugin in settings.COMPRESS_COMPASS_PLUGINS: self.command += ' --require %s' % plugin self.command += (' --sass-dir {sassdir} --css-dir {tmpdir}' - ' --image-dir {imagedir} {infile}') + ' --images-dir {imagesdir} {infile}') return super(CompassFilter, self).input(*args, **kwargs) diff --git a/docs/settings.txt b/docs/settings.txt index 9d2a97a..ec985c2 100644 --- a/docs/settings.txt +++ b/docs/settings.txt @@ -115,6 +115,9 @@ A filter that runs Compass_'s compile command. **(BETA)** compass' require option e.g. ``['my_plugin']`` leads to passing ``--require my_plugin``. +- ``COMPRESS_COMPASS_IMAGES_DIR`` -- The directory where you keep your images, + pass as ``--images-dir`` to the compass compiler. Defaults to ``'images/'``. + .. _CSSTidy: http://csstidy.sourceforge.net/ .. _`data: URIs`: http://en.wikipedia.org/wiki/Data_URI_scheme .. _cssmin: http://pypi.python.org/pypi/cssmin/