Refctor.

Author: toddbirchard

Pipfile

@@ -3,11 +3,13 @@ name = "pypi"
 url = "https://pypi.org/simple"
 verify_ssl = true
 
-[dev-packages]
-
 [packages]
 redis = "*"
 loguru = "*"
+python-dotenv = "*"
+
+[dev-packages]
+pytest = "*"
 
 [requires]
-python_version = "3.7"
+python_version = "3.8"

Pipfile.lock

@@ -1,6 +1,6 @@
 # Redis Python Tutorial
 
-![Python](https://img.shields.io/badge/Python-v^3.7-blue.svg?logo=python&longCache=true&logoColor=white&colorB=5e81ac&style=flat-square&colorA=4c566a)
+![Python](https://img.shields.io/badge/Python-v3.8-blue.svg?logo=python&longCache=true&logoColor=white&colorB=5e81ac&style=flat-square&colorA=4c566a)
 ![Redis](https://img.shields.io/badge/Redis-v3.2.1-red.svg?longCache=true&style=flat-square&logo=redis&logoColor=white&colorA=4c566a&colorB=bf616a)
 ![Loguru](https://img.shields.io/badge/Loguru-v0.4.1-blue.svg?longCache=true&logo=python&style=flat-square&logoColor=white&colorB=5e81ac&colorA=4c566a)
 ![GitHub Last Commit](https://img.shields.io/github/last-commit/google/skia.svg?style=flat-square&colorA=4c566a&colorB=a3be8c&logo=GitHub)

README.md

@@ -1,5 +1,11 @@
 """Construct Redis connection URI."""
 from os import environ
+from dotenv import load_dotenv
+
+
+# Load environment variables
+basedir = path.abspath(path.dirname(__file__))
+load_dotenv(path.join(basedir, '.env'))
 
 redis_host = environ.get('REDIS_HOST')
 redis_password = environ.get('REDIS_PASSWORD')

config.py

@@ -1,5 +1,7 @@
 """Entry point."""
-from redis_python_tutorial import init_redis_app
+from redis_python_tutorial import init_app
+
+app = init_app()
 
 if __name__ == "__main__":
-    init_redis_app()
+    app

main.py

@@ -1,5 +1,5 @@
 [tool.poetry]
-name = "redis-python-tutorial"
+name = "redis_python_tutorial"
 version = "0.1.0"
 description = ""
 authors = ["Todd Birchard <[email protected]>"]
@@ -9,14 +9,16 @@ readme = "README.md"
 homepage = "https://hackersandslackers.com/redis-py-python/"
 repository = "https://github.com/hackersandslackers/redis-python-tutorial/"
 documentation = "https://hackersandslackers.com/redis-py-python/"
-keywords = ["Redis",
-            "Cache",
-            "Queue",
-            "Sessions",
-            "NoSQL"]
+keywords = [
+    "Redis",
+    "Cache",
+    "Queue",
+    "Memory",
+    "NoSQL"
+]
 
 [tool.poetry.dependencies]
-python = "^3.7"
+python = "3.8"
 redis = "*"
 loguru = "*"
 python-dotenv = "*"
@@ -26,7 +28,7 @@ requires = ["poetry>=0.12"]
 build-backend = "poetry.masonry.api"
 
 [tool.poetry.scripts]
-run = "main:init_redis_app"
+run = "main:app"
 
 [tool.poetry.urls]
 issues = "https://github.com/hackersandslackers/redis-python-tutorial/issues"

pyproject.toml

@@ -8,7 +8,7 @@
 from redis_python_tutorial.data.zset import sorted_set_values_demo
 
 
-def init_redis_app():
+def init_app():
     """Entry point function."""
     r.flushdb()
     init_db_with_values(r)

redis_python_tutorial/__init__.py

@@ -1,13 +1,17 @@
 """Create Redis client."""
 import redis
-from config import (redis_host,
-                    redis_password,
-                    redis_port,
-                    redis_db)
+from config import (
+    redis_host,
+    redis_password,
+    redis_port,
+    redis_db
+)
 
-r = redis.StrictRedis(host=redis_host,
-                      password=redis_password,
-                      port=redis_port,
-                      db=redis_db,
-                      charset="utf-8",
-                      decode_responses=True,)
+r = redis.StrictRedis(
+    host=redis_host,
+    password=redis_password,
+    port=redis_port,
+    db=redis_db,
+    charset="utf-8",
+    decode_responses=True
+)

redis_python_tutorial/client.py

@@ -1,13 +1,12 @@
-
 """Set and manipulate data in Redis."""
-import time
+from time import time
 from config import redis_expiration
 
 
 def init_db_with_values(r):
     """Set single key/value pairs."""
     r.set('ip_address', '0.0.0.0.')
-    r.set('timestamp', int(time.time()))
+    r.set('timestamp', int(time()))
     r.set('user_agent', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_3)')
     r.set('current_page', 'account', redis_expiration)
     return r.keys()

redis_python_tutorial/data/__init__.py

@@ -3,7 +3,7 @@
 
 
 def set_values_demo(r):
-    """Execute unions and intersets between sets."""
+    """Execute unions and intersects between sets."""
     # Add item to set 1
     r.sadd('my_set_1', 'Y')
     logger.info(f"my_set_1: {r.smembers('my_set_1')}'")

redis_python_tutorial/data/set.py

@@ -3,7 +3,9 @@
 from loguru import logger
 
 
-logger.add(sys.stderr,
-           format="{message}",
-           filter="redis_python_tutorial",
-           level="INFO")
+logger.remove()
+logger.add(
+    sys.stderr,
+    format="{message}",
+    level="INFO"
+)

redis_python_tutorial/logging.py

@@ -1,13 +1,3 @@
-atomicwrites==1.4.0
-attrs==19.3.0
 loguru==0.5.1
-more-itertools==8.2.0
-packaging==20.1
-pluggy==0.13.1
-py==1.8.1
-pyparsing==2.4.6
-pytest==6.0.1
 python-dotenv==0.14.0
 redis==3.5.3
-six==1.14.0
-wcwidth==0.1.8