encommon 0.12.1__tar.gz → 0.12.3__tar.gz

{encommon-0.12.1/encommon.egg-info → encommon-0.12.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: encommon
-Version: 0.12.1
+Version: 0.12.3
 Summary: Enasis Network Common Library
 License: MIT
 Classifier: Programming Language :: Python :: 3

{encommon-0.12.1 → encommon-0.12.3}/encommon/times/test/test_timers.py

@@ -58,6 +58,7 @@ def timers(
     timer = TimersTable(
         group='default',
         unique='two',
+        last='1970-01-01T00:00:00Z',
         update='1970-01-01T00:00:00Z')
 
     session.add(timer)
@@ -68,6 +69,7 @@ def timers(
     timer = TimersTable(
         group='default',
         unique='tre',
+        last='1970-01-01T00:00:00Z',
         update='1970-01-01T00:00:00Z')
 
     session.add(timer)
@@ -211,13 +213,3 @@ def test_Timers_raises(
     _reason = str(reason.value)
 
     assert _reason == 'unique'
-
-
-    _raises = raises(ValueError)
-
-    with _raises as reason:
-        timers.delete('dne')
-
-    _reason = str(reason.value)
-
-    assert _reason == 'unique'

{encommon-0.12.1 → encommon-0.12.3}/encommon/times/test/test_windows.py

@@ -240,13 +240,3 @@ def test_Windows_raises(
     _reason = str(reason.value)
 
     assert _reason == 'unique'
-
-
-    _raises = raises(ValueError)
-
-    with _raises as reason:
-        windows.delete('dne')
-
-    _reason = str(reason.value)
-
-    assert _reason == 'unique'

{encommon-0.12.1 → encommon-0.12.3}/encommon/times/timers.py

@@ -61,6 +61,10 @@ class TimersTable(SQLBase):
         primary_key=True,
         nullable=False)
 
+    last = Column(
+        String,
+        nullable=False)
+
     update = Column(
         String,
         nullable=False)
@@ -268,14 +272,14 @@ class Timers:
         for record in query.all():
 
             unique = str(record.unique)
-            update = str(record.update)
+            last = str(record.last)
 
             if unique not in config:
                 continue
 
             _config = config[unique]
 
-            _config.start = update
+            _config.start = last
 
 
         items = config.items()
@@ -323,6 +327,7 @@ class Timers:
             append = TimersTable(
                 group=group,
                 unique=unique,
+                last=timer.times.subsec,
                 update=update.subsec)
 
             session.merge(append)
@@ -373,12 +378,12 @@ class Timers:
         :returns: Newly constructed instance of related class.
         """
 
-        timers = self.params.timers
+        config = self.params.timers
 
-        if unique in timers:
+        if unique in config:
             raise ValueError('unique')
 
-        timers[unique] = params
+        config[unique] = params
 
         self.load_children()
 
@@ -406,9 +411,9 @@ class Timers:
 
         timer = timers[unique]
 
-        self.save_children()
+        timer.update(value)
 
-        return timer.update(value)
+        self.save_children()
 
 
     def delete(
@@ -418,12 +423,33 @@ class Timers:
         """
         Delete the timer from the internal dictionary reference.
 
+        .. note::
+           This is a graceful method, will not raise exception
+           when the provided unique value does not exist.
+
         :param unique: Unique identifier for the related child.
         """
 
         timers = self.__timers
 
-        if unique not in timers:
-            raise ValueError('unique')
+        group = self.__group
+
+        session = self.store_session
 
-        del timers[unique]
+
+        if unique in timers:
+            del timers[unique]
+
+
+        _table = TimersTable
+        _group = _table.group
+        _unique = _table.unique
+
+        (session.query(_table)
+         .filter(_unique == unique)
+         .filter(_group == group)
+         .delete())
+
+
+        session.commit()
+        session.close()

{encommon-0.12.1 → encommon-0.12.3}/encommon/times/windows.py

@@ -443,12 +443,12 @@ class Windows:
         :returns: Newly constructed instance of related class.
         """
 
-        windows = self.params.windows
+        config = self.params.windows
 
-        if unique in windows:
+        if unique in config:
             raise ValueError('unique')
 
-        windows[unique] = params
+        config[unique] = params
 
         self.load_children()
 
@@ -476,9 +476,9 @@ class Windows:
 
         window = windows[unique]
 
-        self.save_children()
+        window.update(value)
 
-        return window.update(value)
+        self.save_children()
 
 
     def delete(
@@ -488,12 +488,33 @@ class Windows:
         """
         Delete the window from the internal dictionary reference.
 
+        .. note::
+           This is a graceful method, will not raise exception
+           when the provided unique value does not exist.
+
         :param unique: Unique identifier for the related child.
         """
 
         windows = self.__windows
 
-        if unique not in windows:
-            raise ValueError('unique')
+        group = self.__group
+
+        session = self.store_session
 
-        del windows[unique]
+
+        if unique in windows:
+            del windows[unique]
+
+
+        _table = WindowsTable
+        _group = _table.group
+        _unique = _table.unique
+
+        (session.query(_table)
+         .filter(_unique == unique)
+         .filter(_group == group)
+         .delete())
+
+
+        session.commit()
+        session.close()

encommon-0.12.3/encommon/version.txt

@@ -0,0 +1 @@
+0.12.3

{encommon-0.12.1 → encommon-0.12.3/encommon.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: encommon
-Version: 0.12.1
+Version: 0.12.3
 Summary: Enasis Network Common Library
 License: MIT
 Classifier: Programming Language :: Python :: 3

encommon-0.12.1/encommon/version.txt

@@ -1 +0,0 @@
-0.12.1