Merge pull request #5 from BrunoSilvaAndrade/develop

Develop

Author: BrunoSilvaAndrade

.gitignore

@@ -4,3 +4,4 @@ venv
 dist
 build
 wheel
+.coverage

parsers.py

@@ -0,0 +1,20 @@
+import json
+import yaml
+
+
+class ParseException(Exception):
+    pass
+
+
+def json_parser(file_buff):
+    try:
+        return json.loads(file_buff)
+    except json.JSONDecodeError as e:
+        raise ParseException(f'Unable to decode config file using json', e)
+
+
+def yaml_parser(file_buff):
+    try:
+        return yaml.safe_load(file_buff)
+    except yaml.YAMLError as e:
+        raise ParseException(f'Unable to decode config file using yaml', e)

pyconfigparser.py

@@ -1,37 +1,28 @@
+from parsers import ParseException, json_parser, yaml_parser
 from schema import Schema, SchemaError
 from typing import Any
 from os import path
-import json
-import yaml
 import os
 import re
 
-
-def json_parser(file_buff):
-    try:
-        return json.loads(file_buff)
-    except json.JSONDecodeError as e:
-        raise ConfigFileDecodeError(f'Unable to decode config file using json', e)
-
-
-def yaml_parser(file_buff):
-    try:
-        return yaml.safe_load(file_buff)
-    except yaml.YAMLError as e:
-        raise ConfigFileDecodeError(f'Unable to decode config file using yaml', e)
-
-
 LINUX_KEY_VARIABLE_PATTERN = r'\$([a-zA-Z][\w]+|\{[a-zA-Z][\w]+\})$'
 DEFAULT_CONFIG_FILES = ('config.json', 'config.yaml', 'config.yml')
 ENTITY_NAME_PATTERN = r'^[a-zA-Z][\w]+$'
-
 SUPPORTED_EXTENSIONS = {
     'json': json_parser,
     'yaml': yaml_parser,
     'yml': yaml_parser
 }
 
 
+class ConfigError(Exception):
+    pass
+
+
+class ConfigFileNotFoundError(ConfigError):
+    pass
+
+
 class ConfigValue:
 
     def __getitem__(self, item):
@@ -40,6 +31,15 @@ def __getitem__(self, item):
     def __iter__(self):
         return self.__dict__.keys().__iter__()
 
+    def __len__(self):
+        return len(self.__dict__)
+
+    def keys(self):
+        return self.__dict__.keys()
+
+    def values(self):
+        return self.__dict__.values()
+
 
 class Config:
     __instance = None
@@ -147,15 +147,3 @@ def extract_env_variable_key(cls, variable):
         if variable[0] == '{':
             return variable[1:-1]
         return variable
-
-
-class ConfigError(Exception):
-    pass
-
-
-class ConfigFileDecodeError(ConfigError):
-    pass
-
-
-class ConfigFileNotFoundError(ConfigError):
-    pass

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name='python-config-parser',
-    version='2.1.1',
+    version='2.2.0',
     author='Bruno Silva de Andrade',
     author_email='brunojf.andrade@gmail.com',
     description='Project created to given the possibility of create dynamics config files',
@@ -20,4 +20,4 @@
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
     ]
-)
+)

test_configparser.py

@@ -1,7 +1,7 @@
-import os
-import unittest
+from pyconfigparser import Config, ConfigError, ConfigFileNotFoundError, ParseException
 from config.schemas import SIMPLE_SCHEMA_CONFIG, UNSUPPORTED_OBJECT_KEYS_SCHEMA
-from pyconfigparser import Config, ConfigError, ConfigFileNotFoundError, ConfigFileDecodeError
+import unittest
+import os
 
 DT_FMT_TEST = '%Y-%m-%dT%H:%M:%SZ'
 VAR_LOG_LEVEL_INFO = 'INFO'
@@ -56,8 +56,8 @@ def test_config_file_with_unsupported_extension(self):
         self.assertRaises(ConfigError, Config.get_config, SIMPLE_SCHEMA_CONFIG, file_name='config.bad_extension')
 
     def test_bad_decoder_error(self):
-        self.assertRaises(ConfigFileDecodeError, Config.get_config, SIMPLE_SCHEMA_CONFIG, file_name='bad_content.json')
-        self.assertRaises(ConfigFileDecodeError, Config.get_config, SIMPLE_SCHEMA_CONFIG, file_name='bad_content.yaml')
+        self.assertRaises(ParseException, Config.get_config, SIMPLE_SCHEMA_CONFIG, file_name='bad_content.json')
+        self.assertRaises(ParseException, Config.get_config, SIMPLE_SCHEMA_CONFIG, file_name='bad_content.yaml')
 
 
 if __name__ == '__main__':