From 0bf3d32c8ef794bf691296089fe678f335614939 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 30 Jul 2015 23:55:22 +0300 Subject: [PATCH 1/3] Document existence of rCSSMinFilter --- docs/settings.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/settings.txt b/docs/settings.txt index 268f645..98794ed 100644 --- a/docs/settings.txt +++ b/docs/settings.txt @@ -137,6 +137,10 @@ Backend settings A filter that uses Zachary Voase's Python port of the YUI CSS compression algorithm cssmin_. + - ``compressor.filters.cssmin.rCSSMinFilter`` + + A filter that uses the cssmin implementation rCSSmin_ to compress CSS. + - ``compressor.filters.cleancss.CleanCSSFilter`` A filter that passes the CSS content to the `clean-css`_ tool. @@ -153,6 +157,7 @@ Backend settings .. _CSSTidy: http://csstidy.sourceforge.net/ .. _`data: URIs`: http://en.wikipedia.org/wiki/Data_URI_scheme .. _cssmin: http://pypi.python.org/pypi/cssmin/ + .. _rCSSmin: http://opensource.perlig.de/rcssmin/ .. _`clean-css`: https://github.com/GoalSmashers/clean-css/ From 609ff2d53b0f4d1cfb628b810646dcae4e636371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 30 Jul 2015 23:56:01 +0300 Subject: [PATCH 2/3] Note filters that have no external dependencies --- docs/settings.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/settings.txt b/docs/settings.txt index 98794ed..c9b2a9d 100644 --- a/docs/settings.txt +++ b/docs/settings.txt @@ -135,11 +135,12 @@ Backend settings - ``compressor.filters.cssmin.CSSMinFilter`` A filter that uses Zachary Voase's Python port of the YUI CSS compression - algorithm cssmin_. + algorithm cssmin_ (included, no external dependencies). - ``compressor.filters.cssmin.rCSSMinFilter`` - A filter that uses the cssmin implementation rCSSmin_ to compress CSS. + A filter that uses the cssmin implementation rCSSmin_ to compress CSS + (included, no external dependencies). - ``compressor.filters.cleancss.CleanCSSFilter`` @@ -183,7 +184,7 @@ Backend settings - ``compressor.filters.jsmin.JSMinFilter`` A filter that uses the jsmin implementation rJSmin_ to compress - JavaScript code. + JavaScript code (included, no external dependencies). .. _slimit_filter: From aa378d52914e8a4525e76f78163665844877ea54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Fri, 31 Jul 2015 00:00:19 +0300 Subject: [PATCH 3/3] Spelling fixes --- compressor/management/commands/compress.py | 4 ++-- compressor/tests/test_offline.py | 2 +- docs/changelog.txt | 6 +++--- docs/usage.txt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/compressor/management/commands/compress.py b/compressor/management/commands/compress.py index 8cf1926..b7fdff5 100644 --- a/compressor/management/commands/compress.py +++ b/compressor/management/commands/compress.py @@ -234,7 +234,7 @@ class Command(NoArgsCommand): try: result = parser.render_node(template, context, node) except Exception as e: - raise CommandError("An error occured during rendering %s: " + raise CommandError("An error occurred during rendering %s: " "%s" % (template.template_name, e)) offline_manifest[key] = result context.pop() @@ -253,7 +253,7 @@ class Command(NoArgsCommand): passed by using --extension/-e multiple times. for example: running 'django-admin compress -e js,txt -e xhtml -a' - would result in a extension list: ['.js', '.txt', '.xhtml'] + would result in an extension list: ['.js', '.txt', '.xhtml'] >>> handle_extensions(['.html', 'html,js,py,py,py,.py', 'py,.py']) ['.html', '.js'] diff --git a/compressor/tests/test_offline.py b/compressor/tests/test_offline.py index 59a3d62..730706e 100644 --- a/compressor/tests/test_offline.py +++ b/compressor/tests/test_offline.py @@ -49,7 +49,7 @@ class OfflineTestCaseMixin(object): # Reset template dirs, because it enables us to force compress to # consider only a specific directory (helps us make true, - # independant unit tests). + # independent unit tests). # Specify both Jinja2 and Django template locations. When the wrong engine # is used to parse a template, the TemplateSyntaxError will cause the # template to be skipped over. diff --git a/docs/changelog.txt b/docs/changelog.txt index 07864df..1b6b744 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -57,7 +57,7 @@ v1.4 (06/20/2014) - Made ``CssCompressor`` class easier to extend. -- Added support for explictly stating the block being ended. +- Added support for explicitly stating the block being ended. - Added rcssmin and updated rjsmin. @@ -368,7 +368,7 @@ v0.6.1 ------ - Fixed staticfiles support to also use its finder API to find files during - developement -- when the static files haven't been collected in + development -- when the static files haven't been collected in ``STATIC_ROOT``. - Fixed regression with the ``COMPRESS`` setting, pre-compilation and @@ -394,7 +394,7 @@ Major improvements and a lot of bugfixes, some of which are: compress template tag does. See the :ref:`pre-compression ` docs for more information. -- Various perfomance improvements by better caching and mtime cheking. +- Various performance improvements by better caching and mtime cheking. - Deprecated ``COMPRESS_LESSC_BINARY`` setting because it's now superseded by the :attr:`~django.conf.settings.COMPRESS_PRECOMPILERS` diff --git a/docs/usage.txt b/docs/usage.txt index 5bf665e..922ea0e 100644 --- a/docs/usage.txt +++ b/docs/usage.txt @@ -153,7 +153,7 @@ the commonly used setting to refer to saved files ``STATIC_URL``. The result of running the ``compress`` management command will be cached in a file called ``manifest.json`` using the :attr:`configured storage -` to be able to be transfered from your developement +` to be able to be transferred from your development computer to the server easily. .. _TEMPLATE_LOADERS: http://docs.djangoproject.com/en/dev/ref/settings/#template-loaders