Renaming Given -> FirstCall, When -> AlteredCAll, Composer -> Given, …

…composer -> story

bddrest/__init__.py

@@ -1,5 +1,5 @@
 
-from .specification import Call, FirstCall, AlteredCall
+from .specification import Call, FirstCall, AlteredCall, HeaderSet, HTTPStatus
 from .authoring import Given, when, story, response, Story
 from .exceptions import InvalidUrlParametersError, CallVerifyError
 

bddrest/cli/__init__.py

@@ -34,6 +34,12 @@ def launch(self, args=None):
             super().launch()
 
 
+root_launcher = None
+
+
 def main():
-    return MainLauncher()
+    global root_launcher
+    if root_launcher is None:
+        root_launcher = MainLauncher()
+    return root_launcher()
 

bddrest/documentary/__init__.py

@@ -27,7 +27,7 @@ def create_parser(cls, subparsers):
         return parser
 
     def convert_file(self, source, destination):
-        from ..story import Story
+        from ..authoring import Story
         story = Story.load(source)
         story.document(destination, formatter_factory=self.formatters[self.args.format])
 

bddrest/tests/test_call.py

@@ -104,6 +104,50 @@ def test_altered_call():
     )
 
 
+def test_alteredcall_setters_deleters():
+    basecall = FirstCall(
+        'Base call for testing When class',
+        url='/apiv1/devices/id: 1',
+    )
+
+    when = AlteredCall(
+        basecall,
+        title='Testing the When class',
+        url='/apiv1/books/isbn: abc/pages/page: 3?highlight=false',
+        verb='POST',
+        form=dict(a='b'),
+        headers=['A: B'],
+        content_type='text/plain',
+        as_='Admin',
+        extra_environ=dict(A='B')
+    )
+    assert '/apiv1/books/:isbn/pages/:page' == when.url
+    assert dict(isbn='abc', page='3') == when.url_parameters
+    assert dict(highlight='false') == when.query
+    assert dict(a='b') == when.form
+    assert 'POST' == when.verb
+    assert 'A' in when.headers
+    assert 'text/plain' == when.content_type
+    assert 'Admin' == when.as_
+    del when.url_parameters
+    del when.verb
+    del when.headers
+    del when.query
+    del when.content_type
+    del when.as_
+    del when.extra_environ
+    del when.form
+
+    assert dict(id='1') == when.url_parameters
+    assert 'GET' == when.verb
+    assert when.headers is None
+    assert when.query is None
+    assert when.form is None
+    assert when.content_type is None
+    assert when.as_ is None
+    assert when.extra_environ is None
+
+
 def test_call_verify():
     call = FirstCall('Testing FirstCall contractor', url='/id: 1', query=dict(a=1))
     call.conclude(wsgi_application)

bddrest/tests/test_cli.py

@@ -1,6 +1,6 @@
 import unittest
 
-from bddrest import main
+from bddrest.cli import main
 from bddrest.tests.helpers import standard_files_mockup
 
 
@@ -115,4 +115,3 @@ def test_help():
     document  Generates REST API Documentation from standard input to standard
               output.
 '''
-

bddrest/tests/test_documentary.py

@@ -1,6 +1,6 @@
 import io
 
-from bddrest.story import Story
+from bddrest import Story
 
 
 def test_markdown():

bddrest/tests/test_headers.py

@@ -1,7 +1,7 @@
 import unittest
 import re
 
-from bddrest.specification.headerset import HeaderSet
+from bddrest import HeaderSet
 
 
 def test_constructor():

bddrest/tests/test_story.py

@@ -4,10 +4,8 @@
 
 import pytest
 
-from bddrest.authoring import given, when, composer, response
-from bddrest.exceptions import InvalidUrlParametersError, CallVerifyError
-from bddrest.specification import Call, When
-from bddrest.story import Story
+from bddrest import Given, when, story, response, InvalidUrlParametersError, \
+    CallVerifyError, Call, AlteredCall, Story
 
 
 def wsgi_application(environ, start_response):
@@ -58,8 +56,8 @@ def test_given_when():
             phone='+9897654321'
         )
     )
-    with given(wsgi_application, **call) as r:
-        assert r is response
+    with Given(wsgi_application, **call) as s:
+        assert s.response is response._resolver()
         assert response.status == '200 OK'
         assert response.status == 200
         assert 'secret' in response.json
@@ -94,7 +92,7 @@ def test_url_parameters():
         ),
     )
 
-    with given(wsgi_application, **call):
+    with Given(wsgi_application, **call):
         assert response.status == '200 OK'
 
         with pytest.raises(InvalidUrlParametersError):
@@ -131,7 +129,7 @@ def test_url_parameters():
         ),
     )
 
-    with given(wsgi_application, **call):
+    with Given(wsgi_application, **call):
         assert response.status == '200 OK'
 
 def test_to_dict():
@@ -147,7 +145,7 @@ def test_to_dict():
         ),
         headers=[('X-H1', 'Header Value')]
     )
-    with given(wsgi_application, **call):
+    with Given(wsgi_application, **call):
         assert response.status == '200 OK'
         when(
             'Trying invalid code',
@@ -158,7 +156,7 @@ def test_to_dict():
         )
         assert response.status == 400
 
-        story_dict = composer.to_dict()
+        story_dict = story.to_dict()
         assert story_dict['base_call'] == dict(
             title='Binding',
             description='Awesome given description',
@@ -231,7 +229,7 @@ def test_from_dict():
     loaded_story = Story.from_dict(data)
     assert loaded_story is not None
     assert isinstance(loaded_story.base_call, Call)
-    assert isinstance(loaded_story.calls[0], When)
+    assert isinstance(loaded_story.calls[0], AlteredCall)
     assert loaded_story.base_call.response.status == 200
     assert data == loaded_story.to_dict()
 
@@ -248,7 +246,7 @@ def test_dump_load():
         ),
         headers=[('X-H1', 'Header Value')]
     )
-    with given(wsgi_application, **call):
+    with Given(wsgi_application, **call):
         assert response.status == '200 OK'
         when(
             'Trying invalid code',
@@ -258,9 +256,9 @@ def test_dump_load():
         )
         assert response.status == 400
 
-        dumped_story = composer.dumps()
+        dumped_story = story.dumps()
         loaded_story = Story.loads(dumped_story)
-        assert composer.to_dict() == loaded_story.to_dict()
+        assert story.to_dict() == loaded_story.to_dict()
         loaded_story.validate()
 
 
@@ -276,15 +274,15 @@ def test_verify():
         ),
         headers=[('X-H1', 'Header Value')]
     )
-    with given(wsgi_application, **call):
+    with Given(wsgi_application, **call):
         assert response.status == '200 OK'
         when(
             'Trying invalid code',
             form=dict(
                 activationCode='badCode'
             )
         )
-        dumped_story = composer.dumps()
+        dumped_story = story.dumps()
 
     loaded_story = Story.loads(dumped_story)
     loaded_story.verify(wsgi_application)
@@ -308,15 +306,15 @@ def test_dump_load_file():
             ),
             headers=[('X-H1', 'Header Value')]
         )
-        with given(wsgi_application, **call):
+        with Given(wsgi_application, **call):
             assert response.status == '200 OK'
             when(
                 'Trying invalid code',
                 form=dict(
                     activationCode='badCode'
                 )
             )
-            composer.dump(temp_file)
+            story.dump(temp_file)
 
         temp_file.seek(0)
         loaded_story = Story.load(temp_file)
@@ -334,7 +332,7 @@ def test_url_overriding():
         ),
     )
 
-    with given(wsgi_application, **call):
+    with Given(wsgi_application, **call):
         assert response.status == '200 OK'
 
         modified_call = when(
@@ -359,7 +357,7 @@ def wsgi_application(environ, start_response):
         yield json.dumps(result).encode()
 
 
-    with given(
+    with Given(
         wsgi_application, title='Testing authorization header',
         url='/',
         authorization='testuser'