[property] Refactor export_leaf method

Refactors the Property.export_leaf method and the
corresponding tests.

When exporting a document from a Property the direct parent
now also exports all Properties and not just the Property
that starts the export.

Author: mpsonntag

odml/property.py

@@ -841,26 +841,16 @@ def pprint(self, indent=2, max_length=80, current_depth=-1):
 
     def export_leaf(self):
         """
-        Export only the path from this property to the root.
-        Include all properties of parent sections.
-
-        :returns: cloned odml tree to the root of the current document.
-        """
-        curr = self.parent
-        par = self.parent
-        child = self.parent
-
-        while curr is not None:
-            par = curr.clone(children=False, keep_id=True)
-            if curr != self.parent:
-                par.append(child)
-            if hasattr(curr, 'properties'):
-                if curr == self.parent:
-                    par.append(self.clone(keep_id=True))
-                else:
-                    for prop in curr.properties:
-                        par.append(prop.clone(keep_id=True))
-            child = par
-            curr = curr.parent
-
-        return par
+        Export the path including all direct parents from this Property
+        to the root of the document. Section properties are included,
+        Subsections are not included.
+
+        :returns: Cloned odml tree to the root of the current document.
+        """
+        export = self
+        if export.parent:
+            # Section.export_leaf will take care of the full export and
+            # include the current Property.
+            export = export.parent.export_leaf()
+
+        return export

test/test_property.py

@@ -760,39 +760,28 @@ def test_comparison(self):
 
     def test_export_leaf(self):
         doc = Document()
-        first = doc.create_section("first")
-        second = first.create_section("second")
-        first.create_section("third")
-
-        name = "prop1"
-        values = [1.3]
-        first.create_property(name, value=values)
-
-        name = "prop2"
-        values = ["words"]
-        second.create_property(name, value=values)
-
-        name = "prop3"
-        values = ["a", "b"]
-        second.create_property(name, value=values)
-
-        name = "prop4"
-        values = [3]
-        second.create_property(name, value=values)
-
-        name = "prop5"
-        values = ["abc"]
-        first.create_property(name, value=values)
-
-        ex1 = first.properties["prop1"].export_leaf()
-        self.assertEqual(len(ex1['first'].properties), 1)
-        self.assertEqual(len(ex1['first'].sections), 0)
-
-        ex2 = second.properties["prop2"].export_leaf()
-        self.assertEqual(len(ex2.sections), 1)
-        self.assertEqual(len(ex2['first'].properties), 2)
-        self.assertEqual(len(ex2['first'].sections), 1)
-        self.assertEqual(len(ex2['first']['second'].properties), 1)
+
+        sec_a_name = "first"
+        sec_b_name = "second"
+        first = doc.create_section(sec_a_name)
+        second = first.create_section(sec_b_name)
+        _ = first.create_section("third")
+
+        prop_aa = first.create_property("prop1", value=[1.3])
+        _ = first.create_property("prop5", value=["abc"])
+        prop_ba = second.create_property("prop2", value=["words"])
+        _ = second.create_property("prop3", value=["a", "b"])
+        _ = second.create_property("prop4", value=[3])
+
+        export_doc = prop_aa.export_leaf()
+        self.assertEqual(len(export_doc[sec_a_name].properties), 2)
+        self.assertEqual(len(export_doc[sec_a_name].sections), 0)
+
+        export_doc = prop_ba.export_leaf()
+        self.assertEqual(len(export_doc.sections), 1)
+        self.assertEqual(len(export_doc[sec_a_name].properties), 2)
+        self.assertEqual(len(export_doc[sec_a_name].sections), 1)
+        self.assertEqual(len(export_doc[sec_a_name][sec_b_name].properties), 3)
 
     def test_values_cardinality(self):
         doc = Document()