Tuning utils.printable_name.

pekkaklarck · pekkaklarck · commit 233d9a4b8e60 · 2016-01-13T16:29:19.000+02:00
- Fixed `printable_name('42FOO', code_style=True)` to yield '42 FOO'
  and not '42FOO'. '42Foo' already yielded '42 Foo'.
- Small performance enhancements.
diff --git a/src/robot/utils/misc.py b/src/robot/utils/misc.py
@@ -67,33 +67,35 @@ def printable_name(string, code_style=False):
     parts = string.split()
     if not parts:
         return ''
-    if code_style and len(parts) == 1:
-        parts = _splitCamelCaseString(parts[0])
-    return ' '.join(part[0].upper() + part[1:] for part in parts if part != '')
-
-
-def _splitCamelCaseString(string):
-    parts = []
-    current_part = []
-    string = ' ' + string + ' '  # extra spaces make going through string easier
-    for i in range(1, len(string)-1):
-        # on 1st/last round prev/next is ' ' and char is 1st/last real char
-        prev, char, next = string[i-1:i+2]
-        if _isWordBoundary(prev, char, next):
-            parts.append(''.join(current_part))
-            current_part = [char]
+    if code_style and len(parts) == 1 \
+            and not (string.isalpha() and string.islower()):
+        parts = _camelCaseSplit(list(string))
+    return ' '.join(part[0].upper() + part[1:] for part in parts)
+
+
+def _camelCaseSplit(chars):
+    token = []
+    for prev, char, next in zip([''] + chars, chars, chars[1:] + ['']):
+        if _isCamelCaseBoundary(prev, char, next):
+            if token:
+                yield ''.join(token)
+            token = [char]
         else:
-            current_part.append(char)
-    parts.append(''.join(current_part))   # append last part
-    return parts
+            token.append(char)
+    if token:
+        yield ''.join(token)
 
 
-def _isWordBoundary(prev, char, next):
+def _isCamelCaseBoundary(prev, char, next):
+    if prev.isdigit():
+        return not char.isdigit()
+    if not prev.isalpha():
+        return False
     if char.isupper():
-        return (prev.islower() or next.islower()) and prev.isalnum()
+        return not (prev.isupper() and (not next or next.isupper()))
     if char.isdigit():
-        return prev.isalpha()
-    return prev.isdigit()
+        return not prev.isdigit()
+    return False
 
 
 def plural_or_not(item):
diff --git a/utest/utils/test_misc.py b/utest/utils/test_misc.py
@@ -75,6 +75,7 @@ def test_printable_name(self):
                          ('camelCaseName', 'CamelCaseName'),
                          ('with89numbers', 'With89numbers'),
                          ('with 89 numbers', 'With 89 Numbers'),
+                         ('with 89_numbers', 'With 89_numbers'),
                          ('', '')]:
             assert_equal(printable_name(inp), exp)
 
@@ -84,12 +85,17 @@ def test_printable_name_with_code_style(self):
                          ('under_score_name', 'Under Score Name'),
                          ('under_score and spaces', 'Under Score And Spaces'),
                          ('miXed_CAPS_nAMe', 'MiXed CAPS NAMe'),
+                         ('with 89_numbers', 'With 89 Numbers'),
                          ('camelCaseName', 'Camel Case Name'),
+                         ('mixedCAPSCamelName', 'Mixed CAPS Camel Name'),
                          ('camelCaseWithDigit1', 'Camel Case With Digit 1'),
+                         ('teamX', 'Team X'),
                          ('name42WithNumbers666', 'Name 42 With Numbers 666'),
+                         ('name42WITHNumbers666', 'Name 42 WITH Numbers 666'),
                          ('12more34numbers', '12 More 34 Numbers'),
-                         ('mixedCAPSCamelName', 'Mixed CAPS Camel Name'),
                          ('foo-bar', 'Foo-bar'),
+                         ('Foo-b:a;r!', 'Foo-b:a;r!'),
+                         ('Foo-B:A;R!', 'Foo-B:A;R!'),
                          ('', '')]:
             assert_equal(printable_name(inp, code_style=True), exp)
 
