djhtmx 1.0.0__py3-none-any.whl → 1.1.0__py3-none-any.whl

djhtmx/__init__.py

@@ -1,4 +1,4 @@
 from .middleware import middleware
 
-__version__ = "1.0.0"
+__version__ = "1.1.0"
 __all__ = ("middleware",)

djhtmx/command_queue.py

@@ -48,7 +48,10 @@ class CommandQueue:
         else:
             action = "updated"
 
-        signals = get_model_subscriptions(instance, actions=(action,))
+        signals = get_model_subscriptions(
+            instance, actions=(action, None)
+        ) | get_model_subscriptions(type(instance), actions=(action, None))
+
         for field in get_related_fields(sender):
             fk_id = getattr(instance, field.name)
             signal = f"{field.related_model_name}.{fk_id}.{field.relation_name}"

djhtmx/utils.py

@@ -63,9 +63,12 @@ def get_instance_subscriptions(
         return {f"{prefix}.{action}" for action in actions}
 
 
+Action = t.Literal["created", "updated", "deleted"]
+
+
 def get_model_subscriptions(
     obj: type[models.Model] | models.Model,
-    actions: t.Sequence[str] = ("created", "updated", "deleted"),
+    actions: t.Sequence[Action | None] = (),
 ) -> set[str]:
     """Get the subscriptions to actions of the model.
 
@@ -77,6 +80,7 @@ def get_model_subscriptions(
     possible relation (e.g 'users.deleted').
 
     """
+    actions = actions or (None,)
     if isinstance(obj, models.Model):
         cls = type(obj)
         instance = obj
@@ -85,10 +89,9 @@ def get_model_subscriptions(
         instance = None
     app = cls._meta.app_label
     name = cls._meta.model_name
-    result = {(model_prefix := f"{app}.{name}")}
-    if instance:
-        result.add(prefix := f"{model_prefix}.{instance.pk}")
-        result.update(f"{prefix}.{action}" for action in actions)
+    model_prefix = f"{app}.{name}"
+    prefix = f"{model_prefix}.{instance.pk}" if instance else model_prefix
+    result = {(f"{prefix}.{action}" if action else prefix) for action in actions}
     return result
 
 

{djhtmx-1.0.0.dist-info → djhtmx-1.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: djhtmx
-Version: 1.0.0
+Version: 1.1.0
 Summary: Interactive UI Components for Django using HTMX
 Project-URL: Homepage, https://github.com/edelvalle/djhtmx
 Project-URL: Documentation, https://github.com/edelvalle/djhtmx#readme

{djhtmx-1.0.0.dist-info → djhtmx-1.1.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
-djhtmx/__init__.py,sha256=BUSbmJ9lD9wO3LhcMG6Uu5ZhfbKtuB3p5ZZ4ONoiUYE,84
+djhtmx/__init__.py,sha256=MiVvh3rJgbNToOeS7aUnsMLrMlP5Iay7tmb1HV1M26M,84
 djhtmx/apps.py,sha256=_Ic52zQLpbYmyuCAlgZ0lF3NDgi77sxptb31snBAN4o,268
-djhtmx/command_queue.py,sha256=rgrh1VXWATLhKDMhsV5vDKacg0J4M_2fYbuS8welBi4,4768
+djhtmx/command_queue.py,sha256=kiYbQFPyjnhMSR7KgO1Nu-lWiapnH511P2Pyg-Zrdq4,4862
 djhtmx/commands.py,sha256=UxXbARd4Teetjh_zjvAWgI2KNbvdETH-WrGf4qD9Xr8,1206
 djhtmx/component.py,sha256=viqrizs85e6zlGh3Zlf2n2HxfBg1cOaSp5deVGPRGXY,15739
 djhtmx/consumer.py,sha256=kHNoXokcWaFjs5zbZAhM7Y0x7GVwwawXbxBCkP8HNA8,2839
@@ -16,7 +16,7 @@ djhtmx/settings.py,sha256=ymFUMvrcXDkYU9KkhPOjRZSQMWz5GcUjlgh07x09-1s,1242
 djhtmx/testing.py,sha256=AdZKsT6sNTsyqSKx6EmfthOIHzSAPkTquheMfg9znbk,8301
 djhtmx/tracing.py,sha256=xkCXb7t_3yCj1PGzmQfHPu9sYQftDKwtALaEbFVnQ1E,1260
 djhtmx/urls.py,sha256=zWMlw_udCUWvo5DNxsvbebSNRFxy0C9ghBmRg08XlcU,3894
-djhtmx/utils.py,sha256=mEXFSp_eFpxFbO2CiAne5hbvdBGgUl44Pyh_VS7nzho,3610
+djhtmx/utils.py,sha256=Zm8d3-PWIYz7944I_k8lstBuHaK7b8qG6C-1CvpEots,3674
 djhtmx/management/commands/htmx.py,sha256=EtJhQofJ4Dl3s34Uihz4WbSljzy5R6r0HXGaX4vkcDg,2011
 djhtmx/static/htmx/django.js,sha256=G59uwy5hA4QUcAFJv21SMxizATpNZG3KfgFlO2zXeGc,7086
 djhtmx/static/htmx/2.0.4/htmx.amd.js,sha256=Hgmm_X5zw7ek0pjBaxhzH7OHx6Xfce5UYVa9ICWlWR0,165593
@@ -30,7 +30,7 @@ djhtmx/templates/htmx/headers.html,sha256=rBQTBt9rnlxE8lgxN4U7nvzQZNw4JZKS4flD1V
 djhtmx/templates/htmx/lazy.html,sha256=LfAThtKmFj-lCUZ7JWF_sC1Y6XsIpEz8A3IgWASn-J8,52
 djhtmx/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 djhtmx/templatetags/htmx.py,sha256=HlH7_B9lJoTDoIkYPeEE55OwpBTrrCesE70j1KcRC70,8063
-djhtmx-1.0.0.dist-info/METADATA,sha256=Yz8YOhiW1VEyg2Eft5MfzRJSuv0NMGp4Z4g3uT6ma90,28298
-djhtmx-1.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-djhtmx-1.0.0.dist-info/licenses/LICENSE,sha256=kCi_iSBUGsRZInQn96w7LXYzjiRjZ8FXl6vP--mFRPk,1085
-djhtmx-1.0.0.dist-info/RECORD,,
+djhtmx-1.1.0.dist-info/METADATA,sha256=ctTquyqFqGicWiPXRep9JYP29ofmOfzgLq8RDKYdRlU,28298
+djhtmx-1.1.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+djhtmx-1.1.0.dist-info/licenses/LICENSE,sha256=kCi_iSBUGsRZInQn96w7LXYzjiRjZ8FXl6vP--mFRPk,1085
+djhtmx-1.1.0.dist-info/RECORD,,