refactorization of render code

Author: satcfdi

docs/pages/getting_started/30_cfdi_load_guide.rst

@@ -21,13 +21,7 @@ ______________________
 
 .. code-block:: python
 
-    # JSON
-    json = invoice.json_str()
-    # save to file
-    invoice.json_write("_comprobante_.json")
-    # .. or alternative
-    with open("_stream_comprobante_.json", 'w', encoding='utf-8') as f:
-        invoice.json_write(f)
+    from satcfdi import render
     
     # XML
     xml = invoice.xml_bytes()
@@ -37,6 +31,14 @@ ______________________
     with open("_stream_comprobante_.xml", 'wb') as f:
         invoice.xml_write(f)
     
+    # JSON
+    json = render.json_str(invoice)
+    # save to file
+    render.json_write(invoice, "_comprobante_.json")
+    # .. or alternative
+    with open("_stream_comprobante_.json", 'w', encoding='utf-8') as f:
+        render.json_write(invoice, f)
+    
     # HTML
     html = render.html_str(invoice)
     # save to file

readme.rst

@@ -182,14 +182,19 @@ ____________________
     invoice.xml_write("my_invoice.xml")
     
     # JSON
-    invoice.json_write("my_invoice.json", pretty_print=True)
+    render.json_write(invoice, "my_invoice.json", pretty_print=True)
     
     # HTML
     render.html_write(invoice, "my_invoice.html")
     
     # PDF
     render.pdf_write(invoice, "my_invoice.pdf")
     
+    # Multiple HTML
+    render.html_write([invoice1, invoice2], "my_invoice.html")
+    
+    # Multiple PDF
+    render.pdf_write([invoice1, invoice2], "my_invoice.pdf")
 
 
 Contributing

satcfdi/render/__init__.py

@@ -1,3 +1,4 @@
+import json
 from collections.abc import Sequence
 from lxml.etree import QName
 
@@ -14,6 +15,19 @@
 PDF_INIT_TEMPLATE = DefaultCFDIEnvironment.get_template("_init.html")
 
 
+def json_write(xlm: XElement, target, pretty_print=False):
+    if isinstance(target, str):
+        with open(target, 'w') as f:
+            json.dump(xlm, f, ensure_ascii=False, default=str, indent=2 if pretty_print else None)
+            return
+
+    json.dump(xlm, target, ensure_ascii=False, default=str, indent=2 if pretty_print else None)
+
+
+def json_str(xlm: XElement, pretty_print=False) -> str:
+    return json.dumps(xlm, ensure_ascii=False, default=str, indent=2 if pretty_print else None)
+
+
 def html_write(xlm: XElement | Sequence[XElement], target, init_template=PDF_INIT_TEMPLATE):
     if isinstance(xlm, Sequence):
         init_template.stream({"c": [(QName(a.tag).localname, a) for a in xlm], "k": '_multiple'}).dump(target)
@@ -37,7 +51,6 @@ def pdf_write(xlm: XElement | Sequence[XElement], target, init_template=PDF_INIT
         stylesheets=[PDF_CSS]
     )
 
-
 def pdf_bytes(xlm: XElement | Sequence[XElement], init_template=PDF_INIT_TEMPLATE) -> bytes:
     if weasyprint is None:
         raise ImportError("weasyprint is not installed")

satcfdi/xelement.py

@@ -1,4 +1,3 @@
-import json
 from lxml import etree
 
 from .transform import SchemaCollector, cfdi_schemas, validate_xsd
@@ -61,17 +60,6 @@ def xml_bytes(self, pretty_print=False, xml_declaration=True, validate=False, in
         xml = self.to_xml(validate=validate, include_schema_location=include_schema_location)
         return etree.tostring(xml, xml_declaration=xml_declaration, encoding="UTF-8", pretty_print=pretty_print)
 
-    def json_write(self, target, pretty_print=False):
-        if isinstance(target, str):
-            with open(target, 'w') as f:
-                json.dump(self, f, ensure_ascii=False, default=str, indent=2 if pretty_print else None)
-                return
-
-        json.dump(self, target, ensure_ascii=False, default=str, indent=2 if pretty_print else None)
-
-    def json_str(self, pretty_print=False) -> str:
-        return json.dumps(self, ensure_ascii=False, default=str, indent=2 if pretty_print else None)
-
     def __repr__(self):
         # return '%s.%s(%s)' % (self.__class__.__module__,
         #                       self.__class__.__qualname__,

tests/test_create_addenda.py

@@ -125,4 +125,4 @@ def test_copy_cfdi():
     copy = invoice.copy()
     verify_invoice(copy, f"{xml_file}")
 
-    copy.json_str(pretty_print=True)
+    render.json_str(copy, pretty_print=True)