nathanborror · July 27, 2011 06:55 · Jul 31, 2011 · Jul 27, 2011 · Jul 27, 2011 · Jul 27, 2011
diff --git a/xmltohtml.py b/xmltohtml.py
@@ -1,4 +1,4 @@
-from lxml import etree
+from lxml import objectify
 
 from django import template
 from django.template.loader import render_to_string
@@ -12,8 +12,8 @@ def __init__(self, xml):
 
     def render(self, context):
         output = self.xml.render(context)
-        xml = etree.fromstring(output)
-        context['object'] = dictlist(xml)
+        xml = objectify.fromstring(output)
+        context['object'] = xml
         return render_to_string('xml/%s.html' % xml.tag, context)
 
 
@@ -35,49 +35,12 @@ def do_xml(parser, token):
     Which renders the template `xml/tabs.html` where you can:
 
     <div class="tabs">
-        {% for tab in object.value %}
-            <a href="{{ tab.attributes.url }}">{{ tab.attributes.label }}</a>
+        {% for tab in object.tab %}
+            <a href="{{ tab.attrib.url }}">{{ tab.attrib.label }}</a>
         {% endfor %}
     </div>
     """
     bits = token.split_contents()
     xml = parser.parse(('endxml',))
     parser.delete_first_token()
     return XMLNode(xml)
-
-
-#
-# XML to Dict
-#
-
-def dictlist(node):
-    res = {}
-    res[node.tag] = []
-    xmltodict(node, res[node.tag])
-    return {
-        'value': res[node.tag],
-        'attributes': node.attrib
-    }
-
-
-def xmltodict(node,res):
-    rep = {}
-    if len(node):
-        for n in list(node):
-            rep[node.tag] = []
-            value = xmltodict(n, rep[node.tag])
-            if len(n):
-                value = {
-                    'value': rep[node.tag],
-                    'attributes': n.attrib
-                }
-                res.append(value)
-            else :
-                res.append(rep[node.tag][0])
-    else:
-        value = {
-            'value': node.text,
-            'attributes': node.attrib
-        }
-        res.append(value)
-    return
diff --git a/xmltohtml.py b/xmltohtml.py
@@ -20,17 +20,19 @@ def render(self, context):
 @register.tag('xml')
 def do_xml(parser, token):
     """
-    Convert XML within a template into an object to be used in a corresponding
+    Convert template XML to an object which renders a corresponding
     HTML template. Lets you embed components using pseudo markup.
 
+    In the main template you'll have something like:
+
     {% xml %}
         <tabs>
             <tabs url="http://facebook.com" label="Facebook" />
             <tabs url="http://apple.com" label="Apple" />
         </tabs>
     {% endxml %}
 
-    Renders the template `xml/tabs.html` where you can:
+    Which renders the template `xml/tabs.html` where you can:
 
     <div class="tabs">
         {% for tab in object.value %}

diff --git a/xmltohtml.py b/xmltohtml.py
@@ -7,11 +7,11 @@
 
 
 class XMLNode(template.Node):
-    def __init__(self, nodelist):
-        self.nodelist = nodelist
+    def __init__(self, xml):
+        self.xml = xml
 
     def render(self, context):
-        output = self.nodelist.render(context)
+        output = self.xml.render(context)
         xml = etree.fromstring(output)
         context['object'] = dictlist(xml)
         return render_to_string('xml/%s.html' % xml.tag, context)
@@ -39,9 +39,9 @@ def do_xml(parser, token):
     </div>
     """
     bits = token.split_contents()
-    nodelist = parser.parse(('endxml',))
+    xml = parser.parse(('endxml',))
     parser.delete_first_token()
-    return XMLNode(nodelist)
+    return XMLNode(xml)
 
 
 #

diff --git a/xmltohtml.py b/xmltohtml.py
@@ -34,7 +34,7 @@ def do_xml(parser, token):
 
     <div class="tabs">
         {% for tab in object.value %}
-        <a href="{{ tab.attributes.url }}">{{ tab.attributes.label }}</a>
+            <a href="{{ tab.attributes.url }}">{{ tab.attributes.label }}</a>
         {% endfor %}
     </div>
     """

diff --git a/xmltohtml.py b/xmltohtml.py
@@ -0,0 +1,81 @@
+from lxml import etree
+
+from django import template
+from django.template.loader import render_to_string
+
+register = template.Library()
+
+
+class XMLNode(template.Node):
+    def __init__(self, nodelist):
+        self.nodelist = nodelist
+
+    def render(self, context):
+        output = self.nodelist.render(context)
+        xml = etree.fromstring(output)
+        context['object'] = dictlist(xml)
+        return render_to_string('xml/%s.html' % xml.tag, context)
+
+
+@register.tag('xml')
+def do_xml(parser, token):
+    """
+    Convert XML within a template into an object to be used in a corresponding
+    HTML template. Lets you embed components using pseudo markup.
+
+    {% xml %}
+        <tabs>
+            <tabs url="http://facebook.com" label="Facebook" />
+            <tabs url="http://apple.com" label="Apple" />
+        </tabs>
+    {% endxml %}
+
+    Renders the template `xml/tabs.html` where you can:
+
+    <div class="tabs">
+        {% for tab in object.value %}
+        <a href="{{ tab.attributes.url }}">{{ tab.attributes.label }}</a>
+        {% endfor %}
+    </div>
+    """
+    bits = token.split_contents()
+    nodelist = parser.parse(('endxml',))
+    parser.delete_first_token()
+    return XMLNode(nodelist)
+
+
+#
+# XML to Dict
+#
+
+def dictlist(node):
+    res = {}
+    res[node.tag] = []
+    xmltodict(node, res[node.tag])
+    return {
+        'value': res[node.tag],
+        'attributes': node.attrib
+    }
+
+
+def xmltodict(node,res):
+    rep = {}
+    if len(node):
+        for n in list(node):
+            rep[node.tag] = []
+            value = xmltodict(n, rep[node.tag])
+            if len(n):
+                value = {
+                    'value': rep[node.tag],
+                    'attributes': n.attrib
+                }
+                res.append(value)
+            else :
+                res.append(rep[node.tag][0])
+    else:
+        value = {
+            'value': node.text,
+            'attributes': node.attrib
+        }
+        res.append(value)
+    return