make sure your is not changed

kyclark · kyclark · commit 72235544e9fe · 2020-05-14T15:33:57.000-07:00
diff --git a/15_kentucky_friar/solution1_regex.py b/15_kentucky_friar/solution1_regex.py
@@ -38,14 +38,15 @@ def main():
 def fry(word):
     """Drop the `g` from `-ing` words, change `you` to `y'all`"""
 
-    if word.lower() == 'you':
-        return word[0] + "'all"
+    ing_word = re.search('(.+)ing$', word)
+    you = re.match('([Yy])ou$', word)
 
-    if word.endswith('ing'):
-        if any(map(lambda c: c.lower() in 'aeiouy', word[:-3])):
-            return word[:-1] + "'"
-        else:
-            return word
+    if ing_word:
+        prefix = ing_word.group(1)
+        if re.search('[aeiouy]', prefix, re.IGNORECASE):
+            return prefix + "in'"
+    elif you:
+        return you.group(1) + "'all"
 
     return word
 
@@ -56,6 +57,7 @@ def test_fry():
 
     assert fry('you') == "y'all"
     assert fry('You') == "Y'all"
+    assert fry('your') == 'your'
     assert fry('fishing') == "fishin'"
     assert fry('Aching') == "Achin'"
     assert fry('swing') == "swing"
diff --git a/15_kentucky_friar/solution2_no_regex.py b/15_kentucky_friar/solution2_no_regex.py
@@ -38,15 +38,12 @@ def main():
 def fry(word):
     """Drop the `g` from `-ing` words, change `you` to `y'all`"""
 
-    ing_word = re.search('(.+)ing$', word)
-    you = re.match('([Yy])ou$', word)
+    if word.lower() == 'you':
+        return word[0] + "'all"
 
-    if ing_word:
-        prefix = ing_word.group(1)
-        if re.search('[aeiouy]', prefix, re.IGNORECASE):
-            return prefix + "in'"
-    elif you:
-        return you.group(1) + "'all"
+    if word.endswith('ing'):
+        if any(map(lambda c: c.lower() in 'aeiouy', word[:-3])):
+            return word[:-1] + "'"
 
     return word
 
@@ -57,6 +54,7 @@ def test_fry():
 
     assert fry('you') == "y'all"
     assert fry('You') == "Y'all"
+    assert fry('your') == 'your'
     assert fry('fishing') == "fishin'"
     assert fry('Aching') == "Achin'"
     assert fry('swing') == "swing"
