Merge branch 'release/1.3'

Author: jezdez

.gitignore

@@ -1,12 +1,12 @@
 build
-compressor/tests/media/CACHE
-compressor/tests/media/custom
-compressor/tests/media/js/066cd253eada.js
+compressor/tests/static/CACHE
+compressor/tests/static/custom
+compressor/tests/static/js/066cd253eada.js
 dist
 MANIFEST
 *.pyc
 *.egg-info
 *.egg
 docs/_build/
 .sass-cache
-.coverage
+.coverage

.travis.yml

@@ -1,6 +1,5 @@
 language: python
 python:
-  - "2.5"
   - "2.6"
   - "2.7"
 before_install:
@@ -14,8 +13,9 @@ install:
 script:
   - make test
 env:
-  - DJANGO=1.3.1
-  - DJANGO=1.4
+  - DJANGO=1.3.7
+  - DJANGO=1.4.5
+  - DJANGO=1.5
 branches:
   only:
     - develop

AUTHORS

@@ -13,18 +13,23 @@ Aaron Godfrey
 Adam "Cezar" Jenkins
 Adrian Holovaty
 Alen Mujezinovic
+Alex Kessinger
 Andreas Pelme
+Antti Hirvonen
 Apostolos Bessas
+Ashley Camba Garrido
 Atamert Ölçgen
 Aymeric Augustin
 Bartek Ciszkowski
 Ben Firshman
 Ben Spaulding
+Benjamin Gilbert
 Benjamin Wohlwend
 Bojan Mihelac
 Boris Shemigon
 Brad Whittington
 Bruno Renié
+Cassus Adam Banko
 Chris Adams
 Chris Streeter
 Clay McClure
@@ -34,7 +39,9 @@ Eugene Mirotin
 Fenn Bailey
 Francisco Souza
 Gert Van Gool
+Greg McGuire
 Harro van der Klauw
+Isaac Bythewood
 Iván Raskovsky
 Jaap Roes
 James Roe
@@ -45,6 +52,7 @@ Jervis Whitley
 John-Scott Atlakson
 Jonas von Poser
 Jonathan Lukens
+Julian Scheid
 Julien Phalip
 Justin Lilly
 Luis Nell
@@ -53,7 +61,9 @@ Lukasz Balcerzak
 Maciek Szczesniak
 Maor Ben-Dayan
 Mark Lavin
+Marsel Mavletkulov
 Matt Schick
+Matthew Tretter
 Mehmet S. Catalbas
 Michael van de Waeter
 Mike Yumatov
@@ -65,14 +75,18 @@ Peter Bengtsson
 Peter Lundberg
 Philipp Bosch
 Philipp Wollermann
+Rich Leland
 Sam Dornan
+Saul Shanabrook
 Selwin Ong
 Shabda Raaj
 Stefano Brentegani
 Sébastien Piquemal
 Thom Linton
+Thomas Schreiber
 Tino de Bruijn
 Ulrich Petri
+Ulysses V
 Vladislav Poluhin
 wesleyb
 Wilson Júnior

LICENSE

@@ -1,6 +1,6 @@
 django_compressor
 -----------------
-Copyright (c) 2009-2012 Django Compressor authors (see AUTHORS file)
+Copyright (c) 2009-2013 Django Compressor authors (see AUTHORS file)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

MANIFEST.in

@@ -1,6 +1,7 @@
 include AUTHORS
 include README.rst
 include LICENSE
+recursive-include docs *
 recursive-include compressor/templates/compressor *.html
 recursive-include compressor/tests/media *.js *.css *.png *.coffee
 recursive-include compressor/tests/test_templates *.html

README.rst

@@ -48,7 +48,7 @@ tool it will be fairly easy to implement a custom filter. Simply extend
 from one of the available base classes.
 
 More documentation about the usage and settings of Django Compressor can be
-found on `django_compressor.readthedocs.org`_.
+found on `django-compressor.readthedocs.org`_.
 
 The source code for Django Compressor can be found and contributed to on
 `github.com/jezdez/django_compressor`_. There you can also file tickets.
@@ -65,7 +65,7 @@ The `in-development version`_ of Django Compressor can be installed with
 .. _JSMin: http://www.crockford.com/javascript/jsmin.html
 .. _cssmin: https://github.com/zacharyvoase/cssmin
 .. _data URIs: http://en.wikipedia.org/wiki/Data_URI_scheme
-.. _django_compressor.readthedocs.org: http://django_compressor.readthedocs.org/
+.. _django-compressor.readthedocs.org: http://django-compressor.readthedocs.org/en/latest/
 .. _github.com/jezdez/django_compressor: https://github.com/jezdez/django_compressor
 .. _in-development version: http://github.com/jezdez/django_compressor/tarball/develop#egg=django_compressor-dev
 

compressor/__init__.py

@@ -1,2 +1,2 @@
 # following PEP 386
-__version__ = "1.2"
+__version__ = "1.3"

compressor/base.py

@@ -7,16 +7,18 @@
 from django.template import Context
 from django.template.loader import render_to_string
 from django.utils.encoding import smart_unicode
+from django.utils.importlib import import_module
 from django.utils.safestring import mark_safe
 
 from compressor.cache import get_hexdigest, get_mtime
 
 from compressor.conf import settings
-from compressor.exceptions import CompressorError, UncompressableFileError
+from compressor.exceptions import (CompressorError, UncompressableFileError,
+        FilterDoesNotExist)
 from compressor.filters import CompilerFilter
 from compressor.storage import default_storage, compressor_file_storage
 from compressor.signals import post_compress
-from compressor.utils import get_class, staticfiles
+from compressor.utils import get_class, get_mod_func, staticfiles
 from compressor.utils.decorators import cached_property
 
 # Some constants for nicer handling.
@@ -199,15 +201,29 @@ def precompile(self, content, kind=None, elem=None, filename=None, **kwargs):
         attrs = self.parser.elem_attribs(elem)
         mimetype = attrs.get("type", None)
         if mimetype:
-            command = self.all_mimetypes.get(mimetype)
-            if command is None:
+            filter_or_command = self.all_mimetypes.get(mimetype)
+            if filter_or_command is None:
                 if mimetype not in ("text/css", "text/javascript"):
                     raise CompressorError("Couldn't find any precompiler in "
                                           "COMPRESS_PRECOMPILERS setting for "
                                           "mimetype '%s'." % mimetype)
             else:
-                return True, CompilerFilter(content, filter_type=self.type,
-                    command=command, filename=filename).input(**kwargs)
+                mod_name, cls_name = get_mod_func(filter_or_command)
+                try:
+                    mod = import_module(mod_name)
+                except ImportError:
+                    return True, CompilerFilter(content, filter_type=self.type,
+                            command=filter_or_command, filename=filename).input(
+                                **kwargs)
+                try:
+                    precompiler_class = getattr(mod, cls_name)
+                except AttributeError:
+                    raise FilterDoesNotExist('Could not find "%s".' %
+                            filter_or_command)
+                else:
+                    return True, precompiler_class(content, attrs,
+                            filter_type=self.type, filename=filename).input(
+                                **kwargs)
         return False, content
 
     def filter(self, content, method, **kwargs):

compressor/cache.py

@@ -1,3 +1,4 @@
+import hashlib
 import os
 import socket
 import time
@@ -7,7 +8,6 @@
 from django.utils import simplejson
 from django.utils.encoding import smart_str
 from django.utils.functional import SimpleLazyObject
-from django.utils.hashcompat import md5_constructor
 from django.utils.importlib import import_module
 
 from compressor.conf import settings
@@ -18,7 +18,7 @@
 
 
 def get_hexdigest(plaintext, length=None):
-    digest = md5_constructor(smart_str(plaintext)).hexdigest()
+    digest = hashlib.md5(smart_str(plaintext)).hexdigest()
     if length:
         return digest[:length]
     return digest

compressor/conf.py

@@ -1,5 +1,4 @@
 import os
-from django import VERSION as DJANGO_VERSION
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 
@@ -32,6 +31,7 @@ class CompressorConf(AppConf):
         # ('text/coffeescript', 'coffee --compile --stdio'),
         # ('text/less', 'lessc {infile} {outfile}'),
         # ('text/x-sass', 'sass {infile} {outfile}'),
+        # ('text/stylus', 'stylus < {infile} > {outfile}'),
         # ('text/x-scss', 'sass --scss {infile} {outfile}'),
     )
     CLOSURE_COMPILER_BINARY = 'java -jar compiler.jar'
@@ -69,52 +69,35 @@ class Meta:
         prefix = 'compress'
 
     def configure_root(self, value):
+        # Uses Django's STATIC_ROOT by default
         if value is None:
-            value = getattr(settings, 'STATIC_ROOT', None)
-            if not value:
-                value = settings.MEDIA_ROOT
+            value = settings.STATIC_ROOT
         if value is None:
             raise ImproperlyConfigured("COMPRESS_ROOT setting must be set")
         return os.path.normcase(os.path.abspath(value))
 
     def configure_url(self, value):
-        # Uses Django 1.3's STATIC_URL by default or falls back to MEDIA_URL
+        # Uses Django's STATIC_URL by default
         if value is None:
-            value = getattr(settings, 'STATIC_URL', None)
-            if not value:
-                value = settings.MEDIA_URL
+            value = settings.STATIC_URL
         if not value.endswith('/'):
             raise ImproperlyConfigured("URL settings (e.g. COMPRESS_URL) "
                                        "must have a trailing slash")
         return value
 
     def configure_cache_backend(self, value):
         if value is None:
-            # If we are on Django 1.3 AND using the new CACHES setting...
-            if DJANGO_VERSION[:2] >= (1, 3) and hasattr(settings, 'CACHES'):
-                value = 'default'
-            else:
-                # falling back to the old CACHE_BACKEND setting
-                value = getattr(settings, 'CACHE_BACKEND', None)
-                if not value:
-                    raise ImproperlyConfigured("Please specify a cache "
-                                               "backend in your settings.")
+            value = 'default'
         return value
 
     def configure_offline_context(self, value):
         if not value:
-            value = {'MEDIA_URL': settings.MEDIA_URL}
-            # Adds the 1.3 STATIC_URL setting to the context if available
-            if getattr(settings, 'STATIC_URL', None):
-                value['STATIC_URL'] = settings.STATIC_URL
+            value = {'STATIC_URL': settings.STATIC_URL}
         return value
 
     def configure_template_filter_context(self, value):
         if not value:
-            value = {'MEDIA_URL': settings.MEDIA_URL}
-            # Adds the 1.3 STATIC_URL setting to the context if available
-            if getattr(settings, 'STATIC_URL', None):
-                value['STATIC_URL'] = settings.STATIC_URL
+            value = {'STATIC_URL': settings.STATIC_URL}
         return value
 
     def configure_precompilers(self, value):