prettify: better saxon genitive handing + fixed a couple of false positive tests

daveoncode · daveoncode · commit c8dcbe6f7a79 · 2015-08-18T14:11:31.000+02:00
diff --git a/string_utils.py b/string_utils.py
@@ -131,9 +131,9 @@
         r')',
         re.MULTILINE | re.DOTALL
     ),
-    'NO_SPACES': re.compile(
+    'SAXON_GENITIVE': re.compile(
         r'('
-        r'(?<=\w)\'\s(?=s)|\s\'\s(?=s)'  # saxon genitive
+        r'(?<=\w)\'\ss\s|(?<=\w)\s\'s(?=\w)|(?<=\w)\s\'s\s(?=\w)'
         r')',
         re.MULTILINE | re.UNICODE
     )
@@ -482,8 +482,9 @@ def uppercase_after_sign(regex_match):
     p = PRETTIFY_RE['SPACES_AROUND'].sub(lambda m: ' ' + m.group(1).strip() + ' ', p)
     p = PRETTIFY_RE['SPACES_INSIDE'].sub(lambda m: m.group(1).strip(), p)
     p = PRETTIFY_RE['UPPERCASE_AFTER_SIGN'].sub(uppercase_after_sign, p)
-    p = PRETTIFY_RE['NO_SPACES'].sub(lambda m: m.group(1).strip(), p)
+    p = PRETTIFY_RE['SAXON_GENITIVE'].sub(lambda m: m.group(1).replace(' ', '') + ' ', p)
     p = p.strip()
-    if len(p) > 1:
-        p = p[0].capitalize() + p[1:]
-    return p
+    try:
+        return p[0].capitalize() + p[1:]
+    except IndexError:
+        return p
diff --git a/tests.py b/tests.py
@@ -1071,8 +1071,10 @@ def test_should_replace_multiple_single_quotes_with_single_ones(self):
         self.assertEqual('Dave\'s job', prettify("Dave''s job"))
         self.assertEqual("'destiny'", prettify("'''destiny'''"))
 
-    def should_fix_saxon_genitive_spaces(self):
-        self.assertEqual('Dave\'s dog', prettify('Dave\' s dog'))
+    def test_should_fix_saxon_genitive_spaces(self):
+        self.assertEqual("Dave's dog", prettify("Dave' s dog"))
+        self.assertEqual("Dave's dog", prettify("Dave 's dog"))
+        self.assertEqual("Dave's dog", prettify("Dave 'sdog"))
 
     def test_should_replace_multiple_percentage_with_single_ones(self):
         self.assertEqual('%', prettify('%%%'))
@@ -1156,12 +1158,12 @@ def test_should_add_spaces_around_equal_if_missing(self):
     def test_should_add_spaces_around_division_if_missing(self):
         self.assertEqual('5 / 2 = 2.5', prettify('5/ 2 = 2.5'))
         self.assertEqual('5 / 2 = 2.5', prettify('5 /2 = 2.5'))
-        self.assertEqual('5 / 2 = 2.5', prettify('5 / 2 = 2.5'))
+        self.assertEqual('5 / 2 = 2.5', prettify('5/2 = 2.5'))
 
     def test_should_add_spaces_around_multiplication_if_missing(self):
         self.assertEqual('5 * 2 = 10', prettify('5* 2 = 10'))
         self.assertEqual('5 * 2 = 10', prettify('5 *2 = 10'))
-        self.assertEqual('5 * 2 = 10', prettify('5 * 2 = 10'))
+        self.assertEqual('5 * 2 = 10', prettify('5*2 = 10'))
 
     def test_should_prettify_string_as_expected(self):
         original = ' unprettified string ,, like this one,will be"prettified" .it\' s awesome!( like python)) '
@@ -1172,7 +1174,9 @@ def test_should_work_as_expected_for_multiple_lines_string(self):
         original = '''
 
         unprettified string ,,
+
         like this one,will be"prettified"
+
         .it' s awesome!( like python))
 
         '''
