encommon 0.22.6__tar.gz → 0.22.8__tar.gz

{encommon-0.22.6/encommon.egg-info → encommon-0.22.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: encommon
-Version: 0.22.6
+Version: 0.22.8
 Summary: Enasis Network Common Library
 License: MIT
 Project-URL: Source, https://github.com/enasisnetwork/encommon

{encommon-0.22.6 → encommon-0.22.8}/encommon/config/config.py

@@ -18,6 +18,7 @@ from .params import Params
 from .paths import ConfigPaths
 from .utils import config_paths
 from ..crypts import Crypts
+from ..parse import Jinja2
 from ..types import DictStrAny
 from ..types import merge_dicts
 from ..types import setate
@@ -64,6 +65,7 @@ class Config:
     __params: Optional[Params]
     __logger: Optional[Logger]
     __crypts: Optional[Crypts]
+    __jinja2: Jinja2
 
 
     def __init__(
@@ -104,6 +106,11 @@ class Config:
         self.__logger = None
         self.__crypts = None
 
+        jinja2 = Jinja2({
+            'config': self})
+
+        self.__jinja2 = jinja2
+
 
     @property
     def files(
@@ -325,3 +332,16 @@ class Config:
         self.__crypts = crypts
 
         return self.__crypts
+
+
+    @property
+    def jinja2(
+        self,
+    ) -> Jinja2:
+        """
+        Return the value for the attribute from class instance.
+
+        :returns: Value for the attribute from class instance.
+        """
+
+        return self.__jinja2

{encommon-0.22.6 → encommon-0.22.8}/encommon/config/test/test_config.py

@@ -24,7 +24,7 @@ if TYPE_CHECKING:
 
 
 
-def test_Config(
+def test_Config(  # noqa: CFQ001
     tmp_path: Path,
     config: 'Config',
 ) -> None:
@@ -46,7 +46,8 @@ def test_Config(
         '_Config__params',
         '_Config__paths',
         '_Config__logger',
-        '_Config__crypts']
+        '_Config__crypts',
+        '_Config__jinja2']
 
 
     assert inrepr(
@@ -83,6 +84,8 @@ def test_Config(
 
     assert config.crypts
 
+    assert config.jinja2
+
 
     replaces = {
         'pytemp': tmp_path,
@@ -138,6 +141,26 @@ def test_Config(
 
 
 
+def test_Config_jinja2(
+    config: 'Config',
+) -> None:
+    """
+    Perform various tests associated with relevant routines.
+
+    :param config: Primary class instance for configuration.
+    """
+
+    jinja2 = config.jinja2
+    j2parse = jinja2.parse
+
+    parsed = j2parse(
+        '{{ foo }}',
+        {'foo': 'bar'})
+
+    assert parsed == 'bar'
+
+
+
 def test_Config_cover(
     config: 'Config',
 ) -> None:

{encommon-0.22.6 → encommon-0.22.8}/encommon/parse/jinja2.py

@@ -331,3 +331,53 @@ class Jinja2:
 
 
         return value
+
+
+    def set_static(
+        self,
+        key: str,
+        value: Optional[Any] = None,
+    ) -> None:
+        """
+        Simply add the provided static into internal reference.
+
+        :param key: Where item will be inserted into reference.
+        :param value: Item that will be inserted into internal.
+        """
+
+        statics = self.__statics
+
+        if value is None:
+
+            if key in statics:
+                del statics[key]
+
+            return None
+
+        statics[key] = value
+
+
+    def set_filter(
+        self,
+        key: str,
+        value: Optional[FILTER] = None,
+    ) -> None:
+        """
+        Simply add the provided filter into internal reference.
+
+        :param key: Where item will be inserted into reference.
+        :param value: Item that will be inserted into internal.
+        """
+
+        jinjenv = self.__jinjenv
+
+        filters = jinjenv.filters
+
+        if value is None:
+
+            if key in filters:
+                del filters[key]
+
+            return None
+
+        filters[key] = value

{encommon-0.22.6 → encommon-0.22.8}/encommon/parse/test/test_jinja2.py

@@ -11,6 +11,7 @@ from typing import Any
 
 from pytest import fixture
 from pytest import mark
+from pytest import raises
 
 from ..jinja2 import Jinja2
 from ... import PROJECT
@@ -171,7 +172,7 @@ def test_Jinja2_literal(
      ('{{ "01" }}', '01'),
      ('-01', '-01'),
      ('{{ "-01" }}', '-01')])
-def test_Jinja2_cover(
+def test_Jinja2_parse(
     jinja2: Jinja2,
     value: Any,  # noqa: ANN401
     expect: Any,  # noqa: ANN401
@@ -189,3 +190,43 @@ def test_Jinja2_cover(
     parsed = parse(value)
 
     assert parsed == expect
+
+
+
+def test_Jinja2_cover(
+    jinja2: Jinja2,
+) -> None:
+    """
+    Perform various tests associated with relevant routines.
+
+    :param jinja2: Parsing class for the Jinja2 templating.
+    """
+
+    parse = jinja2.parse
+
+
+    jinja2.set_static(
+        'key', 'value')
+
+    parsed = parse('{{ key }}')
+
+    assert parsed == 'value'
+
+    jinja2.set_static('key')
+
+    with raises(Exception):
+        parse('{{ key }}')
+
+
+    jinja2.set_filter(
+        'float', float)
+
+    parsed = parse(
+        '{{ 1 | float }}')
+
+    assert parsed == 1.0
+
+    jinja2.set_filter('float')
+
+    with raises(Exception):
+        parse('{{ 1 | float }}')

{encommon-0.22.6 → encommon-0.22.8}/encommon/times/test/test_windows.py

@@ -187,7 +187,9 @@ def test_Windows_cover(
 
     windows = Windows()
 
-    params = WindowParams(window=1)
+    params = WindowParams(
+        window=1,
+        start='+1s')
 
     windows.create('fur', params)
 

{encommon-0.22.6 → encommon-0.22.8}/encommon/times/window.py

@@ -31,8 +31,8 @@ class Window:
     Example
     -------
     >>> window = Window('* * * * *', '-4m@m')
-    >>> [window.ready() for _ in range(5)]
-    [True, True, True, True, False]
+    >>> [window.ready() for _ in range(6)]
+    [True, True, True, True, True, False]
 
     :param window: Parameters for defining scheduled time.
     :param start: Determine the start for scheduling window.
@@ -252,7 +252,7 @@ class Window:
         raise NotImplementedError
 
 
-    def ready(  # noqa: CFQ004
+    def ready(
         self,
         update: bool = True,
     ) -> bool:
@@ -283,8 +283,6 @@ class Window:
             self.__wlast = wlast
             self.__wnext = wnext
 
-        if wnext > soonest:
-            return False
 
         return True
 
@@ -331,22 +329,22 @@ def window_croniter(  # noqa: CFQ004
         source: datetime,
     ) -> datetime:
 
-        source = (
+        parse = (
             _operator(source)
             .get_next())
 
-        return parse_time(source)
+        return parse_time(parse)
 
 
     def _wlast(
         source: datetime,
     ) -> datetime:
 
-        source = (
+        parse = (
             _operator(source)
             .get_prev())
 
-        return parse_time(source)
+        return parse_time(parse)
 
 
     def _operator(

{encommon-0.22.6 → encommon-0.22.8}/encommon/times/windows.py

@@ -94,8 +94,8 @@ class Windows:
     >>> source = {'one': WindowParams(window=1)}
     >>> params = WindowsParams(windows=source)
     >>> windows = Windows(params, '-2s', 'now')
-    >>> [windows.ready('one') for x in range(3)]
-    [True, True, False]
+    >>> [windows.ready('one') for x in range(4)]
+    [True, True, True, False]
 
     :param params: Parameters used to instantiate the class.
     :param start: Determine the start for scheduling window.

{encommon-0.22.6 → encommon-0.22.8}/encommon/types/test/test_classes.py

@@ -71,4 +71,5 @@ def test_lattrs(
         '_Config__params',
         '_Config__paths',
         '_Config__logger',
-        '_Config__crypts']
+        '_Config__crypts',
+        '_Config__jinja2']

encommon-0.22.8/encommon/version.txt

@@ -0,0 +1 @@
+0.22.8

{encommon-0.22.6 → encommon-0.22.8/encommon.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: encommon
-Version: 0.22.6
+Version: 0.22.8
 Summary: Enasis Network Common Library
 License: MIT
 Project-URL: Source, https://github.com/enasisnetwork/encommon

encommon-0.22.6/encommon/version.txt

@@ -1 +0,0 @@
-0.22.6