Merge pull request #55 from mj0nez/pluginmnt-segmentfactory

Fix for PluginMount and SegmentFactory

Author: nerdoc

pydifact/api.py

@@ -11,7 +11,7 @@ def __init__(cls, name, bases, attrs):
         if not hasattr(cls, "plugins"):
             cls.plugins = []
         else:
-            if not hasattr(cls, "__omitted__"):
+            if not getattr(cls, "__omitted__", False):
                 cls.plugins.append(cls)
 
 

pydifact/segments.py

@@ -141,8 +141,9 @@ def create_segment(
             )
 
         for Plugin in SegmentProvider.plugins:
-            if Plugin().tag == name:
+            if getattr(Plugin, "tag", "") == name:
                 s = Plugin(name, *elements)
+                break
         else:
             # we don't support this kind of EDIFACT segment (yet), so
             # just create a generic Segment()
@@ -155,4 +156,4 @@ def create_segment(
                 )
 
         # FIXME: characters is not used!
-        return Segment(name, *elements)
+        return s

tests/test_segment.py

@@ -15,7 +15,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import pytest
 
-from pydifact.segments import Segment
+from pydifact.segments import Segment, SegmentProvider
 
 
 elements = ["field1", ["field2", "extra"], "stuff"]
@@ -45,3 +45,16 @@ def test_get_non_existing_element():
     segment = Segment("OMD", *elements)
     with pytest.raises(IndexError):
         segment.elements[7]
+
+
+def test_has_plugin():
+    class TestSegment(Segment):
+
+        tag = "TES"
+
+        __omitted__ = False
+
+        def validate(self) -> bool:
+            pass
+
+    assert TestSegment in SegmentProvider.plugins