Merge pull request hugapi#314 from timothycrosley/feature/nested_asyncio_support

timothycrosley · timothycrosley · commit 7809307f11e1 · 2016-05-23T22:46:00.000-07:00
Feature/nested asyncio support
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,9 @@ Ideally, within a virtual environment.
 
 Changelog
 =========
+### 2.1.3
+- Fixed nested async calls so that they reuse the same loop
+
 ### 2.1.2
 - Fixed an issue with sharing exception handlers accross multiple modules (Thanks @soloman1124)
 - Fixed how single direction (response / request) middlewares are bounded to work when code is Cython compiled
diff --git a/hug/interface.py b/hug/interface.py
@@ -49,6 +49,9 @@
 
     def asyncio_call(function, *args, **kwargs):
         loop = asyncio.get_event_loop()
+        if loop.is_running():
+            return function(*args, **kwargs)
+
         function = ensure_future(function(*args, **kwargs), loop=loop)
         loop.run_until_complete(function)
         return function.result()
diff --git a/tests/test_async.py b/tests/test_async.py
@@ -37,8 +37,22 @@ async def hello_world():
     assert loop.run_until_complete(hello_world()) == "Hello World!"
 
 
-def test_basic_call_on_method_async():
+def tested_nested_basic_call_async():
+    """Test to ensure the most basic call still works if applied to a method"""
+    @hug.call()
+    async def hello_world(self=None):
+        return await nested_hello_world()
+
+    @hug.local()
+    async def nested_hello_world(self=None):
+        return "Hello World!"
+
+    assert hello_world.interface.http
+    assert loop.run_until_complete(hello_world()) == "Hello World!"
+    assert hug.test.get(api, '/hello_world').data == "Hello World!"
+
 
+def test_basic_call_on_method_async():
     """Test to ensure the most basic call still works if applied to a method"""
     class API(object):
 
@@ -53,7 +67,7 @@ async def hello_world(self=None):
 
 
 def test_basic_call_on_method_through_api_instance_async():
-
+    """Test to ensure instance method calling via async works as expected"""
     class API(object):
 
         def hello_world(self):
@@ -70,7 +84,7 @@ async def hello_world():
 
 
 def test_basic_call_on_method_registering_without_decorator_async():
-
+    """Test to ensure async methods can be used without decorator"""
     class API(object):
 
         def __init__(self):
@@ -83,3 +97,5 @@ async def hello_world_method(self):
 
     assert loop.run_until_complete(api_instance.hello_world_method()) == "Hello World!"
     assert hug.test.get(api, '/hello_world_method').data == "Hello World!"
+
+
diff --git a/tests/test_coroutines.py b/tests/test_coroutines.py
@@ -28,7 +28,7 @@
 
 
 def test_basic_call_coroutine():
-    """ The most basic Happy-Path test for Hug APIs using async """
+    """The most basic Happy-Path test for Hug APIs using async"""
     @hug.call()
     @asyncio.coroutine
     def hello_world():
@@ -37,8 +37,22 @@ def hello_world():
     assert loop.run_until_complete(hello_world()) == "Hello World!"
 
 
-def test_basic_call_on_method_coroutine():
+def test_nested_basic_call_coroutine():
+    """The most basic Happy-Path test for Hug APIs using async"""
+    @hug.call()
+    @asyncio.coroutine
+    def hello_world():
+        return asyncio.async(nested_hello_world())
+
+    @hug.local()
+    @asyncio.coroutine
+    def nested_hello_world():
+        return "Hello World!"
 
+    assert loop.run_until_complete(hello_world()) == "Hello World!"
+
+
+def test_basic_call_on_method_coroutine():
     """Test to ensure the most basic call still works if applied to a method"""
     class API(object):
 
@@ -54,7 +68,7 @@ def hello_world(self=None):
 
 
 def test_basic_call_on_method_through_api_instance_coroutine():
-
+    """Test to ensure the most basic call still works if applied to a method"""
     class API(object):
 
         def hello_world(self):
@@ -72,7 +86,7 @@ def hello_world():
 
 
 def test_basic_call_on_method_registering_without_decorator_coroutine():
-
+    """Test to ensure instance method calling via async works as expected"""
     class API(object):
 
         def __init__(self):
