update to_snake_case function

Author: okue

linebot/utils.py

@@ -12,12 +12,13 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-"""linebot.http_client module."""
+"""linebot.utils module."""
 
 from __future__ import unicode_literals
 
 import logging
 import re
+
 import sys
 
 LOGGER = logging.getLogger('linebot')
@@ -31,8 +32,10 @@ def to_snake_case(text):
     :param str text:
     :rtype: str
     """
-    s1 = re.sub('(.)([A-Z0-9][a-z]+)', r'\1_\2', text)
-    return re.sub('([a-z])([A-Z0-9])', r'\1_\2', s1).lower()
+    s1 = re.sub('(.)([A-Z])', r'\1_\2', text)
+    s2 = re.sub('(.)([0-9]+)', r'\1_\2', s1)
+    s3 = re.sub('([0-9])([a-z])', r'\1_\2', s2)
+    return s3.lower()
 
 
 def to_camel_case(text):

tests/test_utils.py

@@ -21,11 +21,14 @@
 
 class TestUtils(unittest.TestCase):
     def test_to_snake_case(self):
-        self.assertEqual(to_snake_case('hogeBar'), 'hoge_bar')
+        self.assertEqual(to_snake_case('hogeBarFuga'), 'hoge_bar_fuga')
         self.assertEqual(to_snake_case('uniqueMediaPlayed100Percent'), 'unique_media_played_100_percent')
+        self.assertEqual(to_snake_case('festival20Days'), 'festival_20_days')
+        self.assertEqual(to_snake_case('festival20days'), 'festival_20_days')
 
     def test_to_camel_case(self):
         self.assertEqual(to_camel_case('hoge_bar'), 'hogeBar')
+        self.assertEqual(to_camel_case('unique_media_played_100_percent'), 'uniqueMediaPlayed100Percent')
 
     def test_safe_compare_digest_true(self):
         self.assertTrue(safe_compare_digest('/gg9a+LvFevTH1sd7', '/gg9a+LvFevTH1sd7'))