further cleanup

Author: FinalAngel

.coveragerc

@@ -1,6 +1,6 @@
 [run]
 branch = True
-source = djangocms_picture
+source = djangocms_link
 omit =
     migrations/*
     tests/*

djangocms_link/__init__.py

@@ -1,3 +1,2 @@
 # -*- coding: utf-8 -*-
-
 __version__ = '1.8.3rc1'

djangocms_link/cms_plugins.py

@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, print_function, unicode_literals
+from django.conf import settings
+from django.utils.translation import ugettext_lazy as _
+from django.contrib.sites.models import Site
 
 from cms.plugin_base import CMSPluginBase
 from cms.plugin_pool import plugin_pool
-from django.conf import settings
-from django.contrib.sites.models import Site
-from django.utils.translation import ugettext_lazy as _
 
 from .forms import LinkForm
 from .models import Link
@@ -15,7 +14,6 @@ class LinkPlugin(CMSPluginBase):
     model = Link
     form = LinkForm
     name = _('Link')
-    render_template = 'cms/plugins/link.html'
     text_enabled = True
     allow_children = True
 
@@ -43,7 +41,7 @@ def get_render_template(self, context, instance, placeholder):
         return 'djangocms_link/{}/link.html'.format(instance.template)
 
     def render(self, context, instance, placeholder):
-        context['link'] = instance.link()
+        context['link'] = instance.get_link()
         return super(LinkPlugin, self).render(context, instance, placeholder)
 
     def get_form(self, request, obj=None, **kwargs):

djangocms_link/fields.py

@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, print_function, unicode_literals
-
 from django.conf import settings
 
+
 if 'django_select2' in settings.INSTALLED_APPS:
     from django_select2.fields import AutoModelSelect2Field
 

djangocms_link/forms.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, print_function, unicode_literals
-
 from django.forms import ValidationError
 from django.forms.models import ModelForm
 from django.forms.widgets import Media
@@ -38,13 +36,24 @@ def __init__(self, *args, **kwargs):
         super(LinkForm, self).__init__(*args, **kwargs)
         self.fields['attributes'].widget = AttributesWidget()
 
-    def _get_media(self):
-        """
-        Provide a description of all media required to render the widgets on this form
-        """
-        media = Media()
-        for field in self.fields.values():
-            media = media + field.widget.media
-        media._js = ['cms/js/libs/jquery.min.js'] + media._js
-        return media
-    media = property(_get_media)
+    def clean(self):
+        cleaned_data = super(LinkForm, self).clean()
+        external_link = cleaned_data.get('external_link')
+        internal_link = cleaned_data.get('internal_link')
+        mailto = cleaned_data.get('mailto')
+        phone = cleaned_data.get('phone')
+        anchor = cleaned_data.get('anchor')
+        if not any([external_link, internal_link, mailto, phone, anchor]):
+            raise ValidationError(_('At least one link is required.'))
+        return cleaned_data
+
+    # def _get_media(self):
+    #     """
+    #     Provide a description of all media required to render the widgets on this form
+    #     """
+    #     media = Media()
+    #     for field in self.fields.values():
+    #         media = media + field.widget.media
+    #     media._js = ['cms/js/libs/jquery.min.js'] + media._js
+    #     return media
+    # media = property(_get_media)

djangocms_link/migrations/__init__.py

@@ -0,0 +1 @@
+# -*- coding: utf-8 -*-

djangocms_link/models.py

@@ -1,13 +1,15 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, print_function, unicode_literals
-
-from cms.models import CMSPlugin, Page
-
+"""
+Enables the user to add a "Link" plugin that displays a link
+using the HTML <a> tag.
+"""
+from django.db import models
 from django.conf import settings
 from django.core.exceptions import ValidationError
-from django.db import models
 from django.utils.encoding import python_2_unicode_compatible
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import ugettext, ugettext_lazy as _
+
+from cms.models import CMSPlugin, Page
 
 from djangocms_attributes_field.fields import AttributesField
 
@@ -43,24 +45,25 @@ def get_templates():
     )
 )
 
+HOSTNAME = getattr(
+    settings,
+    'DJANGOCMS_LINK_INTRANET_HOSTNAME_PATTERN',
+    None
+)
+
 TARGET_CHOICES = (
     ('_blank', _('Open in new window')),
     ('_self', _('Open in same window')),
     ('_parent', _('Delegate to parent')),
     ('_top', _('Delegate to top')),
 )
 
-
 @python_2_unicode_compatible
 class AbstractLink(CMSPlugin):
-    """
-    A link to an other page or to an external website
-    """
-    # Used by django-cms search
+    # used by django CMS search
     search_fields = ('name', )
 
-    url_validators = [IntranetURLValidator(intranet_host_re=getattr(
-        settings, 'DJANGOCMS_LINK_INTRANET_HOSTNAME_PATTERN', None)), ]
+    url_validators = [IntranetURLValidator(intranet_host_re=HOSTNAME),]
 
     template = models.CharField(
         verbose_name=_('Template'),
@@ -73,7 +76,7 @@ class AbstractLink(CMSPlugin):
         blank=True,
         max_length=255,
     )
-    # Re: max_length, see: http://stackoverflow.com/questions/417142/
+    # re: max_length, see: http://stackoverflow.com/questions/417142/
     external_link = models.URLField(
         verbose_name=_('External link'),
         blank=True,
@@ -152,34 +155,26 @@ class Meta:
         abstract = True
 
     def __str__(self):
-        return self.name
-
-    def clean(self):
-        if not self.external_link or self.internal_link:
-            raise ValidationError(_('Error'))
-        # cleaned_data = super(LinkForm, self).clean()
-        # url = cleaned_data.get('url')
-        # internal_link = cleaned_data.get('internal_link')
-        # mailto = cleaned_data.get('mailto')
-        # phone = cleaned_data.get('phone')
-        # anchor = cleaned_data.get('anchor')
-        # if not any([url, internal_link, mailto, phone, anchor]):
-        #     raise ValidationError(_('At least one link is required.'))
-        # return cleaned_data
-
-    def link(self):
+        return self.name or str(self.pk)
+
+    def get_short_description(self):
+        if self.name:
+            return '{} ({})'.format(self.name, self.get_link())
+        return self.get_link()
+
+    def get_link(self):
         if self.phone:
-            link = 'tel:%s' % self.phone
+            link = 'tel:{}'.format(self.phone.replace(' ', ''))
         elif self.mailto:
-            link = 'mailto:%s' % self.mailto
+            link = 'mailto:{}'.format(self.mailto)
         elif self.external_link:
             link = self.external_link
         elif self.internal_link_id:
             link = self.internal_link.get_absolute_url()
         else:
             link = ''
         if (self.external_link or self.internal_link or not link) and self.anchor:
-            link += '#%s' % self.anchor
+            link += '#{}'.format(self.anchor)
         return link
 
 

djangocms_link/validators.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, print_function, unicode_literals
-
 import re
 
 from django.core.validators import URLValidator

tests/requirements-tests.txt

@@ -1,2 +1,6 @@
-django-cms>=2.3
-Django-Select2>=3.1.2
+# requirements from setup.py
+Django-Select2
+# other requirements
+djangocms-helper>=0.9.2,<0.10
+tox
+coverage

tests/requirements.txt

@@ -0,0 +1,23 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+HELPER_SETTINGS = {
+    'INSTALLED_APPS': [
+        'django_select2',
+    ],
+    'ALLOWED_HOSTS': ['localhost'],
+    'CMS_LANGUAGES': {
+        1: [{
+            'code': 'en',
+            'name': 'English',
+        }]
+    },
+    'LANGUAGE_CODE': 'en',
+}
+
+def run():
+    from djangocms_helper import runner
+    runner.cms('djangocms_link')
+
+if __name__ == '__main__':
+    run()

tests/settings.py

@@ -1,19 +1,15 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, print_function, unicode_literals
-
 import django
-from cms.api import add_plugin, create_page
-from cms.plugin_rendering import PluginContext, render_placeholder
+
 from django.core.management import call_command
+from django.utils import unittest
 from django.utils.encoding import force_text
 from django.utils.six import StringIO
-from djangocms_helper.base_test import BaseTestCase
 
-# Need the copy of unittest2 bundled with Django for @skipIf on Python 2.6.
-try:
-    from django.utils import unittest
-except ImportError:
-    import unittest
+from cms.api import add_plugin, create_page
+from cms.plugin_rendering import PluginContext, render_placeholder
+
+from djangocms_helper.base_test import BaseTestCase
 
 
 class LinkTestCase(BaseTestCase):
@@ -69,7 +65,6 @@ def test_render(self):
         # when rendered, it counts as a space in html, which leads to incorrect rendering
         self.assertEqual(output, '<span class="plugin_link"><a href="http://example.com" >text body</a></span>')
 
-    @unittest.skipIf(django.VERSION[:2] < (1, 7), 'Skipping Django 1.7 test.')
     def test_makemigrations(self):
         """
         Fail if there are schema changes with no migrations.