From ad3f15ef76f64132b49c41d298a2c99e5c303e7b Mon Sep 17 00:00:00 2001 From: Bryan Veloso Date: Wed, 23 Feb 2011 12:54:09 -0800 Subject: [PATCH 1/6] Instead of overriding Model.delete(), we'll connect a public clear_cache() method to a post_delete() signal so that bulk actions clean props as well. --- imagekit/models.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/imagekit/models.py b/imagekit/models.py index b687597..8340e79 100644 --- a/imagekit/models.py +++ b/imagekit/models.py @@ -4,6 +4,7 @@ from django.conf import settings from django.core.files.base import ContentFile from django.db import models from django.db.models.base import ModelBase +from django.db.models.signals import post_delete from django.utils.html import conditional_escape as escape from django.utils.translation import ugettext_lazy as _ @@ -145,7 +146,9 @@ class ImageModel(models.Model): self._clear_cache() self._pre_cache() - def delete(self): + def clear_cache(self): assert self._get_pk_val() is not None, "%s object can't be deleted because its %s attribute is set to None." % (self._meta.object_name, self._meta.pk.attname) self._clear_cache() - models.Model.delete(self) + post_delete.connect(clear_cache, sender=self) + + From 53cddf7752040212f077b3177837cf44cdf9c9cc Mon Sep 17 00:00:00 2001 From: Jonathan Slenders Date: Mon, 21 Mar 2011 18:25:23 +0800 Subject: [PATCH 2/6] fixed 'sender' not defined bug --- imagekit/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/imagekit/models.py b/imagekit/models.py index 8340e79..c2cbaea 100644 --- a/imagekit/models.py +++ b/imagekit/models.py @@ -149,6 +149,6 @@ class ImageModel(models.Model): def clear_cache(self): assert self._get_pk_val() is not None, "%s object can't be deleted because its %s attribute is set to None." % (self._meta.object_name, self._meta.pk.attname) self._clear_cache() - post_delete.connect(clear_cache, sender=self) + post_delete.connect(clear_cache, sender=ImageModel) From 57ef4748b9401c457a89100fd145d5d80b6f96f6 Mon Sep 17 00:00:00 2001 From: Jonathan Slenders Date: Mon, 21 Mar 2011 18:33:47 +0800 Subject: [PATCH 3/6] fixed 'sender' not defined bug (2) --- imagekit/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/imagekit/models.py b/imagekit/models.py index c2cbaea..d556c4a 100644 --- a/imagekit/models.py +++ b/imagekit/models.py @@ -146,9 +146,9 @@ class ImageModel(models.Model): self._clear_cache() self._pre_cache() - def clear_cache(self): + def clear_cache(self, **kwargs): assert self._get_pk_val() is not None, "%s object can't be deleted because its %s attribute is set to None." % (self._meta.object_name, self._meta.pk.attname) self._clear_cache() - post_delete.connect(clear_cache, sender=ImageModel) +post_delete.connect(ImageModel.clear_cache, sender=ImageModel) From c61a6bc640add2eb06dbba3a42c40e71bbb0e177 Mon Sep 17 00:00:00 2001 From: Bryan Veloso Date: Sat, 26 Mar 2011 00:42:37 -0700 Subject: [PATCH 4/6] Adding Jonathan Slenders to AUTHORS (thanks for spotting that signals bug). --- AUTHORS | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 20a622a..4015e1c 100644 --- a/AUTHORS +++ b/AUTHORS @@ -7,4 +7,9 @@ Maintainers: * Bryan Veloso (bryanveloso) * Chris Drackett (chrisdrackett) -* Greg Newman (gregnewman) \ No newline at end of file +* Greg Newman (gregnewman) + + +Contributors: + +* Jonathan Slenders (jonathanslenders) From f777c08b1725317b07c7e2b6b539e54d0b96288f Mon Sep 17 00:00:00 2001 From: Bryan Veloso Date: Sat, 26 Mar 2011 00:46:17 -0700 Subject: [PATCH 5/6] Whitespacing. --- imagekit/models.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/imagekit/models.py b/imagekit/models.py index d556c4a..05946fb 100644 --- a/imagekit/models.py +++ b/imagekit/models.py @@ -149,6 +149,8 @@ class ImageModel(models.Model): def clear_cache(self, **kwargs): assert self._get_pk_val() is not None, "%s object can't be deleted because its %s attribute is set to None." % (self._meta.object_name, self._meta.pk.attname) self._clear_cache() + + post_delete.connect(ImageModel.clear_cache, sender=ImageModel) From 9637a435514a91d5b3ec26feafdfdb69cdac646e Mon Sep 17 00:00:00 2001 From: Bryan Veloso Date: Fri, 1 Apr 2011 11:56:44 -0700 Subject: [PATCH 6/6] Bumping the verison numbers. --- imagekit/__init__.py | 4 ++-- setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/imagekit/__init__.py b/imagekit/__init__.py index 5a0a950..0540878 100644 --- a/imagekit/__init__.py +++ b/imagekit/__init__.py @@ -2,10 +2,10 @@ Django ImageKit Author: Justin Driscoll -Version: 0.3.5 +Version: 0.3.6 """ __author__ = 'Justin Driscoll, Bryan Veloso, Greg Newman, Chris Drackett' -__version__ = (0, 3, 4) +__version__ = (0, 3, 6) diff --git a/setup.py b/setup.py index 3f21307..2d4f6ce 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from distutils.core import setup setup( name='django-imagekit', - version='0.3.5', + version='0.3.6', description='Automated image processing for Django models.', author='Justin Driscoll', author_email='justin@driscolldev.com',