Merge pull request #6 from eadwinCode/ellar_refactor_bug_fix

fixed refactor bug

Author: eadwinCode

README.md

@@ -70,13 +70,13 @@ The global guard check can be skipped using the `@skip_throttle()` decorator men
 Example with `@guards(ThrottlerGuard)`
 ```python
 # project_name/controller.py
-from ellar.common import Controller, guards
+from ellar.common import Controller, Guards
 from ellar_throttler import throttle, ThrottlerGuard
 
 @Controller()
 class AppController:
 
-  @guards(ThrottlerGuard)
+  @Guards(ThrottlerGuard)
   @throttle(limit=5, ttl=30)
   def normal(self):
       pass
@@ -178,7 +178,7 @@ To work with Websockets you can extend the `ThrottlerGuard` and override the `ha
 ```python
 from ellar_throttler import ThrottlerGuard
 from ellar.di import injectable
-from ellar.core import IExecutionContext
+from ellar.common import IExecutionContext
 from ellar_throttler import ThrottledException
 
 @injectable()

ellar_throttler/exception.py

@@ -1,7 +1,7 @@
 import math
 import typing as t
 
-from ellar.core.exceptions import APIException
+from ellar.common import APIException
 from starlette import status
 
 

ellar_throttler/module.py

@@ -1,8 +1,7 @@
 import typing as t
 
-from ellar.common import Module
-from ellar.core import IExecutionContext
-from ellar.core.modules import DynamicModule, IModuleSetup, ModuleBase
+from ellar.common import IExecutionContext, IModuleSetup, Module
+from ellar.core.modules import DynamicModule, ModuleBase
 from ellar.di import ProviderConfig
 
 from ellar_throttler.interfaces import IThrottlerStorage
@@ -29,7 +28,7 @@ def setup(
                 IThrottlerStorage, use_class=ThrottlerStorageService
             )
 
-        return DynamicModule(  # type: ignore
+        return DynamicModule(  # type:ignore
             cls,
             providers=[
                 _provider,

ellar_throttler/throttler_guard.py

@@ -1,11 +1,11 @@
 import hashlib
 import typing as t
 
-from ellar.core import GuardCanActivate, IExecutionContext, Response
+from ellar.common import GuardCanActivate, IExecutionContext, Response
+from ellar.common.helper import get_name
 from ellar.core.connection import HTTPConnection
+from ellar.core.services import Reflector
 from ellar.di import injectable
-from ellar.helper import get_name
-from ellar.services import Reflector
 
 from .constants import THROTTLER_LIMIT, THROTTLER_SKIP, THROTTLER_TTL
 from .exception import ThrottledException

ellar_throttler/throttler_module_options.py

@@ -1,7 +1,6 @@
 import typing as t
 
-from ellar.core import IExecutionContext
-from ellar.serializer import Serializer
+from ellar.common import IExecutionContext, Serializer
 
 
 class ThrottlerModuleOptions(Serializer):

ellar_throttler/throttler_storage_options.py

@@ -1,4 +1,4 @@
-from ellar.serializer import Serializer
+from ellar.common import Serializer
 
 
 class ThrottlerStorageOption(Serializer):

ellar_throttler/throttler_storage_record.py

@@ -1,4 +1,4 @@
-from ellar.serializer import Serializer
+from ellar.common import Serializer
 
 
 class ThrottlerStorageRecord(Serializer):

pyproject.toml

@@ -41,7 +41,7 @@ classifiers = [
 ]
 
 dependencies = [
-    "ellar >= 0.3.4"
+    "ellar >= 0.3.8"
 ]
 
 

tests/test_throttler.py

@@ -5,7 +5,7 @@
 from app.server import app
 from ellar.cache import CacheModule
 from ellar.cache.backends.local_cache import LocalMemCacheBackend
-from ellar.core import TestClient, TestClientFactory
+from ellar.testing import Test, TestClient
 
 from ellar_throttler import (
     CacheThrottlerStorageService,
@@ -85,15 +85,15 @@ def test_default_controller_index(self):
 
 class TestSkipIfConfigure:
     def test_skip_configure(self):
-        test_module = TestClientFactory.create_test_module(
+        test_module = Test.create_test_module(
             modules=(
                 ThrottlerModule.setup(limit=5, ttl=100, skip_if=lambda ctx: True),
                 ControllerModule,
             ),
             global_guards=[ThrottlerGuard],
         )
 
-        _client = test_module.get_client()
+        _client = test_module.get_test_client()
         for i in range(15):
             res = _client.get("/")
 
@@ -106,7 +106,7 @@ def test_skip_configure(self):
 
 
 class TestThrottlerStorageServiceConfiguration:
-    test_module_cache = TestClientFactory.create_test_module(
+    test_module_cache = Test.create_test_module(
         modules=(
             ThrottlerModule.setup(
                 limit=5, ttl=100, storage=CacheThrottlerStorageService
@@ -118,7 +118,7 @@ class TestThrottlerStorageServiceConfiguration:
         config_module=dict(CACHES={"default": LocalMemCacheBackend()}),
     )
 
-    test_module_use_value = TestClientFactory.create_test_module(
+    test_module_use_value = Test.create_test_module(
         modules=(
             ThrottlerModule.setup(limit=5, ttl=100, storage=ThrottlerStorageService()),
             ControllerModule,
@@ -138,7 +138,7 @@ def request_for_limit(self, app_client, url, limit):
 
     @pytest.mark.parametrize("test_module", [test_module_cache, test_module_use_value])
     def test_limit_index(self, test_module):
-        _client = test_module.get_client()
+        _client = test_module.get_test_client()
 
         for url, limit in [("/limit/", 2), ("/limit/higher", 5)]:
             self.request_for_limit(_client, url, limit)
@@ -151,7 +151,7 @@ def test_limit_index(self, test_module):
 
     @pytest.mark.parametrize("test_module", [test_module_cache, test_module_use_value])
     def test_limit_get_shorter(self, test_module):
-        _client = test_module.get_client()
+        _client = test_module.get_test_client()
         limit, url = (
             5,
             "/limit/shorter",
@@ -167,7 +167,7 @@ def test_limit_get_shorter(self, test_module):
 
     @pytest.mark.parametrize("test_module", [test_module_use_value])
     def test_limit_get_shorter_cache_clear(self, test_module):
-        _client = test_module.get_client()
+        _client = test_module.get_test_client()
         limit, url = (
             5,
             "/limit/shorter-2",