Merge pull request #196 from andylolz/146-sort-xml

[COMPLETE] Sort XML according to provided schema(s)

Author: Bjwebb

CHANGELOG.md

@@ -6,6 +6,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.2.0] - 2018-08-13
+
+### Added
+
+- Sort XML according to provided schema(s) https://github.com/OpenDataServices/flatten-tool/pull/196
+
+### Changed
+
+- Remove Python 3.3 support https://github.com/OpenDataServices/flatten-tool/commit/636cf988ff7e5247a089b22061f0fe7767ea81b4
+
 ### Fixed
 
 - Avoid some openpyxl warnings https://github.com/OpenDataServices/flatten-tool/pull/211

examples/help/unflatten/expected.txt

@@ -9,6 +9,7 @@ usage: flatten-tool unflatten [-h] -f {csv,xlsx} [--xml] [--id-name ID_NAME]
                               [--metatab-schema METATAB_SCHEMA]
                               [--metatab-only]
                               [--metatab-vertical-orientation]
+                              [--xml-schema [XML_SCHEMA [XML_SCHEMA ...]]]
                               [--default-configuration DEFAULT_CONFIGURATION]
                               input_name
 
@@ -61,6 +62,8 @@ optional arguments:
   --metatab-vertical-orientation
                         Read metatab so that headings are in the first column
                         and data is read vertically. Only for XLSX not CSV
+  --xml-schema [XML_SCHEMA [XML_SCHEMA ...]]
+                        Path to one or more XML schemas (used for sorting)
   --default-configuration DEFAULT_CONFIGURATION
                         Comma seperated list of default parsing commands for
                         all sheets. Only for XLSX not CSV

examples/iati/cmd.txt

@@ -1 +1 @@
-$ flatten-tool unflatten --xml --id-name iati-identifier --root-list-path iati-activity -f csv examples/iati
+$ flatten-tool unflatten --xml --id-name iati-identifier --root-list-path iati-activity --xml-schema examples/iati/iati-activities-schema.xsd examples/iati/iati-common.xsd -f csv examples/iati

examples/iati/expected.xml

@@ -5,17 +5,17 @@
     <reporting-org ref="AA-AAA-123456789" type="40">
       <narrative>Organisation name</narrative>
     </reporting-org>
-    <participating-org ref="AA-AAA-123456789" role="1"/>
-    <activity-status code="2"/>
-    <activity-date iso-date="2011-10-01" type="1"/>
-    <recipient-country code="AF" percentage="40"/>
-    <recipient-country code="XK" percentage="60"/>
     <title>
       <narrative>A title</narrative>
     </title>
     <description>
       <narrative>A description</narrative>
     </description>
+    <participating-org ref="AA-AAA-123456789" role="1"/>
+    <activity-status code="2"/>
+    <activity-date iso-date="2011-10-01" type="1"/>
+    <recipient-country code="AF" percentage="40"/>
+    <recipient-country code="XK" percentage="60"/>
     <transaction>
       <transaction-type code="2"/>
       <transaction-date iso-date="2012-01-01"/>
@@ -32,17 +32,17 @@
     <reporting-org ref="AA-AAA-123456789" type="40">
       <narrative>Organisation name</narrative>
     </reporting-org>
-    <participating-org ref="AA-AAA-123456789" role="1"/>
-    <activity-status code="3"/>
-    <activity-date iso-date="2016-01-01" type="2"/>
-    <recipient-country code="AG" percentage="30"/>
-    <recipient-country code="XK" percentage="70"/>
     <title>
       <narrative>Another title</narrative>
     </title>
     <description>
       <narrative>Another description</narrative>
     </description>
+    <participating-org ref="AA-AAA-123456789" role="1"/>
+    <activity-status code="3"/>
+    <activity-date iso-date="2016-01-01" type="2"/>
+    <recipient-country code="AG" percentage="30"/>
+    <recipient-country code="XK" percentage="70"/>
     <transaction>
       <transaction-type code="2"/>
       <transaction-date iso-date="2013-04-04"/>