Merge pull request #2 from 0nliner/feature/ignore_components

add: добавил возможность игнорировать компоненты на уровне модуля

Makefile

@@ -6,4 +6,7 @@ sdist:
 bdist_wheel:
 	python setup.py bdist_wheel
 
+upload_build:
+	python -m twine upload --repository pypi dist/* --verbose
+
 .PHONY : sdist bdist_wheel

injector.egg-info/PKG-INFO → archtool.egg-info/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
-Name: injector
+Name: archtool
 Version: 0.1.0
-Home-page: 'https://github.com/0nliner/injector'
+Home-page: https://github.com/0nliner/injector
 Author: Aleksandr Chudaikin
 Author-email: aleksandrchudaikindev@gmail.com
 License: MIT

injector.egg-info/SOURCES.txt → archtool.egg-info/SOURCES.txt

@@ -2,16 +2,16 @@ README.md
 pyproject.toml
 setup.cfg
 setup.py
+archtool.egg-info/PKG-INFO
+archtool.egg-info/SOURCES.txt
+archtool.egg-info/dependency_links.txt
+archtool.egg-info/not-zip-safe
+archtool.egg-info/top_level.txt
 injector/__init__.py
 injector/dependecy_injector.py
 injector/exceptions.py
 injector/global_types.py
 injector/utils.py
-injector.egg-info/PKG-INFO
-injector.egg-info/SOURCES.txt
-injector.egg-info/dependency_links.txt
-injector.egg-info/not-zip-safe
-injector.egg-info/top_level.txt
 injector/components/__init__.py
 injector/components/default_component.py
 injector/interfaces/__init__.py

injector/dependecy_injector.py → archtool/dependecy_injector.py

@@ -4,17 +4,16 @@
                          DependecyDoesNotRegistred
                          )
 
-from .interfaces import (DependecyInjectorInterface,
-                         LayerInterface
-                         )
+from .interfaces import DependecyInjectorInterface
 
-from injector.layers.default_layers import default_layers
-from injector.layers import Layer
-from injector.global_types import (AppModules,
+from archtool.layers.default_layers import default_layers
+from archtool.layers.di_basic_layer import Layer
+from archtool.components.default_component import ComponentPattern
+from archtool.global_types import (AppModules,
                                    ContainerT,
                                    DEPENDENCY_KEY)
 
-from injector.utils import (get_dependencies,
+from archtool.utils import (get_dependencies,
                             serialize_dep_key,
                             get_all_interfaces_and_realizations)
 
@@ -26,26 +25,33 @@
 class DependecyInjector(DependecyInjectorInterface):
     def __init__(self,
                  modules_list: AppModules,
-                 layers: List[LayerInterface] = None):
+                 layers: List[Layer] = None):
 
         self.modules_list = modules_list
-        self.layers = layers if layers else default_layers
         # инициализируем классы слоёв
         # TODO: позже нужно вынести инициализацию.
         #       Это должен делать пользователь
-        self.layers = [layer() for layer in self.layers]
         self._dependencies: Dict[DEPENDENCY_KEY, object] = {}
 
+        self.layers = layers if layers else default_layers
+        self._layers = []
+        for layer in self.layers:
+            initialized_layer = layer()
+            self._layers.append(initialized_layer)
+        self.layers = self._layers
+
     def inject(self):
         for layer in self.layers:
             if issubclass(type(layer), Layer):
-                # TODO: сделать аннотирование на components
-                # TODO: добавить __iter__ на Components класс
-                for component_group in layer.component_groups:
+                for component_pattern in layer.component_groups:
+                    # достаём модули, которые не игнорируют слой
+                    modules_to_interact = self._exclude_ignored_modules(
+                        component_pattern=component_pattern)
+
                     component_group_deps = get_all_interfaces_and_realizations(
-                        app_modules=self.modules_list,
-                        name_pattern=component_group.module_name_regex,
-                        superclass=component_group.superclass)
+                        app_modules=modules_to_interact,
+                        name_pattern=component_pattern.module_name_regex,
+                        superclass=component_pattern.superclass)
 
                     # добавляем зависимости слоя в глобальные зависимости
                     for dep_key, dep_class in component_group_deps.items():
@@ -58,6 +64,13 @@ def inject(self):
         for dep_interface, dep_instance in self._dependencies.items():
             self._inject_dependencies(container=dep_instance)
 
+    def _exclude_ignored_modules(self, component_pattern: ComponentPattern):
+        filtered_modules = []
+        for module in self.modules_list:
+            if component_pattern not in module.ignore:
+                filtered_modules.append(module)
+        return filtered_modules
+
     def _inject_dependencies(self, container: ContainerT) -> None:
         """
         Внедряет зависимости

injector/global_types.py → archtool/global_types.py

@@ -36,12 +36,7 @@ class AppModule:
     """
     import_path: str
     # TODO: перенести логику игнора слоёв
-    ignore_views: bool = field(default=False)
-    ignore_service_interfaces: bool = field(default=False)
-    ignore_repositories_interfaces: bool = field(default=False)
-    ignore_repositories: bool = field(default=False)
-    ignore_services: bool = field(default=False)
-    is_legacy: bool = field(default=True)
+    ignore: List[Any] = field(default_factory=list)
 
     # TODO: написать отдельную функцию валидации модуля,
     # вынести её отдельно

injector/interfaces/dependecy_injector.py → archtool/interfaces/dependecy_injector.py

@@ -1,5 +1,5 @@
 from abc import ABC, abstractmethod
-from injector.global_types import AppModules, DEPENDENCY_KEY
+from archtool.global_types import AppModules, DEPENDENCY_KEY
 
 
 class DependecyInjectorInterface(ABC):

injector/layers/default_layers.py → archtool/layers/default_layers.py

@@ -1,7 +1,7 @@
-from injector.components.default_component import ComponentPattern
-from injector.layers import Layer
+from archtool.components.default_component import ComponentPattern
+from archtool.layers import Layer
 
-from injector.layers.default_layer_interfaces import (ABCView,
+from archtool.layers.default_layer_interfaces import (ABCView,
                                                       ABCService,
                                                       ABCRepo,
                                                       ABCController)

injector/layers/di_basic_layer.py → archtool/layers/di_basic_layer.py

@@ -2,7 +2,7 @@
 from typing import List, Generator
 from inspect import isclass
 
-from injector.components.default_component import ComponentPatternBase
+from archtool.components.default_component import ComponentPatternBase
 
 
 class ValidationError(Exception):
@@ -79,6 +79,7 @@ def __new__(cls, name, bases, attrs, **kwargs):
 
         new_attrs = {"__module__": module,
                      "component_groups": components_instance,
+                     "Components": components_class,
                      "depends_on": depends_on}
 
         new_layer_class = super_new(cls, name, bases, new_attrs)

injector/utils.py → archtool/utils.py

@@ -7,10 +7,10 @@
 from re import sub
 
 from pathlib import Path
-from injector.exceptions import (CheckFailedException,
+from archtool.exceptions import (CheckFailedException,
                                  MultipleRealizationsException,
                                  RealizationNotFount)
-from injector.global_types import (
+from archtool.global_types import (
         Dependecy,
         ContainerT,
         DependeciesT,

examples/example_project/app.py

@@ -3,11 +3,13 @@
 
 sys.path.append(pathlib.Path.cwd().as_posix())
 
-from injector.dependecy_injector import DependecyInjector
-from injector.global_types import AppModule
+from archtool.dependecy_injector import DependecyInjector
+from archtool.layers.default_layers import DomainLayer
+from archtool.global_types import AppModule
 
 modules_list = [
-    AppModule("test_module_1"),
+    AppModule("test_module_1",
+              ignore=[DomainLayer.Components.services]),
     AppModule("test_module_2")
 ]
 

examples/example_project/test_module_1/interfaces.py

@@ -1,5 +1,5 @@
 from abc import abstractmethod, ABCMeta
-from injector.layers.default_layer_interfaces import (ABCService,
+from archtool.layers.default_layer_interfaces import (ABCService,
                                                       ABCRepo)
 
 

examples/example_project/test_module_2/interfaces.py

@@ -1,5 +1,5 @@
 from abc import abstractmethod, ABCMeta
-from injector.layers.default_layer_interfaces import (ABCService,
+from archtool.layers.default_layer_interfaces import (ABCService,
                                                       ABCRepo)
 
 

setup.cfg

@@ -1,5 +1,5 @@
 [metadata]
-name = injector
+name = archtool
 version = 0.1.0
 license = MIT
 author = Aleksandr Chudaikin
@@ -8,7 +8,7 @@ author_email= aleksandrchudaikindev@gmail.com
 description_file= file: README.md
 # package_dir={'': 'injector'}
 # py_modules=['injector'],
-url='https://github.com/0nliner/injector'
+url=https://github.com/0nliner/injector
 keywords=''
 
 install_requires=[]