From b65f1814026a4d26bc29310e94843809f0dfc5d7 Mon Sep 17 00:00:00 2001
From: Alex Root Junior <jroot.junior@gmail.com>
Date: Tue, 15 Aug 2017 04:32:11 +0300
Subject: [PATCH] More correct names for writing styles in HelperMode

---
 aiogram/bot/api.py              |  2 +-
 aiogram/dispatcher/filters.py   |  2 +-
 aiogram/types/chat.py           |  2 +-
 aiogram/types/message.py        |  2 +-
 aiogram/types/message_entity.py |  2 +-
 aiogram/types/update.py         |  2 +-
 aiogram/utils/helper.py         | 40 ++++++++++++++++++++-------------
 7 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/aiogram/bot/api.py b/aiogram/bot/api.py
index f74b63f9..14cd0dba 100644
--- a/aiogram/bot/api.py
+++ b/aiogram/bot/api.py
@@ -157,7 +157,7 @@ class Methods(Helper):
 
     List is updated to Bot API 3.2
     """
-    mode = HelperMode.camelCase
+    mode = HelperMode.lowerCamelCase
 
     # Getting Updates
     GET_UPDATES = Item()  # getUpdates
diff --git a/aiogram/dispatcher/filters.py b/aiogram/dispatcher/filters.py
index 3de5ca58..d1968968 100644
--- a/aiogram/dispatcher/filters.py
+++ b/aiogram/dispatcher/filters.py
@@ -154,7 +154,7 @@ def generate_default_filters(dispatcher, *args, **kwargs):
 
 
 class DefaultFilters(Helper):
-    mode = HelperMode.lower_case
+    mode = HelperMode.snake_case
 
     COMMANDS = Item()  # commands
     REGEXP = Item()  # regexp
diff --git a/aiogram/types/chat.py b/aiogram/types/chat.py
index af710c17..1c2ac77f 100644
--- a/aiogram/types/chat.py
+++ b/aiogram/types/chat.py
@@ -127,7 +127,7 @@ class ChatActions(Helper):
     :key: UPLOAD_VIDEO_NOTE 
     """
 
-    mode = HelperMode.lower_case
+    mode = HelperMode.snake_case
 
     TYPING = Item()  # typing
     UPLOAD_PHOTO = Item()  # upload_photo
diff --git a/aiogram/types/message.py b/aiogram/types/message.py
index 88f6da1d..6e6feb3b 100644
--- a/aiogram/types/message.py
+++ b/aiogram/types/message.py
@@ -253,7 +253,7 @@ class ContentType(Helper):
     :key: SUCCESSFUL_PAYMENT 
     :key: UNKNOWN
     """
-    mode = HelperMode.lower_case
+    mode = HelperMode.snake_case
 
     TEXT = ListItem()  # text
     AUDIO = ListItem()  # audio
diff --git a/aiogram/types/message_entity.py b/aiogram/types/message_entity.py
index ac5a51b1..24efbd0f 100644
--- a/aiogram/types/message_entity.py
+++ b/aiogram/types/message_entity.py
@@ -80,7 +80,7 @@ class MessageEntityType(Helper):
     :key: TEXT_LINK 
     :key: TEXT_MENTION 
     """
-    mode = HelperMode.lower_case
+    mode = HelperMode.snake_case
 
     MENTION = Item()  # mention - @username
     HASHTAG = Item()  # hashtag
diff --git a/aiogram/types/update.py b/aiogram/types/update.py
index 4a85106f..b1a7556e 100644
--- a/aiogram/types/update.py
+++ b/aiogram/types/update.py
@@ -57,7 +57,7 @@ class AllowedUpdates(Helper):
     Example:
         >>> bot.get_updates(allowed_updates=AllowedUpdates.MESSAGE + AllowedUpdates.EDITED_MESSAGE)
     """
-    mode = HelperMode.lower_case
+    mode = HelperMode.snake_case
 
     MESSAGE = ListItem()  # message
     EDITED_MESSAGE = ListItem()  # edited_message
diff --git a/aiogram/utils/helper.py b/aiogram/utils/helper.py
index 97220c7c..5b708f18 100644
--- a/aiogram/utils/helper.py
+++ b/aiogram/utils/helper.py
@@ -2,7 +2,7 @@
 Example:
     >>> from aiogram.utils.helper import Helper, ListItem, HelperMode, Item
     >>> class MyHelper(Helper):
-    ...     mode = HelperMode.camelCase
+    ...     mode = HelperMode.lowerCamelCase
     ...     FOO_ITEM = ListItem()
     ...     BAR_ITEM = ListItem()
     ...     BAZ_ITEM = ListItem()
@@ -39,16 +39,26 @@ class Helper:
 class HelperMode(Helper):
     mode = 'original'
 
-    UPPER_CASE = 'upperCase'
-    camelCase = 'camelCase'
+    SCREAMING_SNAKE_CASE = 'SCREAMING_SNAKE_CASE'
+    lowerCamelCase = 'lowerCamelCase'
     CamelCase = 'CamelCase'
-    lower_case = 'lower_case'
+    snake_case = 'snake_case'
     lowercase = 'lowercase'
 
     @classmethod
-    def _upper_case(cls, text):
+    def all(cls):
+        return [
+            cls.SCREAMING_SNAKE_CASE,
+            cls.lowerCamelCase,
+            cls.CamelCase,
+            cls.snake_case,
+            cls.lowercase,
+        ]
+
+    @classmethod
+    def _screaming_snake_case(cls, text):
         """
-        Transform text to UPPER_CASE
+        Transform text to SCREAMING_SNAKE_CASE
 
         :param text:
         :return:
@@ -64,16 +74,16 @@ class HelperMode(Helper):
         return result
 
     @classmethod
-    def _lower_case(cls, text):
+    def _snake_case(cls, text):
         """
-        Transform text to lower_case (Based on UPPER_CASE)
+        Transform text to snake cale (Based on SCREAMING_SNAKE_CASE)
 
         :param text:
         :return:
         """
         if text.islower():
             return text
-        return cls._upper_case(text).lower()
+        return cls._screaming_snake_case(text).lower()
 
     @classmethod
     def _camel_case(cls, text, first_upper=False):
@@ -108,13 +118,13 @@ class HelperMode(Helper):
         :param mode:
         :return:
         """
-        if mode == cls.UPPER_CASE:
-            return cls._upper_case(text)
-        elif mode == cls.lower_case:
-            return cls._lower_case(text)
+        if mode == cls.SCREAMING_SNAKE_CASE:
+            return cls._screaming_snake_case(text)
+        elif mode == cls.snake_case:
+            return cls._snake_case(text)
         elif mode == cls.lowercase:
-            return cls._lower_case(text).replace('_', '')
-        elif mode == cls.camelCase:
+            return cls._snake_case(text).replace('_', '')
+        elif mode == cls.lowerCamelCase:
             return cls._camel_case(text)
         elif mode == cls.CamelCase:
             return cls._camel_case(text, True)