ungleich-public/djangocms_blog
6
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #135 from nephila/feature/django18

Browse source 
Add Django 1.8 support
This commit is contained in:
Iacopo Spalletti 2015-07-21 08:16:43 +02:00
commit ac07401db4
18 changed files with 64 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.travis.yml
View file

@ -18,6 +18,8 @@ env:
- DJANGO='django17' CMS='cms30'
- DJANGO='django17' CMS='cms31'
- DJANGO='django17' CMS='cms32'
- DJANGO='django18' CMS='cms31'
- DJANGO='django18' CMS='cms32'
- TOXENV='pep8'
- TOXENV='isort'
@ -56,11 +58,17 @@ matrix:
env: DJANGO='django16' CMS='cms32'
- python: 2.7
env: DJANGO='django17' CMS='cms32'
- python: 2.7
env: DJANGO='django18' CMS='cms32'
- python: 3.3
env: DJANGO='django16' CMS='cms32'
- python: 3.3
env: DJANGO='django17' CMS='cms32'
- python: 3.3
env: DJANGO='django18' CMS='cms32'
- python: 3.4
env: DJANGO='django16' CMS='cms32'
- python: 3.4
env: DJANGO='django17' CMS='cms32'
env: DJANGO='django17' CMS='cms32'
- python: 3.4
env: DJANGO='django18' CMS='cms32'

2
HISTORY.rst
View file

@ -6,8 +6,10 @@ History
0.5.0 (XXXX-XX-XX)
++++++++++++++++++
* Add support for Django 1.8
* Drop dependency on Django select2
* Code cleanups
* Enforce flake8 / isort checks
0.4.0 (2015-03-22)
++++++++++++++++++

9
cms_helper.py
View file

@ -11,15 +11,14 @@ HELPER_SETTINGS = dict(
],
ROOT_URLCONF='tests.test_utils.urls',
INSTALLED_APPS=[
'admin_enhancer',
'filer',
'parler',
'taggit',
'meta',
'meta_mixin',
'easy_thumbnails',
'djangocms_text_ckeditor',
'cmsplugin_filer_image',
'taggit',
'taggit_autosuggest',
],
LANGUAGE_CODE='en',
@ -91,6 +90,12 @@ HELPER_SETTINGS = dict(
if 'test' in sys.argv or len(sys.argv) == 1:
HELPER_SETTINGS['INSTALLED_APPS'].append('django_nose')
try:
import admin_enhancer # pragma: no cover # NOQA
HELPER_SETTINGS['INSTALLED_APPS'].append('admin_enhancer')
except ImportError:
pass
def run():
from djangocms_helper import runner

7
djangocms_blog/admin.py
View file

@ -1,7 +1,6 @@
# -*- coding: utf-8 -*-
from copy import deepcopy
from admin_enhancer.admin import EnhancedModelAdminMixin
from cms.admin.placeholderadmin import FrontendEditableAdminMixin, PlaceholderAdminMixin
from django import forms
from django.conf import settings
@ -12,6 +11,12 @@ from parler.admin import TranslatableAdmin
from .models import BlogCategory, Post
from .settings import get_setting
try:
from admin_enhancer.admin import EnhancedModelAdminMixin
except ImportError:
class EnhancedModelAdminMixin(object):
pass
class BlogCategoryAdmin(EnhancedModelAdminMixin, TranslatableAdmin):
def get_prepopulated_fields(self, request, obj=None):

19
djangocms_blog/migrations/0001_initial.py
View file

@ -1,25 +1,24 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
import taggit_autosuggest.managers
import filer.fields.image
import meta_mixin.models
import djangocms_text_ckeditor.fields
import cms.models.fields
import django.utils.timezone
import djangocms_text_ckeditor.fields
import filer.fields.image
import meta_mixin.models
import taggit_autosuggest.managers
from django.conf import settings
from django.conf import settings
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('cms', '0003_auto_20140926_2347'),
('taggit', '__first__'),
('filer', '0001_initial'),
('cmsplugin_filer_image', '0001_initial'),
('cms', '__latest__'),
('taggit', '__latest__'),
('filer', '__latest__'),
('cmsplugin_filer_image', '__latest__'),
]
operations = [

2
djangocms_blog/migrations/0002_post_sites.py
View file

@ -7,7 +7,7 @@ from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('sites', '0001_initial'),
('sites', '__latest__'),
('djangocms_blog', '0001_initial'),
]

21
djangocms_blog/models.py
View file

@ -1,8 +1,6 @@
# -*- coding: utf-8 -*-
from cms.models import CMSPlugin, PlaceholderField
from cmsplugin_filer_image.models import ThumbnailOption
from django.conf import settings as dj_settings
from django.contrib.sites.models import Site
from django.core.urlresolvers import reverse
from django.db import models
from django.utils import timezone
@ -87,31 +85,28 @@ class Post(ModelMeta, TranslatableModel):
date_published_end = models.DateTimeField(_(u'published Until'), null=True,
blank=True)
publish = models.BooleanField(_(u'publish'), default=False)
categories = models.ManyToManyField(BlogCategory, verbose_name=_(u'category'),
categories = models.ManyToManyField('djangocms_blog.BlogCategory', verbose_name=_(u'category'),
related_name='blog_posts',)
main_image = FilerImageField(verbose_name=_(u'main image'), blank=True, null=True,
on_delete=models.SET_NULL,
related_name='djangocms_blog_post_image')
main_image_thumbnail = models.ForeignKey(ThumbnailOption,
main_image_thumbnail = models.ForeignKey('cmsplugin_filer_image.ThumbnailOption',
verbose_name=_(u'main image thumbnail'),
related_name='djangocms_blog_post_thumbnail',
on_delete=models.SET_NULL,
blank=True, null=True)
main_image_full = models.ForeignKey(ThumbnailOption,
main_image_full = models.ForeignKey('cmsplugin_filer_image.ThumbnailOption',
verbose_name=_(u'main image full'),
related_name='djangocms_blog_post_full',
on_delete=models.SET_NULL,
blank=True, null=True)
enable_comments = models.BooleanField(
verbose_name=_(u'enable comments on post'),
default=get_setting('ENABLE_COMMENTS')
)
sites = models.ManyToManyField(Site, verbose_name=_(u'Site(s)'), blank=True,
enable_comments = models.BooleanField(verbose_name=_(u'enable comments on post'),
default=get_setting('ENABLE_COMMENTS'))
sites = models.ManyToManyField('sites.Site', verbose_name=_(u'Site(s)'), blank=True,
null=True,
help_text=_(u'Select sites in which to show the post. '
u'If none is set it will be '
u'visible in all the configured sites.')
)
u'visible in all the configured sites.'))
translations = TranslatedFields(
title=models.CharField(_(u'title'), max_length=255),
@ -254,7 +249,7 @@ class LatestPostsPlugin(BasePostPlugin):
help_text=_(u'The number of latests articles to be displayed.'))
tags = models.ManyToManyField('taggit.Tag', blank=True, verbose_name=_(u'filter by tag'),
help_text=_(u'Show only the blog articles tagged with chosen tags.'))
categories = models.ManyToManyField('BlogCategory', blank=True, verbose_name=_(u'filter by category'),
categories = models.ManyToManyField('djangocms_blog.BlogCategory', blank=True, verbose_name=_(u'filter by category'),
help_text=_(u'Show only the blog articles tagged with chosen categories.'))
def __str__(self):

1
djangocms_blog/templates/djangocms_blog/includes/blog_item.html
View file

@ -1,5 +1,4 @@
{% load i18n thumbnail cms_tags %}
{% load url from future %}
<article id="post-{{ post.slug }}" class="post-item">
<header>

1
djangocms_blog/templates/djangocms_blog/includes/blog_meta.html
View file

@ -1,5 +1,4 @@
{% load i18n thumbnail cms_tags %}
{% load url from future %}
<ul class="post-detail">
{% if post.author %}

3
djangocms_blog/templates/djangocms_blog/plugins/archive.html
View file

@ -1,5 +1,4 @@
{% load i18n %}
{% load url from future %}{% spaceless %}
{% load i18n %}{% spaceless %}
<div class="plugin plugin-blog">
<h3>{% trans "Archive" %}</h3>
{% regroup dates by date.year as years %}

3
djangocms_blog/templates/djangocms_blog/plugins/categories.html
View file

@ -1,5 +1,4 @@
{% load i18n %}
{% load url from future %}{% spaceless %}
{% load i18n %}{% spaceless %}
<div class="plugin plugin-blog">
<h3>{% trans "Categories" %}</h3>
<ul class="blog-categories">

3
djangocms_blog/templates/djangocms_blog/plugins/tags.html
View file

@ -1,5 +1,4 @@
{% load i18n %}
{% load url from future %}{% spaceless %}
{% load i18n %}{% spaceless %}
<div class="plugin plugin-blog">
<h3>{% trans "Tags" %}</h3>
<ul class="blog-tags">

1
djangocms_blog/templates/djangocms_blog/post_detail.html
View file

@ -1,6 +1,5 @@
{% extends "djangocms_blog/base.html" %}
{% load i18n thumbnail cms_tags %}
{% load url from future %}
{% block meta_description %}{{ post.meta_description }}{% endblock meta_description %}
{% block meta_keywords %}{{ post.meta_keywords }}{% endblock meta_keywords %}

2
requirements-test.txt
View file

@ -5,5 +5,5 @@ mock>=1.0.1
nose>=1.3.0
django-nose>=1.2
flake8
djangocms-helper>=0.7
https://github.com/nephila/djangocms-helper/archive/develop.zip
tox>=2.0

6
setup.py
View file

@ -44,7 +44,6 @@ setup(
'pytz',
'django-taggit-templatetags',
'django-taggit-autosuggest',
'django-admin-enhancer',
'djangocms-text-ckeditor',
'cmsplugin-filer',
'django-meta>=0.2',
@ -54,6 +53,10 @@ setup(
zip_safe=False,
keywords='djangocms-blog, blog, django, wordpress, multilingual',
test_suite='cms_helper.run',
extras_require={
'admin-enhancer': ['django-admin-enhancer'],
},
classifiers=[
'Development Status :: 4 - Beta',
'Framework :: Django',
@ -63,6 +66,7 @@ setup(
'Framework :: Django',
'Framework :: Django :: 1.6',
'Framework :: Django :: 1.7',
'Framework :: Django :: 1.8',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',

3
tests/test_models.py
View file

@ -14,9 +14,8 @@ from django.utils.timezone import now
from django.utils.translation import get_language, override
from djangocms_blog.models import Post
from djangocms_blog.settings import get_setting
from taggit.models import Tag
from djangocms_helper.utils import CMS_30
from taggit.models import Tag
from . import BaseTest

14
tests/test_plugins.py
View file

@ -26,7 +26,7 @@ class PluginTest(BaseTest):
tag = Tag.objects.get(slug='tag-1')
plugin.tags.add(tag)
request = self.get_page_request(page1, self.user, r'/en/blog/', lang_code='en', edit=True)
context = RequestContext(request, {})
context = RequestContext(request, {'request': request})
rendered = plugin.render_plugin(context, ph)
self.assertTrue(rendered.find('cms_plugin-djangocms_blog-post-abstract-1') > -1)
self.assertTrue(rendered.find(reverse('djangocms_blog:posts-tagged', kwargs={'tag': tag.slug})) > -1)
@ -43,7 +43,7 @@ class PluginTest(BaseTest):
plugin = add_plugin(ph, 'BlogLatestEntriesPlugin', language='en')
plugin.categories.add(category_2)
request = self.get_page_request(page1, self.user, r'/en/blog/', lang_code='en', edit=True)
context = RequestContext(request, {})
context = RequestContext(request, {'request': request})
rendered = plugin.render_plugin(context, ph)
self.assertTrue(rendered.find('cms_plugin-djangocms_blog-post-abstract-2') > -1)
self.assertTrue(rendered.find(reverse('djangocms_blog:posts-category', kwargs={'category': category_2.slug})) > -1)
@ -63,7 +63,7 @@ class PluginTest(BaseTest):
plugin = add_plugin(ph, 'BlogAuthorPostsPlugin', language='en')
plugin.authors.add(self.user)
request = self.get_page_request(page1, self.user, r'/en/blog/', lang_code='en', edit=True)
context = RequestContext(request, {})
context = RequestContext(request, {'request': request})
rendered = plugin.render_plugin(context, ph)
self.assertTrue(rendered.find(reverse('djangocms_blog:posts-author', kwargs={'username': self.user.get_username()})) > -1)
self.assertTrue(rendered.find('2 articles') > -1)
@ -81,7 +81,7 @@ class PluginTest(BaseTest):
ph = page1.placeholders.get(slot='content')
plugin = add_plugin(ph, 'BlogTagsPlugin', language='en')
request = self.get_page_request(page1, self.user, r'/en/blog/', lang_code='en', edit=True)
context = RequestContext(request, {})
context = RequestContext(request, {'request': request})
rendered = plugin.render_plugin(context, ph).replace("\n", "")
for tag in Tag.objects.all():
self.assertTrue(rendered.find(reverse('djangocms_blog:posts-tagged', kwargs={'tag': tag.slug})) > -1)
@ -103,7 +103,7 @@ class PluginTest(BaseTest):
plugin = add_plugin(ph, 'BlogCategoryPlugin', language='en')
request = self.get_page_request(page1, self.user, r'/en/blog/', lang_code='en', edit=True)
plugin_class = plugin.get_plugin_class_instance()
context = plugin_class.render(RequestContext(request, {}), plugin, ph)
context = plugin_class.render(RequestContext(request, {'request': request}), plugin, ph)
self.assertTrue(context['categories'])
self.assertEqual(list(context['categories']), [self.category_1])
@ -118,12 +118,12 @@ class PluginTest(BaseTest):
plugin = add_plugin(ph, 'BlogArchivePlugin', language='en')
request = self.get_page_request(page1, self.user, r'/en/blog/', lang_code='en', edit=True)
plugin_class = plugin.get_plugin_class_instance()
context = plugin_class.render(RequestContext(request, {}), plugin, ph)
context = plugin_class.render(RequestContext(request, {'request': request}), plugin, ph)
self.assertEqual(context['dates'][0]['date'].date(), now().replace(year=now().year, month=now().month, day=1).date())
self.assertEqual(context['dates'][0]['count'], 2)
post2.publish = False
post2.save()
context = plugin_class.render(RequestContext(request, {}), plugin, ph)
context = plugin_class.render(RequestContext(request, {'request': request}), plugin, ph)
self.assertEqual(context['dates'][0]['date'].date(), now().replace(year=now().year, month=now().month, day=1).date())
self.assertEqual(context['dates'][0]['count'], 1)

6
tox.ini
View file

@ -1,5 +1,5 @@
[tox]
envlist = py{26}-django{16}-cms{30,31,32},py{27,33,34}-django{16,17}-cms{30,31,32},isort,pep8
envlist = py{26}-django16-cms{30,31},py{27,33,34}-django{16,17}-cms{30,31,32},py{27,33,34}-django{18}-cms{31,32},pep8,isort
[testenv]
commands = {env:COMMAND:python} setup.py test
@ -7,16 +7,20 @@ deps =
django16: Django>=1.6,<1.7
django17: Django>=1.7,<1.8
django18: Django>=1.7,<1.9
django18: https://github.com/stefanfoulis/django-filer/archive/develop.zip
cms30: https://github.com/divio/django-cms/archive/support/3.0.x.zip
cms31: https://github.com/divio/django-cms/archive/support/3.1.x.zip
cms32: https://github.com/divio/django-cms/archive/develop.zip
https://github.com/nephila/djangocms-helper/archive/develop.zip
py26: unittest2
-r{toxinidir}/requirements-test.txt
[testenv:isort]
deps = isort
commands = isort -c -rc djangocms_blog tests
skip_install = true
[testenv:pep8]
deps = flake8
commands = flake8
skip_install = true