RealA10N · RealA10N · Jan 4, 2022 · Jan 4, 2022 · Jan 4, 2022 · Jan 4, 2022
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: [3.6, 3.7, 3.8, 3.9]
+        version: ['3.6', '3.7', '3.8', '3.9', '3.10']
 
     steps:
       - name: Clone 👀

diff --git a/README.md b/README.md
@@ -2,134 +2,39 @@
 
 [![Test](https://img.shields.io/github/workflow/status/reala10n/validit/%E2%9C%94%20Test?label=test)](https://github.com/RealA10N/validit/actions/workflows/test.yaml)
 [![PyPI](https://img.shields.io/pypi/v/validit)](https://pypi.org/project/validit/)
-[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/validit)](https://pypi.org/project/validit/)
-[![GitHub Repo stars](https://img.shields.io/github/stars/reala10n/validit?style=social)](https://github.com/RealA10N/validit)
 
 _Easily define configuration file structures, and validate files using the templates. 🍒📂_
 
 - [Installation](#installation)
-  - [Support for additional file formats](#support-for-additional-file-formats)
 - [Usage](#usage)
-  - [Defining a template](#defining-a-template)
-  - [Validating data](#validating-data)
-    - [Validating data from files](#validating-data-from-files)
-- [Using validit as a dependency](#using-validit-as-a-dependency)
+  - [Defining a schema](#defining-a-schema)
 
 ## Installation
 
-**validit** is tested on CPython 3.6, 3.7, 3.8, and 3.9.
+**validit** is tested on CPython 3.6 - 3.10.
 Simply install using pip:
 
 ```bash
 $ (sudo) pip install validit
 ```
 
-### Support for additional file formats
-
-By default, _validit_ only supports `JSON` configuration files, or
-already loaded data (not directly from a configuration file). However, using
-additional dependencies, _validit_ supports the following file formats:
-
-- `JSON`
-- `YAML`
-- `TOML`
-
-To install _validit_ with the additional required dependencies to support
-your preferred file format, use:
-
-```yaml
-pip install validit[yaml]        # install dependencies for yaml files
-pip install validit[toml]        # toml files
-pip install validit[json,toml]   # json and toml files
-pip install validit[all]         # all available file formats
-```
-
 ## Usage
 
-### Defining a template
-
-To create a template, you will need the basic `Template` module, and usually the
-other three basic modules `TemplateList`, `TemplateDict`, and `Optional`.
-
-In the following example, we will create a basic template that represents a single user:
-
-```python
-from validit import Template, TemplateList, TemplateDict, Optional
-
-TemplateUser = TemplateDict(            # a dictionary with 2 required values
-    username=Template(str),             # username must be a string
-    passcode=Template(int, str),        # can be a string or an integer.
-    nickname=Optional(Template(str)),   # optional - if provided, must be a string.
-)
-```
-
-### Validating data
-
-To validate your data with a template, you should use the `Validate` object.
-
-```python
-from validit import Template, TemplateDict, Optional, Validate
+### Defining a schema
 
-template = TemplateDict(
-    username=Template(str),
-    passcode=Template(int, str),
-    nickname=Optional(Template(str)),
-)
+**validit** uses Python objects for constructing the Schema.
+We provide a handful collection of Schema classes that should cover all your
+basic usage cases, especially if you are going to validate a JSON, TOML or a YAML configuration file.
+We will briefly talk about how you can create your own Schema objects later.
 
-data = {
-    'username': 'RealA10N',
-    'passcode': 123,
-}
+The classes that we provide for defining schemas are:
 
-valid = Validate(template, data)
-if valid.errors:            # if one or more errors found
-    print(valid.errors)     # print errors to console
-    exit(1)                 # exit the script with exit code 1
+Name                 | Description
+---------------------|-------------------------------------------------------------
+`validit.String`     | Validates a string and matches it with a _RegEx_ pattern.
+`validit.Number`     | Validates any real number in a certain range.
+`validit.Integer`    | Validates an integer in a certain range.
+`validit.Union`      | Matches a value with at least one schema.
+`validit.Dictionary` | Validates a dictionary and all values inside it recursively.
+`validit.Optional`   | Converts a field inside a `Dictionary` into an optional one.
 
-else:                       # if data matches the template
-    run_script(valid.data)  # run the script with the loaded data
-```
-
-#### Validating data from files
-
-If your data is stored in a file, it is possible to use the `ValidateFromJSON`,
-`ValidateFromYAML` or `ValidateFromTOML` objects instead:
-
-```python
-from validit import Template, TemplateDict, Optional, ValidateFromYAML
-
-filepath = '/path/to/data.yaml'
-template = TemplateDict(
-    username=Template(str),
-    passcode=Template(int, str),
-    nickname=Optional(Template(str)),
-)
-
-with open(filepath, 'r') as file:
-    # load and validate data from the file
-    valid = ValidateFromYAML(file, template)
-
-if valid.errors:            # if one or more errors found
-    print(valid.errors)     # print errors to console
-    exit(1)                 # exit the script with exit code 1
-
-else:                       # if data matches the template
-    run_script(valid.data)  # run the script with the loaded data
-```
-
-## Using validit as a dependency
-
-_validit_ is still under active development, and some core features
-may change substantially in the near future.
-
-If you are planning to use _validit_ as a dependency for your project,
-we highly recommend specifying the exact version of the module you are using
-in the `requirements.txt` file or `setup.py` scripts.
-
-For example, to pinpoint version _v1.3.2_ use the following line in your
-`requirements.txt` file:
-
-```yaml
-validit==1.3.2
-validit[yaml]==1.3.2     # If using extra file formats
-```
diff --git a/examples/README.md b/examples/README.md
diff --git a/examples/example1/example1.json b/examples/example1/example1.json
diff --git a/examples/example1/example1.py b/examples/example1/example1.py
diff --git a/examples/example1/example1.toml b/examples/example1/example1.toml
diff --git a/examples/example1/example1.yaml b/examples/example1/example1.yaml
diff --git a/examples/isodates/isodates.py b/examples/isodates/isodates.py
diff --git a/examples/isodates/isodates.toml b/examples/isodates/isodates.toml
diff --git a/examples/isodates/isodates.yaml b/examples/isodates/isodates.yaml
diff --git a/setup.py b/setup.py
@@ -6,41 +6,25 @@ def load_readme():
         return readme.read()
 
 
-REQUIRES = (
-    'termcolor==1.1.0',
-
-    # the dataclasses module is prebuilt into python>=3.7
-    # For Python 3.6, it is supported using a backport
-    'dataclasses; python_version < "3.7"',
-)
-
-
 EXTRAS = {
     'dev': (
         'pytest>=6.2, <6.3',
         'flake8>=3.9, <3.10'
     ),
-    'yaml': (
-        'pyyaml>=5.4, <5.5',
-    ),
-    'toml': (
-        'toml>=0.10.2, <0.11',
-    ),
 }
 
-EXTRAS['all'] = tuple(
-    package
-    for group in EXTRAS
-    if group != 'dev'
-    for package in EXTRAS[group]
+
+REQUIRES = (
+    # the dataclasses module is prebuilt into python>=3.7
+    # For Python 3.6, it is supported using a backport
+    'dataclasses; python_version < "3.7"',
 )
 
-EXTRAS['dev'] += EXTRAS['all']
 
 setup(
     name='validit',
     description='Easily define and validate configuration file structures 📂🍒',
-    version='1.3.2',
+    version='2.0.0-dev',
     author='RealA10N',
     author_email='[email protected]',
     long_description=load_readme(),