allow calling only registered methods, namespace change, some tests

Author: Alexey Tsitkin

auto_tasks/__init__.py renamed to eb_sqs/auto_tasks/__init__.py

@@ -11,6 +11,14 @@ def register_task(self, method, queue_name=None, max_retries=None):
 
 
 class NoopTaskService(BaseAutoTaskService):
+    def __init__(self):
+        # type: () -> None
+        self._registered_func_names = []
+
     def register_task(self, method, queue_name=None, max_retries=None):
         # type: (Any, str, int) -> None
-        pass
+        self._registered_func_names.append(method.func_name)
+
+    def is_func_name_registered(self, func_name):
+        # type: (str) -> bool
+        return func_name in self._registered_func_names

auto_tasks/base_service.py renamed to eb_sqs/auto_tasks/base_service.py

@@ -1,8 +1,8 @@
 import importlib
 import logging
 
-from auto_tasks.base_service import BaseAutoTaskService, NoopTaskService
-from auto_tasks.exceptions import RetryableTaskException
+from eb_sqs.auto_tasks.base_service import BaseAutoTaskService, NoopTaskService
+from eb_sqs.auto_tasks.exceptions import RetryableTaskException
 from eb_sqs.decorators import task
 from eb_sqs.worker.worker_exceptions import MaxRetriesReachedException
 
@@ -23,8 +23,21 @@ def _auto_task_wrapper(module_name, class_name, func_name, *args, **kwargs):
 
         module = importlib.import_module(module_name)  # import module
         class_ = getattr(module, class_name)  # find class
-        instance = class_(auto_task_service=NoopTaskService())  # instantiate class using empty AutoTaskService
-        getattr(instance, func_name)(*args, **kwargs)  # invoke method on instance
+
+        noop_task_service = NoopTaskService()
+        instance = class_(auto_task_service=noop_task_service)  # instantiate class using NoopTaskService
+
+        if noop_task_service.is_func_name_registered(func_name):
+            getattr(instance, func_name)(*args, **kwargs)  # invoke method on instance
+        else:
+            logger.error(
+                'Trying to invoke _auto_task_wrapper for unregistered task with module: %s class: %s func: %s args: %s and kwargs: %s',
+                module_name,
+                class_name,
+                func_name,
+                args,
+                kwargs
+            )
     except RetryableTaskException as exc:
         try:
             retry_kwargs = {}

auto_tasks/exceptions.py renamed to eb_sqs/auto_tasks/exceptions.py

@@ -0,0 +1,42 @@
+from unittest import TestCase
+
+from mock import Mock
+
+from eb_sqs.auto_tasks.service import AutoTaskService, _auto_task_wrapper
+
+
+class TestService:
+    _TEST_MOCK = Mock()
+
+    def __init__(self, auto_task_service=None):
+        self._auto_task_service = auto_task_service or AutoTaskService()
+        self._auto_task_service.register_task(self.task_method)
+
+    def task_method(self, *args, **kwargs):
+        self._TEST_MOCK.task_method(*args, **kwargs)
+
+    def non_task_method(self):
+        self._TEST_MOCK.non_task_method()
+
+
+class AutoTasksTest(TestCase):
+    def setUp(self):
+        self._test_service = TestService()
+
+    def test_task_method(self):
+        args = [5, '6']
+        kwargs = {'p1': 'bla', 'p2': 130}
+
+        self._test_service.task_method(*args, **dict(kwargs, execute_inline=True))
+
+        TestService._TEST_MOCK.task_method.assert_called_once_with(*args, **kwargs)
+
+    def test_non_task_method(self):
+        _auto_task_wrapper.delay(
+            self._test_service.__class__.__module__,
+            self._test_service.__class__.__name__,
+            TestService.non_task_method.__name__,
+            execute_inline=True
+        )
+
+        TestService._TEST_MOCK.non_task_method.assert_not_called()

auto_tasks/service.py renamed to eb_sqs/auto_tasks/service.py

@@ -6,7 +6,7 @@
 
 setup(
     name='django-eb-sqs',
-    version='1.32',
+    version='1.30',
     package_dir={'eb_sqs': 'eb_sqs'},
     include_package_data=True,
     packages=find_packages(),