Merge pull request #101 from mrf345/testing

Fix decorators cache skipping. Add parser and cache abstract base classes

Author: mrf345

flask_minify/about.py

@@ -1,4 +1,4 @@
-__version__ = "0.49"
+__version__ = "0.50"
 __doc__ = "Flask extension to minify html, css, js and less."
 __license__ = "MIT"
 __author__ = "Mohamed Feddad"

flask_minify/cache.py

@@ -1,12 +1,35 @@
+from abc import ABCMeta, abstractmethod
+
 from flask_minify.utils import get_optimized_hashing
 
 
-class MemoryCache:
-    def __init__(self, store_key_getter=None, limit=0):
+class CacheBase(metaclass=ABCMeta):
+    def __init__(self, store_key_getter=None):
         self.store_key_getter = store_key_getter
+
+    @abstractmethod
+    def __getitem__(self, key):
+        pass
+
+    @abstractmethod
+    def __setitem__(self, key, value):
+        pass
+
+    @abstractmethod
+    def get_or_set(self, key, getter):
+        pass
+
+    @abstractmethod
+    def clear(self):
+        pass
+
+
+class MemoryCache(CacheBase):
+    def __init__(self, store_key_getter=None, limit=0):
+        super().__init__(store_key_getter)
         self.limit = limit
-        self._cache = {}
         self.hashing = get_optimized_hashing()
+        self._cache = {}
 
     @property
     def store(self):

flask_minify/decorators.py

@@ -39,7 +39,7 @@ def minify(
     -------
         String of minified HTML content.
     """
-    caching = MemoryCache(caching_limit if cache else 0)
+    caching = MemoryCache(limit=caching_limit if cache else 0)
     parser = Parser(parsers, fail_safe, go=go)
     parser.update_runtime_options(html, js, cssless)
 

flask_minify/parsers.py

@@ -1,5 +1,7 @@
+from abc import ABCMeta, abstractmethod
 from functools import lru_cache
 from io import StringIO
+from typing import Any, Dict
 
 from htmlmin import minify as minify_html
 from jsmin import jsmin
@@ -15,7 +17,18 @@
 from flask_minify.utils import get_tag_contents
 
 
-class ParserMixin:
+class ParserBase(metaclass=ABCMeta):
+    @property
+    @abstractmethod
+    def runtime_options(self) -> Dict[str, Any]:
+        pass
+
+    @abstractmethod
+    def executer(self, *args, **kwargs):
+        pass
+
+
+class ParserMixin(ParserBase):
     # parser specific runtime option will take precedence over global
     takes_precedence = False
     go = False

noxfile.py

@@ -16,7 +16,7 @@
 
 
 @nox.session(python=__supported_versions__)  # type: ignore
-def test(session: nox.session):
+def test(session: nox.Session):
     session.install("-r", test_req_path)
     session.run("python", "-m", "pytest")
     session.run("python", "-m", "bandit", "-c", "bandit.yml", "-r", ".")