Skip to content

Commit

Permalink
Merge pull request #7 from ExCiteS/allow_non_ascii_titles
Browse files Browse the repository at this point in the history
Allow non ascii titles
  • Loading branch information
JamesBradbury committed Aug 10, 2018
2 parents 564acf1 + b7b814f commit db490a1
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 2 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ addons:
- postgresql-9.4-postgis-2.3

env:
- GEOKEY='>=1.3,<1.4' DJANGO='>=1.8,<1.9'
- GEOKEY='>=1.3,<1.4' DJANGO='>=1.9,<1.10'
- GEOKEY='>=1.3,<1.5' DJANGO='>=1.8,<1.9'

virtualenv:
system_site_packages: true
Expand Down
7 changes: 7 additions & 0 deletions geokey_wegovnow/conversions.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
"""Methods for converting data between systems or formats."""

import sys

if sys.version_info.major < 3:
# This is supposed to be bad practice, but is the only thing found to work.
reload(sys)
sys.setdefaultencoding('utf8')


def make_cm_url(url):
"""Turns a Geokey url into a Community Maps url."""
Expand Down
36 changes: 36 additions & 0 deletions geokey_wegovnow/tests/test_conversions.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# coding=utf-8
"""Non-Django tests for self-contained conversion methods."""
from unittest import TestCase

Expand Down Expand Up @@ -88,3 +89,38 @@ def test_numeric_values(self):
self.assertEqual(output, expected_title)


class GetLinkTitleNonAsciiCharsTest(TestCase):

def test_ascii_chars(self):
props = {'Some normal chars': 'THIS-THING'}
expected_title = 'Some normal chars THIS-THING'
output = get_link_title(properties=props)
self.assertEqual(output, expected_title)

def test_non_ascii_charts_in_value(self):
props = {'Title': 'Ç-THàNG¡'}
expected_title = u'Ç-THàNG¡'
output = get_link_title(properties=props)
self.assertEqual(expected_title, output)

def test_non_ascii_charts_in_key(self):
props = {'Title Çà¡': 'Thing!'}
expected_title = u'Thing!'
output = get_link_title(properties=props)
self.assertEqual(expected_title, output)

def test_non_ascii_charts_in_value_no_title(self):
props = {'Start': 'Ç-THàNG¡'}
expected_title = u'Start Ç-THàNG¡'
output = get_link_title(properties=props)
self.assertEqual(expected_title, output)

def test_non_ascii_charts_in_value_descrizione(self):
props = {'Descrizione': u"Area dedicata ad attività atletiche a corpo libero con il supporto di sbarre, "
u"parallele e anelli. Quest'area NON è oggetto di co-progettazione"}
expected_title = u"Descrizione Area dedicata ad attività atletiche a corpo libero con il supporto di " \
u"sbarre, parallele e anelli. Quest'area NON è oggetto di co-progettazione"
output = get_link_title(properties=props)
self.assertEqual(expected_title, output)


0 comments on commit db490a1

Please sign in to comment.