Relaxing schema using, re-writing schema tests

Author: BrunoSilvaAndrade

pyconfigparser.py

@@ -71,13 +71,12 @@ def get_config(cls, schema: dict = None, config_dir: str = 'config', file_name:
 
     @classmethod
     def __create_new_instance(cls, schema, config_dir, file_name):
-        cls.__check_schema(schema)
         file_path = cls.__get_file_path(config_dir, file_name)
         parser = cls.__get_file_parser(file_path)
         file_buff = cls.__get_file_buff(file_path)
 
         try:
-            config = Schema(schema).validate(parser(file_buff))
+            config = cls.__validate_schema(schema, parser(file_buff))
             return cls.__dict_2_obj(config)
         except SchemaError as e:
             raise ConfigError('Schema validation error', e)
@@ -103,11 +102,13 @@ def __get_file_path(cls, config_dir, file_name):
         raise ConfigFileNotFoundError(f'Config file {file_path}{file_name} was not found')
 
     @classmethod
-    def __check_schema(cls, schema):
+    def __validate_schema(cls, schema, config_obj):
         if schema is None:
-            raise ConfigError('The schema config can not be None')
-        if type(schema) is not dict:
-            raise ConfigError('The first config\'s schema element should be a Map')
+            return config_obj
+        elif type(schema) not in (dict, list):
+            raise ConfigError('The first config\'s schema element should be a Map or a List')
+
+        return Schema(schema).validate(config_obj)
 
     @classmethod
     def __get_file_buff(cls, path_file: str):

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name='python-config-parser',
-    version='2.0.4',
+    version='2.0.5',
     author='Bruno Silva de Andrade',
     author_email='brunojf.andrade@gmail.com',
     description='Project created to given the possibility of create dynamics config files',

test_configparser.py

@@ -17,8 +17,7 @@ def test_new(self):
         self.assertRaises(RuntimeError, Config)
 
     def test_schema_checking(self):
-        self.assertRaises(ConfigError, Config.get_config)
-        self.assertRaises(ConfigError, Config.get_config, [])
+        self.assertRaises(ConfigError, Config.get_config, 1)
 
     def test_config_without_file(self):
         self.assertRaises(ConfigFileNotFoundError, Config.get_config, SIMPLE_SCHEMA_CONFIG,
@@ -27,7 +26,7 @@ def test_config_without_file(self):
 
     def test_undefined_env_var(self):
         try:
-            Config.get_config(SIMPLE_SCHEMA_CONFIG, file_name='config.yaml')
+            Config.get_config(file_name='config.yaml')
         except Exception as e:
             self.assertIn('Environment', str(e))