No application singleton

examples/list_classes.py

@@ -8,7 +8,7 @@
 import sys
 
 import gaphor.UML as UML
-from gaphor.application import Application
+from gaphor.application import Session
 
 # Setup command line options.
 usage = "usage: %prog [options] file.gaphor"
@@ -33,7 +33,7 @@
 model = args[0]
 
 # Create the Gaphor application object.
-session = Application.new_session()
+session = Session()
 
 # Get services we need.
 element_factory = session.get_service("element_factory")

gaphor/UML/properties.py

@@ -743,21 +743,18 @@ def _union(self, obj, exclude=None):
         """
         Returns a union of all values as a set.
         """
-        if self.single:
-            return next(iter(self.subsets)).__get__(obj)
-        else:
-            u: Set[T] = set()
-            for s in self.subsets:
-                if s is exclude:
-                    continue
-                tmp = s.__get__(obj)
-                if tmp:
-                    try:
-                        u.update(tmp)
-                    except TypeError:
-                        # [0..1] property
-                        u.add(tmp)
-            return collectionlist(u)
+        u: Set[T] = set()
+        for s in self.subsets:
+            if s is exclude:
+                continue
+            tmp = s.__get__(obj)
+            if tmp:
+                try:
+                    u.update(tmp)
+                except TypeError:
+                    # [0..1] property
+                    u.add(tmp)
+        return collectionlist(u)
 
     def propagate(self, event):
         """

gaphor/UML/tests/test_elementfactory.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from gaphor.application import Application
+from gaphor.application import Session
 from gaphor.core import event_handler
 from gaphor.services.eventmanager import EventManager
 from gaphor.UML import Parameter
@@ -96,17 +96,12 @@ def clear_events():
 
 @pytest.fixture
 def element_factory():
-    session = Application.new_session(
-        services=["event_manager", "component_registry", "element_factory"]
-    )
-    event_manager = session.get_service("event_manager")
+    event_manager = EventManager()
     event_manager.subscribe(handler)
     clear_events()
-    factory = session.get_service("element_factory")
+    factory = ElementFactory(event_manager)
     yield factory
-    del factory
     clear_events()
-    session.shutdown()
 
 
 def test_create_event(element_factory):

gaphor/UML/tests/test_properties.py

@@ -1,6 +1,5 @@
 import pytest
 
-from gaphor.application import Application
 from gaphor.core import event_handler
 from gaphor.UML.element import Element
 from gaphor.UML.event import AssociationUpdated
@@ -454,24 +453,44 @@ class A(Element):
     assert d in a.u
 
 
-@pytest.mark.skip
-def test_derivedunion_notify():
+def test_derivedunion_notify_for_single_derived_property():
     class A(Element):
         pass
 
     class E(Element):
         notified = False
 
-        def notify(self, name, pspec):
-            if name == "u":
+        def handle(self, event):
+            if event.property is E.u:
                 self.notified = True
 
     E.a = association("a", A)
     E.u = derivedunion(E, "u", A, 0, "*", E.a)
 
     e = E()
-    assert e.notified is False
     e.a = A()
+
+    assert e.notified is True
+
+
+def test_derivedunion_notify_for_multiple_derived_properties():
+    class A(Element):
+        pass
+
+    class E(Element):
+        notified = False
+
+        def handle(self, event):
+            if event.property is E.u:
+                self.notified = True
+
+    E.a = association("a", A)
+    E.aa = association("aa", A)
+    E.u = derivedunion(E, "u", A, 0, "*", E.a, E.aa)
+
+    e = E()
+    e.a = A()
+
     assert e.notified is True
 
 
@@ -546,7 +565,7 @@ def unlink(self):
     def handler(event, events=events):
         events.append(event)
 
-    Application.register_handler(handler)
+    # Application.register_handler(handler)
     try:
         a = A()
         a.a1 = A()
@@ -636,7 +655,8 @@ def handler(event, events=events):
         assert isinstance(events[13], DerivedDeleted), type(events[10])
         assert events[14].property is A.b3
     finally:
-        Application.unregister_handler(handler)
+        # Application.unregister_handler(handler)
+        pass
 
 
 @pytest.mark.skip
@@ -692,7 +712,7 @@ class B(A):
     def handler(event, events=events):
         events.append(event)
 
-    Application.register_handler(handler)
+    # Application.register_handler(handler)
     try:
         a = A()
         a.a = A()
@@ -709,4 +729,5 @@ def handler(event, events=events):
         assert events[0].property is B.b, events[0].property
         assert events[1].property is B.b.original, events[1].property
     finally:
-        Application.unregister_handler(handler)
+        # Application.unregister_handler(handler)
+        pass

gaphor/application.py

@@ -17,6 +17,7 @@
 
 import importlib_metadata
 
+from gaphor import transaction
 from gaphor.abc import ActionProvider, Service
 from gaphor.action import action
 from gaphor.event import (
@@ -31,6 +32,13 @@
 logger = logging.getLogger(__name__)
 
 
+def distribution():
+    """
+    The PkgResources distribution for Gaphor
+    """
+    return importlib_metadata.distribution("gaphor")
+
+
 class NotInitializedError(Exception):
     pass
 
@@ -39,7 +47,7 @@ class ComponentLookupError(LookupError):
     pass
 
 
-class _Application(Service, ActionProvider):
+class Application(Service, ActionProvider):
     """
     The Gaphor application is started from the gaphor.ui module.
 
@@ -50,32 +58,28 @@ class _Application(Service, ActionProvider):
     are registered in the "component_registry" service.
     """
 
-    def __init__(self):
+    def __init__(self, appservices=None):
         self.active_session: Optional[Session] = None
         self.sessions: Set[Session] = set()
-        self._services_by_name: Dict[str, Service] = {}
 
-    def init(self):
-        uninitialized_services = load_services("gaphor.appservices")
+        uninitialized_services = load_services("gaphor.appservices", appservices)
         self._services_by_name = init_services(uninitialized_services, application=self)
 
+        transaction.subscribers.add(self._transaction_proxy)
+
     def new_session(self, services=None):
         """
         Initialize an application session.
         """
         session = Session()
         self.sessions.add(session)
         self.active_session = session
+
         return session
 
     def has_sessions(self):
         return bool(self.active_session)
 
-    distribution = property(
-        lambda s: importlib_metadata.distribution("gaphor"),
-        doc="The PkgResources distribution for Gaphor",
-    )
-
     def shutdown_session(self, session):
         assert session
         session.shutdown()
@@ -89,6 +93,8 @@ def shutdown(self):
 
         This is mainly for testing purposes.
         """
+        transaction.subscribers.discard(self._transaction_proxy)
+
         while self.sessions:
             self.shutdown_session(self.sessions.pop())
 
@@ -109,12 +115,17 @@ def quit(self):
             if self.active_session == session:
                 logger.info("Window not closed, abort quit operation")
                 return
+        self.shutdown()
 
     def all(self, base: Type[T]) -> Iterator[Tuple[str, T]]:
         return (
             (n, c) for n, c in self._services_by_name.items() if isinstance(c, base)
         )
 
+    def _transaction_proxy(self, event):
+        if self.active_session:
+            self.active_session.event_manager.handle(event)
+
 
 class Session:
     """
@@ -218,7 +229,3 @@ def init(name, cls):
         init(name, cls)
 
     return ready
-
-
-# Make sure there is only one!
-Application = _Application()

gaphor/i18n.py

@@ -10,8 +10,6 @@
 import logging
 import os
 
-import importlib_metadata
-
 log = logging.getLogger(__name__)
 
 try:

gaphor/services/session.py

@@ -1,15 +1,17 @@
 from gaphor.abc import Service
-from gaphor.application import Application
 
 
 class Session(Service):
     """
     Application service. Get the active session.
     """
 
+    def __init__(self, application):
+        self.application = application
+
     def shutdown(self):
         pass
 
     def get_service(self, name):
-        assert Application.active_session
-        return Application.active_session.get_service(name)
+        assert self.application.active_session
+        return self.application.active_session.get_service(name)

gaphor/storage/storage.py

@@ -18,8 +18,7 @@
 
 import gaphas
 
-from gaphor import UML
-from gaphor.application import Application
+from gaphor import UML, application
 from gaphor.i18n import gettext
 from gaphor.storage import diagramitems, parser
 from gaphor.UML.collection import collection
@@ -136,7 +135,7 @@ def save_canvasitem(name, value, reference=False):
         None,
         {
             (NAMESPACE_MODEL, "version"): FILE_FORMAT_VERSION,
-            (NAMESPACE_MODEL, "gaphor-version"): Application.distribution.version,
+            (NAMESPACE_MODEL, "gaphor-version"): application.distribution().version,
         },
     )
 

gaphor/storage/tests/test_storage.py

@@ -5,9 +5,8 @@
 import re
 from io import StringIO
 
-import importlib_metadata
-
 from gaphor import UML
+from gaphor.application import distribution
 from gaphor.diagram.classes import AssociationItem, ClassItem, InterfaceItem
 from gaphor.diagram.general import CommentItem
 from gaphor.misc.xmlwriter import XMLWriter
@@ -152,8 +151,7 @@ def test_load_uml_metamodel(self):
         Test if the meta model can be loaded.
         """
 
-        dist = importlib_metadata.distribution("gaphor")
-        path = dist.locate_file("gaphor/UML/uml2.gaphor")
+        path = distribution().locate_file("gaphor/UML/uml2.gaphor")
 
         with open(path) as ifile:
             storage.load(ifile, factory=self.element_factory)
@@ -250,8 +248,7 @@ def test_load_save(self):
 
         """Test loading and saving models"""
 
-        dist = importlib_metadata.distribution("gaphor")
-        path = dist.locate_file("test-diagrams/simple-items.gaphor")
+        path = distribution().locate_file("test-diagrams/simple-items.gaphor")
 
         with open(path, "r") as ifile:
             storage.load(ifile, factory=self.element_factory)
@@ -281,8 +278,7 @@ def test_loading_an_old_version(self):
 
         """Test loading and saving models"""
 
-        dist = importlib_metadata.distribution("gaphor")
-        path = dist.locate_file("test-diagrams/old-gaphor-version.gaphor")
+        path = distribution().locate_file("test-diagrams/old-gaphor-version.gaphor")
 
         def load_old_model():
             with open(path, "r") as ifile:

gaphor/storage/tests/test_storage_message_item_upgrade.py

@@ -1,16 +1,15 @@
-import importlib_metadata
 import pytest
 
 from gaphor import UML
-from gaphor.application import Application
+from gaphor.application import Session, distribution
 from gaphor.storage import diagramitems
 from gaphor.storage.parser import parse
 from gaphor.storage.storage import load_elements
 
 
 @pytest.fixture
 def session():
-    session = Application.new_session(
+    session = Session(
         services=["event_manager", "component_registry", "element_factory"]
     )
     yield session
@@ -25,8 +24,7 @@ def element_factory(session):
 def test_message_item_upgrade(element_factory):
     """
     """
-    dist = importlib_metadata.distribution("gaphor")
-    path = dist.locate_file("test-diagrams/multiple-messages.gaphor")
+    path = distribution().locate_file("test-diagrams/multiple-messages.gaphor")
 
     elements = parse(path)
     load_elements(elements, element_factory)