From 969275bbc9a047b681c44a1fc4ad639c0171e346 Mon Sep 17 00:00:00 2001 From: Matthew Tretter Date: Fri, 8 Feb 2013 18:15:00 -0500 Subject: [PATCH] Rename GeneratedImageFile to ImageCacheFile --- docs/advanced_usage.rst | 4 ++-- imagekit/cachefiles/__init__.py | 12 ++++++------ imagekit/models/fields/utils.py | 4 ++-- imagekit/pkgmeta.py | 2 +- imagekit/registry.py | 4 ++-- imagekit/specs/sourcegroups.py | 4 ++-- imagekit/templatetags/imagekit.py | 8 ++++---- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/advanced_usage.rst b/docs/advanced_usage.rst index 917b642..ef6b125 100644 --- a/docs/advanced_usage.rst +++ b/docs/advanced_usage.rst @@ -190,9 +190,9 @@ command. Luckily, ImageKit makes this pretty easy: .. code-block:: python - from imagekit.cachefiles import LazyGeneratedImageFile + from imagekit.cachefiles import LazyImageCacheFile - file = LazyGeneratedImageFile('myapp:profile:avatar_thumbnail', source=source_file) + file = LazyImageCacheFile('myapp:profile:avatar_thumbnail', source=source_file) file.generate() One final situation in which images won't be generated automatically when using diff --git a/imagekit/cachefiles/__init__.py b/imagekit/cachefiles/__init__.py index 25c822f..974b643 100644 --- a/imagekit/cachefiles/__init__.py +++ b/imagekit/cachefiles/__init__.py @@ -7,7 +7,7 @@ from ..signals import before_access from ..utils import get_logger, get_singleton, generate, get_by_qname -class GeneratedImageFile(BaseIKFile, ImageFile): +class ImageCacheFile(BaseIKFile, ImageFile): """ A file that represents the result of a generator. Creating an instance of this class is not enough to trigger the generation of the file. In fact, @@ -39,11 +39,11 @@ class GeneratedImageFile(BaseIKFile, ImageFile): self.cachefile_backend = cachefile_backend or getattr(generator, 'cachefile_backend', None) - super(GeneratedImageFile, self).__init__(storage=storage) + super(ImageCacheFile, self).__init__(storage=storage) def _require_file(self): before_access.send(sender=self, file=self) - return super(GeneratedImageFile, self)._require_file() + return super(ImageCacheFile, self)._require_file() def generate(self, force=False): if force: @@ -69,13 +69,13 @@ class GeneratedImageFile(BaseIKFile, ImageFile): self.cachefile_backend)) -class LazyGeneratedImageFile(LazyObject): +class LazyImageCacheFile(LazyObject): def __init__(self, generator_id, *args, **kwargs): - super(LazyGeneratedImageFile, self).__init__() + super(LazyImageCacheFile, self).__init__() def setup(): generator = generator_registry.get(generator_id, *args, **kwargs) - self._wrapped = GeneratedImageFile(generator) + self._wrapped = ImageCacheFile(generator) self.__dict__['_setup'] = setup diff --git a/imagekit/models/fields/utils.py b/imagekit/models/fields/utils.py index bfb6d89..ea2442f 100644 --- a/imagekit/models/fields/utils.py +++ b/imagekit/models/fields/utils.py @@ -1,4 +1,4 @@ -from ...cachefiles import GeneratedImageFile +from ...cachefiles import ImageCacheFile from django.db.models.fields.files import ImageField @@ -30,7 +30,7 @@ class ImageSpecFileDescriptor(object): else: source = image_fields[0] spec = self.field.get_spec(source=source) - file = GeneratedImageFile(spec) + file = ImageCacheFile(spec) instance.__dict__[self.attname] = file return file diff --git a/imagekit/pkgmeta.py b/imagekit/pkgmeta.py index 20e62db..419d408 100644 --- a/imagekit/pkgmeta.py +++ b/imagekit/pkgmeta.py @@ -1,5 +1,5 @@ __title__ = 'django-imagekit' __author__ = 'Justin Driscoll, Bryan Veloso, Greg Newman, Chris Drackett, Matthew Tretter, Eric Eldredge' -__version__ = '3.0a1' +__version__ = '3.0a2' __license__ = 'BSD' __all__ = ['__title__', '__author__', '__version__', '__license__'] diff --git a/imagekit/registry.py b/imagekit/registry.py index 2523f9b..a28738f 100644 --- a/imagekit/registry.py +++ b/imagekit/registry.py @@ -92,7 +92,7 @@ class SourceGroupRegistry(object): Relay source group signals to the appropriate spec strategy. """ - from .cachefiles import GeneratedImageFile + from .cachefiles import ImageCacheFile source_group = sender # Ignore signals from unregistered groups. @@ -104,7 +104,7 @@ class SourceGroupRegistry(object): callback_name = self._signals[signal] for spec in specs: - file = GeneratedImageFile(spec) + file = ImageCacheFile(spec) call_strategy_method(spec, callback_name, file=file) diff --git a/imagekit/specs/sourcegroups.py b/imagekit/specs/sourcegroups.py index ec85af8..1693470 100644 --- a/imagekit/specs/sourcegroups.py +++ b/imagekit/specs/sourcegroups.py @@ -13,7 +13,7 @@ have two responsibilities: from django.db.models.signals import post_init, post_save, post_delete from django.utils.functional import wraps -from ..cachefiles import LazyGeneratedImageFile +from ..cachefiles import LazyImageCacheFile from ..signals import source_created, source_changed, source_deleted @@ -156,7 +156,7 @@ class SourceGroupFilesGenerator(object): def __call__(self): for source_file in self.source_group.files(): - yield LazyGeneratedImageFile(self.generator_id, + yield LazyImageCacheFile(self.generator_id, source=source_file) diff --git a/imagekit/templatetags/imagekit.py b/imagekit/templatetags/imagekit.py index c845dcc..7553a2f 100644 --- a/imagekit/templatetags/imagekit.py +++ b/imagekit/templatetags/imagekit.py @@ -2,7 +2,7 @@ from django import template from django.utils.html import escape from django.utils.safestring import mark_safe from .compat import parse_bits -from ..cachefiles import GeneratedImageFile +from ..cachefiles import ImageCacheFile from ..registry import generator_registry @@ -18,7 +18,7 @@ def get_cachefile(context, generator_id, generator_kwargs, source=None): generator_id = generator_id.resolve(context) kwargs = dict((k, v.resolve(context)) for k, v in generator_kwargs.items()) generator = generator_registry.get(generator_id, **kwargs) - return GeneratedImageFile(generator) + return ImageCacheFile(generator) def parse_dimensions(dimensions): @@ -104,7 +104,7 @@ class ThumbnailAssignmentNode(template.Node): kwargs.update(parse_dimensions(self._dimensions.resolve(context))) generator = generator_registry.get(generator_id, **kwargs) - context[variable_name] = GeneratedImageFile(generator) + context[variable_name] = ImageCacheFile(generator) return '' @@ -130,7 +130,7 @@ class ThumbnailImageTagNode(template.Node): kwargs.update(dimensions) generator = generator_registry.get(generator_id, **kwargs) - file = GeneratedImageFile(generator) + file = ImageCacheFile(generator) attrs = dict((k, v.resolve(context)) for k, v in self._html_attrs.items())