diff --git a/README b/README index e1eaeb0..31e8f97 100644 --- a/README +++ b/README @@ -6,7 +6,7 @@ For now, this can be installed from the GitHub repo with Pip: pip install git+https://github.com/ConvectiveSoftware/django-responsive-images.git -Version 1.0 will be made available on PyPI. This is version 0.7.1. +Version 1.0 will be made available on PyPI. This is version 0.7.2. For the most part, this app is intended to be used via template tags. diff --git a/responsive_images/__init__.py b/responsive_images/__init__.py index f0788a8..fb9b668 100644 --- a/responsive_images/__init__.py +++ b/responsive_images/__init__.py @@ -1 +1 @@ -__version__ = '0.7.1' +__version__ = '0.7.2' diff --git a/responsive_images/models.py b/responsive_images/models.py index dcec73f..5c1ab7b 100644 --- a/responsive_images/models.py +++ b/responsive_images/models.py @@ -24,7 +24,7 @@ class OriginalImage(ImageModel): class ResizedImage(ImageModel): original = models.ForeignKey(OriginalImage, db_index=True) image_file = models.ImageField( - upload_to='resized_images', + upload_to='responsive_images', height_field='height', width_field='width', ) diff --git a/responsive_images/tests.py b/responsive_images/tests.py index 98c1711..26602c1 100644 --- a/responsive_images/tests.py +++ b/responsive_images/tests.py @@ -41,7 +41,7 @@ def test_resize_one(self): self.assertEqual(OriginalImage.objects.count(), 2) self.assertEqual(ResizedImage.objects.count(), 1) self.assertEqual(r1.image_file.name, os.path.join( - 'resized_images', + 'responsive_images', self.orig1.image_file.name, '500x500_50-50.jpg' )) @@ -118,7 +118,7 @@ def test_src_tag(self): rendered, os.path.join( settings.MEDIA_URL, - 'resized_images', + 'responsive_images', self.orig1.image_file.name, '500x500_50-50.jpg' ) @@ -135,7 +135,7 @@ def test_src_tag_nocrop(self): rendered, os.path.join( settings.MEDIA_URL, - 'resized_images', + 'responsive_images', self.orig1.image_file.name, '500x283_nocrop.jpg' ) @@ -156,7 +156,7 @@ def test_src_tag_crop(self): self.assertEqual(ResizedImage.objects.count(), 2) center_crop_url = os.path.join( settings.MEDIA_URL, - 'resized_images', + 'responsive_images', self.orig1.image_file.name, '500x500_50-50.jpg' ) @@ -165,7 +165,7 @@ def test_src_tag_crop(self): self.assertEqual(rendered3, center_crop_url) self.assertEqual(rendered4, os.path.join( settings.MEDIA_URL, - 'resized_images', + 'responsive_images', self.orig1.image_file.name, '500x500_40-10.jpg' )) @@ -182,7 +182,7 @@ def test_src_tag_same(self): rendered, os.path.join( settings.MEDIA_URL, - 'resized_images', + 'responsive_images', self.orig1.image_file.name, '500x500_50-50.jpg' ) @@ -197,13 +197,13 @@ def test_srcset_tag(self): rendered, os.path.join( settings.MEDIA_URL, - 'resized_images', + 'responsive_images', self.orig1.image_file.name, '1000x1000_50-50.jpg' ) + ' 1000w, ' + os.path.join( settings.MEDIA_URL, - 'resized_images', + 'responsive_images', self.orig1.image_file.name, '2000x1520_50-50.jpg' ) + ' 2000w, ' @@ -222,13 +222,13 @@ def test_srcset_tag_nocrop(self): rendered, os.path.join( settings.MEDIA_URL, - 'resized_images', + 'responsive_images', self.orig1.image_file.name, '1000x565_nocrop.jpg' ) + ' 1000w, ' + os.path.join( settings.MEDIA_URL, - 'resized_images', + 'responsive_images', self.orig1.image_file.name, '2000x1131_nocrop.jpg' ) + ' 2000w, ' @@ -247,7 +247,7 @@ def test_srcset_tag_same_width(self): rendered, os.path.join( settings.MEDIA_URL, - 'resized_images', + 'responsive_images', self.orig2.image_file.name, '300x150_50-50.jpg' ) + ' 300w' @@ -262,16 +262,16 @@ def tearDown(self): _clean_up_directory(os.path.join(settings.MEDIA_ROOT, 'test_images')) _clean_up_directory(os.path.join( settings.MEDIA_ROOT, - 'resized_images', + 'responsive_images', self.orig1.image_file.name, )) _clean_up_directory(os.path.join( settings.MEDIA_ROOT, - 'resized_images', + 'responsive_images', self.orig2.image_file.name, )) _clean_up_directory(os.path.join( settings.MEDIA_ROOT, - 'resized_images', + 'responsive_images', 'test_images' )) diff --git a/responsive_images/utils.py b/responsive_images/utils.py index 0318422..815044b 100644 --- a/responsive_images/utils.py +++ b/responsive_images/utils.py @@ -86,7 +86,7 @@ def get_sized_images(image, sizes, crop=(50, 50)): new_image.save(data, orig_image.format) resized_path = default_storage.save( os.path.join( - 'resized_images', + 'responsive_images', image.name, '{}x{}_{}{}'.format(width, height, crop_type, ext)), File(data)