Merge pull request #82 from mrf345/testing

fix lazy initialization missing app bug, and refactor

Author: mrf345

flask_minify/about.py

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

flask_minify/exceptions.py

@@ -1,10 +1,2 @@
 class FlaskMinifyException(Exception):
     """FlaskMinify base exception"""
-
-    pass
-
-
-class MissingApp(FlaskMinifyException):
-    """Raised when the flask app is accessed before it's set"""
-
-    pass

flask_minify/main.py

@@ -1,10 +1,9 @@
 from itertools import tee
 from re import compile as compile_re
 
-from flask import request
+from flask import current_app, request
 
 from flask_minify.cache import MemoryCache
-from flask_minify.exceptions import MissingApp
 from flask_minify.parsers import Parser
 from flask_minify.utils import does_content_type_match
 
@@ -113,27 +112,18 @@ def get_endpoint(self):
 
     @property
     def app(self):
-        """If app was passed take it, otherwise raise an exception.
+        """If app was passed take it, otherwise fallback to `Flask.current_app`.
 
         Returns
         -------
         Flask App
             The current Flask application.
-
-        Raises
-        ------
-        MissingApp
         """
-        if not self._app:
-            raise MissingApp(
-                "Flask app has not been passed to the extension `Minify(app=None)`, "
-                "nor lazy initialized with `.init_app(app)`"
-            )
-
-        return self._app
+        return self._app or current_app
 
     def init_app(self, app):
         """Handle initiation of multiple apps NOTE:Factory Method"""
+        self._app = app
         app.after_request(self.main)
         app.teardown_appcontext(self.teardown)
 

flask_minify/parsers.py

@@ -5,6 +5,7 @@
 from lesscpy import compile as compile_less
 from rcssmin import cssmin
 
+from flask_minify.exceptions import FlaskMinifyException
 from flask_minify.utils import get_tag_contents
 
 
@@ -112,7 +113,10 @@ def minify(self, content, tag):
             minified_or_content = parser.executer(content, **runtime_options)
         except Exception as e:
             if not self.fail_safe:
-                raise e
+                raise FlaskMinifyException(
+                    'Failed to minify "{0}" content'.format(tag)
+                ) from e
+
             minified_or_content = content
 
         return minified_or_content

requirements/main.txt

@@ -1,3 +1,4 @@
+six
 flask
 lesscpy
 htmlmin

tests/units.py

@@ -4,7 +4,7 @@
 
 from flask_minify import minify, parsers
 from flask_minify.cache import MemoryCache
-from flask_minify.exceptions import MissingApp
+from flask_minify.exceptions import FlaskMinifyException
 from flask_minify.utils import does_content_type_match, is_empty
 
 from .constants import (
@@ -89,13 +89,14 @@ def test_request_falsy_endpoint(self):
 
         assert (list(matches), exists) == ([], False)
 
-    def test_access_missing_app_raises_exception(self):
-        """test accessing a missing flask app raises an exception"""
+    def test_access_app_after_lazy_initialization(self):
+        """"""
         self.mock_app = None
         ext = self.minify_defaults
+        mock_app = mock.MagicMock()
+        ext.init_app(mock_app)
 
-        with pytest.raises(MissingApp):
-            ext.app
+        assert ext.app == mock_app
 
 
 class TestParsers:
@@ -116,6 +117,16 @@ class CustomParser(parsers.Lesscpy):
 
         assert minified == COMPILED_LESS_RAW
 
+    def test_parser_raising_exception_with_failsafe_disabled(self):
+        class CustomParser(parsers.Lesscpy):
+            def executer(self, content, **options):
+                raise Exception("something went wrong")
+
+        parser = parsers.Parser({"style": CustomParser})
+
+        with pytest.raises(FlaskMinifyException):
+            parser.minify(LESS_RAW, "style")
+
 
 class TestMemoryCache:
     def setup(self):