A few refactors (#145)

* A few refactors.
* Adding `make setup` for local development.

Author: mindflayer

Makefile

@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+VERSION := $(shell python -c 'import mocket; print(mocket.__version__)')
+
 install-dev-requirements:
 	pip install pipenv==2020.11.15
 
@@ -17,6 +19,9 @@ lint-python:
 	pipenv run flake8 --ignore=E501,E731,W503 --exclude=.git,compat.py --per-file-ignores='mocket/async_mocket.py:E999' mocket
 	@echo ""
 
+setup: develop
+	pre-commit install
+
 develop: install-dev-requirements install-test-requirements
 
 test: lint-python test-python
@@ -26,11 +31,11 @@ safetest:
 
 publish: install-test-requirements
 	pipenv run python setup.py sdist
-	pipenv run twine upload dist/mocket-$(shell python -c 'import mocket; print(mocket.__version__)')*.*
-	pipenv run anaconda upload dist/mocket-$(shell python -c 'import mocket; print(mocket.__version__)').tar.gz
+	pipenv run twine upload dist/mocket-$(VERSION).tar.gz
+	pipenv run anaconda upload dist/mocket-$(VERSION).tar.gz
 
 clean:
 	rm -rf *.egg-info dist/
 	find . -type d -name __pycache__ -exec rm -rf {} \;
 
-.PHONY: clean publish safetest test develop lint-python test-python install-test-requirements install-dev-requirements
+.PHONY: clean publish safetest test setup develop lint-python test-python install-test-requirements install-dev-requirements

mocket/mocket.py

@@ -548,18 +548,18 @@ def __init__(self, location, responses):
         ):
             responses = [responses]
 
-        self.responses = []
-        for r in responses:
-            if isinstance(r, BaseException):
-                pass
-            elif not getattr(r, "data", False):
-                if isinstance(r, text_type):
-                    r = encode_to_bytes(r)
-                r = self.response_cls(r)
-            self.responses.append(r)
+        if not responses:
+            self.responses = [self.response_cls(encode_to_bytes(""))]
         else:
-            if not responses:
-                self.responses = [self.response_cls(encode_to_bytes(""))]
+            self.responses = []
+            for r in responses:
+                if isinstance(r, BaseException):
+                    pass
+                elif not getattr(r, "data", False):
+                    if isinstance(r, text_type):
+                        r = encode_to_bytes(r)
+                    r = self.response_cls(r)
+                self.responses.append(r)
 
     def can_handle(self, data):
         return True

tests/tests37/test_asyncio.py

@@ -1,45 +1,48 @@
 import asyncio
+import glob
+import io
 import json
-from unittest import TestCase
+import shutil
 import socket
-import io
+import tempfile
+from unittest import TestCase
 
-from mocket.mocket import Mocket, mocketize
+from mocket.mocket import mocketize
 
 
 class AsyncIoRecordTestCase(TestCase):
+    temp_dir = tempfile.mkdtemp()
+
+    @mocketize(truesocket_recording_dir=temp_dir)
     def test_asyncio_record_replay(self):
         async def test_asyncio_connection():
-            mock_out = b'HTTP/1.1 301 Moved Permanently\r\n'
             reader, writer = await asyncio.open_connection(
-                host='google.com',
+                host="google.com",
                 port=80,
                 family=socket.AF_INET,
                 proto=socket.IPPROTO_TCP,
                 ssl=None,
                 server_hostname=None,
             )
 
-            buf = 'GET / HTTP/1.1\r\nHost: google.com\r\n\r\n'
+            buf = "GET / HTTP/1.1\r\nHost: google.com\r\n\r\n"
             writer.write(buf.encode())
             await writer.drain()
 
-            r = await reader.readline()
+            await reader.readline()
             writer.close()
             await writer.wait_closed()
-    
-        mock_out = b'HTTP/1.1 301 Moved Permanently\r\n'
-
-        test_name = 'test_asyncio_record'
-        # This enables mocket to record the response
-        Mocket.enable(test_name, ".")
 
         loop = asyncio.get_event_loop()
         loop.set_debug(True)
         loop.run_until_complete(test_asyncio_connection())
 
-        dump_filename = f'./{test_name}.json'
-        with io.open(dump_filename) as f:
+        files = glob.glob(f"{self.temp_dir}/*.json")
+        self.assertEqual(len(files), 1)
+
+        with io.open(files[0]) as f:
             responses = json.load(f)
 
-        assert len(responses["google.com"]["80"].keys()) == 1
+        self.assertEqual(len(responses["google.com"]["80"].keys()), 1)
+
+        shutil.rmtree(self.temp_dir)