Merge pull request #7 from fbouliane/allow-calls-to-ubersmith-core

Refactor UbersmithCore.xx to remote.ubersmith.xx

Author: idjaw

tests/Integration/test_router_ubersmith_core.py

@@ -17,23 +17,23 @@
 from flexmock import flexmock, flexmock_teardown
 
 from . import ContextMatcher
-from ubersmith_remote_module_server import ubersmith_core
+from ubersmith_remote_module_server import remote
 from ubersmith_remote_module_server.objects import RequestContext
 from ubersmith_remote_module_server.router import Router
-from ubersmith_remote_module_server.ubersmith_core import UbersmithCore
+from ubersmith_remote_module_server.remote import ubersmith
 
 
 class FakeModule(object):
     def call_uber_core(self):
-        UbersmithCore.test()
+        ubersmith.test()
 
 
 class RouterUbersmithCoreTest(unittest.TestCase):
     def test_a_module_can_call_ubersmith_core_without_context(self):
         fake_module = FakeModule()
         remote_executor_mock = flexmock()
 
-        flexmock(ubersmith_core).should_receive('RemoteExecutor').\
+        flexmock(remote).should_receive('RemoteExecutor').\
             with_args(context=RequestContext).and_return(remote_executor_mock)
 
         remote_executor_mock.should_receive('invoke_global').with_args('test', args={}).once()
@@ -49,7 +49,7 @@ def test_module_context_is_injected_when_service_module(self):
                             'url': 'http://user:[email protected]/'
                                    'api/2.0/?method=service.module_call'}
 
-        flexmock(ubersmith_core).should_receive('RemoteExecutor'). \
+        flexmock(remote).should_receive('RemoteExecutor'). \
             with_args(context=ContextMatcher(callback_url=example_callback['url'],
                                              module_id='44',
                                              service_id='1260'))\
@@ -70,7 +70,7 @@ def test_module_context_is_injected_when_device_module(self):
                                    'api/2.0/?method=device.module_call'}
 
         remote_executor_mock = flexmock()
-        flexmock(ubersmith_core).should_receive('RemoteExecutor'). \
+        flexmock(remote).should_receive('RemoteExecutor'). \
             with_args(context=ContextMatcher(callback_url=example_callback['url'],
                                              module_id='173',
                                              device_id='200025'))\

tests/test_remote_executor.py tests/test_remote.pytests/test_remote_executor.py renamed to tests/test_remote.py

@@ -1,4 +1,4 @@
-# Copyright 2016 Internap.
+# Copyright 2016 Internap
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,18 +16,47 @@
 
 from flexmock import flexmock, flexmock_teardown
 
-from ubersmith_remote_module_server import _remote_executor
-from ubersmith_remote_module_server._remote_executor import RemoteExecutor
+from tests import mock_ubersmith_client, mock_ubersmith_api
+from ubersmith_remote_module_server import remote
+from ubersmith_remote_module_server.exceptions import NoRequestContext, NamedArgumentsOnly
 from ubersmith_remote_module_server.objects import RequestContext
-from . import mock_ubersmith_client, mock_ubersmith_api
+from ubersmith_remote_module_server.remote import RemoteExecutor, ubersmith, \
+    ConfiguredRequestContext
+
+
+class UbersmithCoreTest(unittest.TestCase):
+    def test_raises_when_out_of_context(self):
+        remote_executor_mock = flexmock()
+        flexmock(remote).should_receive('RemoteExecutor').and_return(remote_executor_mock)
+        with self.assertRaises(NoRequestContext):
+            ubersmith.test()
+
+    def test_raises_when_args(self):
+        remote_executor_mock = flexmock()
+        flexmock(remote).should_receive('RemoteExecutor').and_return(remote_executor_mock)
+        with self.assertRaises(NamedArgumentsOnly):
+            ubersmith.test('hello')
+
+    def test_calls_executor_with_context_when_called(self):
+        remote_executor_mock = flexmock()
+        flexmock(remote).should_receive('RemoteExecutor'). \
+            with_args(context='context').and_return(remote_executor_mock).once()
+        remote_executor_mock.should_receive('invoke_global').with_args('test', args={}).once()
+
+        with ConfiguredRequestContext(context='context'):
+            ubersmith.test()
+
+    def tearDown(self):
+        flexmock_teardown()
+        super(UbersmithCoreTest, self).tearDown()
 
 
 class RemoteExecutorTest(unittest.TestCase):
     def test_invoke_global_from_device_module(self):
         ubersmith_client = mock_ubersmith_client()
         ubersmith_api = mock_ubersmith_api()
 
-        flexmock(_remote_executor).should_receive('ubersmith_client').and_return(ubersmith_client)
+        flexmock(remote).should_receive('ubersmith_client').and_return(ubersmith_client)
 
         ubersmith_client.api.should_receive('init')\
             .with_args(url='http://ubersmith.example/url',
@@ -50,7 +79,7 @@ def test_invoke_global_from_service_module(self):
         ubersmith_client = mock_ubersmith_client()
         ubersmith_api = mock_ubersmith_api()
 
-        flexmock(_remote_executor).should_receive('ubersmith_client').and_return(ubersmith_client)
+        flexmock(remote).should_receive('ubersmith_client').and_return(ubersmith_client)
 
         ubersmith_client.api.should_receive('init')\
             .with_args(url='http://ubersmith.example/url',
@@ -74,5 +103,3 @@ def test_invoke_global_from_service_module(self):
     def tearDown(self):
         flexmock_teardown()
         super(RemoteExecutorTest, self).tearDown()
-
-

tests/test_ubersmith_core.py

@@ -15,6 +15,41 @@
 import ubersmith_client
 from six.moves.urllib.parse import urlparse
 
+from ubersmith_remote_module_server.exceptions import NoRequestContext, NamedArgumentsOnly
+
+_configuration = None
+
+__all__ = ['ubersmith']
+
+
+class ConfiguredRequestContext(object):
+    def __init__(self, **kwargs):
+        self.kwargs = kwargs or {}
+
+    def __enter__(self):
+        global _configuration
+        _configuration = self.kwargs
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        global _configuration
+        _configuration = None
+
+
+class UbersmithRemoteProxy(object):
+    def _invoke_method(self, name, *args, **kwargs):
+        global _configuration
+        if args:
+            raise NamedArgumentsOnly()
+        if _configuration is None:
+            raise NoRequestContext()
+        executor = RemoteExecutor(**_configuration)
+        executor.invoke_global(name, args=kwargs)
+
+    def __getattr__(self, func_name):
+        def invoke_without_name(*args, **kwargs):
+            return self._invoke_method(func_name, *args, **kwargs)
+        return invoke_without_name
+
 
 class RemoteExecutor(object):
     def __init__(self, context):
@@ -36,3 +71,5 @@ def invoke_global(self, func_name, args):
                                                      module_id=self.context.module_id,
                                                      function='_web_hook_invoke_global',
                                                      module_params=[func_name, [args]])
+
+ubersmith = UbersmithRemoteProxy()

…remote_module_server/_remote_executor.py ubersmith_remote_module_server/remote.pyubersmith_remote_module_server/_remote_executor.py renamed to ubersmith_remote_module_server/remote.py ubersmith_remote_module_server/_remote_executor.py renamed to ubersmith_remote_module_server/remote.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from ubersmith_remote_module_server.objects import RequestContext
-from ubersmith_remote_module_server.ubersmith_core import ConfiguredRequestContext
+from ubersmith_remote_module_server.remote import ConfiguredRequestContext
 
 
 class Router(object):