encommon 0.22.9__py3-none-any.whl → 0.22.11__py3-none-any.whl

encommon/times/parse.py

@@ -8,6 +8,7 @@ is permitted, for more information consult the project license file.
 
 
 from contextlib import suppress
+from copy import deepcopy
 from datetime import datetime
 from re import match as re_match
 from typing import Optional
@@ -82,7 +83,9 @@ def parse_time(
     if (source is not None
             and hasattr(source, 'source')):
 
-        source = source.source
+        source = deepcopy(
+            source.source)
+
         assert isinstance(
             source, datetime)
 
@@ -106,10 +109,12 @@ def parse_time(
             .astimezone(tzinfo))
 
     if source in ['max', float('inf')]:
-        source = datetime.max
+        source = deepcopy(
+            datetime.max)
 
     if source in ['min', float('-inf')]:
-        source = datetime.min
+        source = deepcopy(
+            datetime.min)
 
     if (isinstance(source, str)
             and re_match(SNAPABLE, source)):
@@ -127,6 +132,7 @@ def parse_time(
 
     if (isinstance(source, datetime)
             and not source.tzinfo):
+        source = deepcopy(source)
         source = source.replace(
             tzinfo=findtz(tzname))
 

encommon/times/test/test_timers.py

@@ -14,10 +14,8 @@ from pytest import fixture
 from pytest import raises
 
 from ..params import TimerParams
-from ..params import TimersParams
 from ..time import Time
 from ..timers import Timers
-from ..timers import TimersTable
 from ...types import DictStrAny
 from ...types import inrepr
 from ...types import instr
@@ -36,49 +34,54 @@ def timers(
     :returns: Newly constructed instance of related class.
     """
 
+    model = TimerParams
 
     source: DictStrAny = {
-        'one': {'timer': 1},
-        'two': {'timer': 1}}
+        'one': model(timer=1),
+        'two': model(timer=1)}
 
 
-    params = TimersParams(
-        timers=source)
-
     store = (
         f'sqlite:///{tmp_path}'
         '/cache.db')
 
     timers = Timers(
-        params,
         store=store)
 
-    session = timers.store_session
+    table = (
+        timers
+        .store_table)
+
+    session = (
+        timers
+        .store_session)
 
 
-    timer = TimersTable(
+    record = table(
         group='default',
         unique='two',
         last='1970-01-01T00:00:00Z',
         update='1970-01-01T00:00:00Z')
 
-    session.add(timer)
-
-    session.commit()
-
+    session.merge(record)
 
-    timer = TimersTable(
+    record = table(
         group='default',
         unique='tre',
         last='1970-01-01T00:00:00Z',
         update='1970-01-01T00:00:00Z')
 
-    session.add(timer)
+    session.merge(record)
 
     session.commit()
 
 
-    timers.load_children()
+    timers.create(
+        'one', source['one'])
+
+    timers.create(
+        'two', source['two'])
+
 
     return timers
 
@@ -100,9 +103,11 @@ def test_Timers(
         '_Timers__params',
         '_Timers__store',
         '_Timers__group',
+        '_Timers__table',
+        '_Timers__locker',
         '_Timers__sengine',
         '_Timers__session',
-        '_Timers__timers']
+        '_Timers__childs']
 
 
     assert inrepr(
@@ -123,6 +128,8 @@ def test_Timers(
 
     assert timers.group == 'default'
 
+    assert timers.store_table
+
     assert timers.store_engine
 
     assert timers.store_session

encommon/times/test/test_windows.py

@@ -14,9 +14,7 @@ from pytest import fixture
 from pytest import raises
 
 from ..params import WindowParams
-from ..params import WindowsParams
 from ..windows import Windows
-from ..windows import WindowsTable
 from ...types import DictStrAny
 from ...types import inrepr
 from ...types import instr
@@ -35,61 +33,66 @@ def windows(
     :returns: Newly constructed instance of related class.
     """
 
+    model = WindowParams
 
     source: DictStrAny = {
-        'one': WindowParams(
+        'one': model(
             window='* * * * *',
-            start=310,
+            start=300,
             stop=610,
             delay=10),
-        'two': WindowParams(
+        'two': model(
             window='* * * * *',
             start=300,
             stop=620,
             delay=10)}
 
 
-    params = WindowsParams(
-        windows=source)
-
     store = (
         f'sqlite:///{tmp_path}'
         '/cache.db')
 
     windows = Windows(
-        params,
         start=310,
         stop=610,
         store=store)
 
-    session = windows.store_session
+    table = (
+        windows
+        .store_table)
 
+    session = (
+        windows
+        .store_session)
 
-    window = WindowsTable(
+
+    record = table(
         group='default',
         unique='two',
         last='1970-01-01T00:06:00Z',
         next='1970-01-01T00:07:00Z',
         update='1970-01-01T01:00:00Z')
 
-    session.add(window)
+    session.merge(record)
 
-    session.commit()
-
-
-    window = WindowsTable(
+    record = table(
         group='default',
         unique='tre',
         last='1970-01-01T00:06:00Z',
         next='1970-01-01T00:07:00Z',
         update='1970-01-01T01:00:00Z')
 
-    session.add(window)
+    session.merge(record)
 
     session.commit()
 
 
-    windows.load_children()
+    windows.create(
+        'one', source['one'])
+
+    windows.create(
+        'two', source['two'])
+
 
     return windows
 
@@ -111,11 +114,13 @@ def test_Windows(
         '_Windows__params',
         '_Windows__store',
         '_Windows__group',
+        '_Windows__table',
+        '_Windows__locker',
         '_Windows__sengine',
         '_Windows__session',
         '_Windows__start',
         '_Windows__stop',
-        '_Windows__windows']
+        '_Windows__childs']
 
 
     assert inrepr(
@@ -136,6 +141,8 @@ def test_Windows(
 
     assert windows.group == 'default'
 
+    assert windows.store_table
+
     assert windows.store_engine
 
     assert windows.store_session
@@ -161,10 +168,10 @@ def test_Windows(
     window = windows.children['two']
 
     assert window.next == (
-        '1970-01-01T00:08:00Z')
+        '1970-01-01T00:07:00Z')
 
     assert window.last == (
-        '1970-01-01T00:07:00Z')
+        '1970-01-01T00:06:00Z')
 
 
 
@@ -178,6 +185,7 @@ def test_Windows_cover(
     """
 
 
+    assert windows.ready('two')
     assert windows.ready('two')
     assert windows.ready('two')
     assert windows.pause('two')