Move code out of main() for extensibility

diff --git a/src/pgwui_server/__init__.py b/src/pgwui_server/__init__.py
index 0e5a17b31f9d612ac0a61cf2a93ce1e21f192c13..eaab761c394a4a42c6c942fac49ab1ad8e33563c 100644 (file)
--- a/src/pgwui_server/__init__.py
+++ b/src/pgwui_server/__init__.py
@@ -25,11 +25,16 @@
 from pyramid.config import Configurator
 
 
-def main(global_config, **settings):
-    '''Return a Pyramid WSGI application
-    '''
+def pgwui_server_config(settings):
     rp = settings.get('pgwui.route_prefix')
     config = Configurator(settings=settings,
                           route_prefix=rp)
     config.include('pgwui_common')
+    return config
+
+
+def main(global_config, **settings):
+    '''Return a Pyramid WSGI application
+    '''
+    config = pgwui_server_config(settings)
     return config.make_wsgi_app()

diff --git a/tests/test___init__.py b/tests/test___init__.py
index cf1c0ae3697c5419650cb4485c6c063b11e12ae0..8a5429622563bd8cb4e7ced77c082409f0f973a8 100644 (file)
--- a/tests/test___init__.py
+++ b/tests/test___init__.py
@@ -33,8 +33,21 @@ class MockConfigurator():
         pass
 
 
-def test_configure_includecalled(monkeypatch):
+# pgwui_server_config()
+
+def test_pgwui_server_config(monkeypatch):
+    '''Returns a configuration'''
     monkeypatch.setattr(pgwui_server_init, 'Configurator', MockConfigurator)
 
+    result = pgwui_server_init.pgwui_server_config({})
+    assert isinstance(result, MockConfigurator)
+
+
+# main()
+def test_main(monkeypatch):
+    '''Returns a wsgi app'''
+    monkeypatch.setattr(pgwui_server_init, 'pgwui_server_config',
+                        lambda *args: MockConfigurator())
+
     result = pgwui_server_init.main({})
     assert result == 'wsgi_app'