Changeset 12287

Timestamp:

21 Dec 2014, 17:00:10 (10 years ago)

Author:

Henrik Bettermann

Message:

Extend DocumentExporterBase?. We need to know more about exported documents.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba/documents

Files:

• export.py (modified) (2 diffs)
• tests/test_export.py (modified) (4 diffs)

main/waeup.ikoba/trunk/src/waeup/ikoba/documents/export.py

@@ -38 +38 @@
     @property
     def fields(self):
-        return tuple(sorted(iface_names(self.iface))) + (
-        'users_with_local_roles',)
+        return tuple(sorted(iface_names(self.iface, exclude_attribs=False,
+            omit=['is_verifiable',
+                  'translated_state',
+                  'user_id',
+                  'formatted_transition_date',
+                  'translated_class_name',
+                  'connected_files',   # Could be used to export file URLs
+                  ]
+            ))) + (
+            'users_with_local_roles',)
 
     def mangle_value(self, value, name, context=None):
@@ -49 +57 @@
             for local_role, user_name, setting in role_map.getPrincipalsAndRoles():
                 value.append({'user_name':user_name,'local_role':local_role})
+        if name == 'history':
+            value = value.messages
         return super(DocumentExporterBase, self).mangle_value(
             value, name, context)

main/waeup.ikoba/trunk/src/waeup/ikoba/documents/tests/test_export.py

@@ -62 +62 @@
         exporter.export([self.pdfdocument], self.outfile)
         result = open(self.outfile, 'rb').read()
-        self.assertTrue(
-            'description,document_id,title,users_with_local_roles\r\n'
-            ',DOC1,,"[{\'user_name\': u\'john\', \'local_role\': u\'johnsrole\'}]"'
-            in result
+        self.assertMatches(
+            'class_name,description,document_id,history,state,title,users_with_local_roles\r\n'
+            'PDFDocument,,DOC1,'
+            '[u\'2014-12-21 16:55:16 UTC - Document created by system\'],'
+            'created,,"[{\'user_name\': u\'john\', \'local_role\': u\'johnsrole\'}]"',
+            result
             )
         return
@@ -74 +76 @@
         exporter.export_all(self.app, self.outfile)
         result = open(self.outfile, 'rb').read()
-        self.assertTrue(
-            'description,document_id,title,users_with_local_roles\r\n'
-            ',DOC1,,"[{\'user_name\': u\'john\', \'local_role\': u\'johnsrole\'}]"'
-            in result
+        self.assertMatches(
+            'class_name,description,document_id,history,state,title,users_with_local_roles\r\n'
+            'PDFDocument,,DOC1,'
+            '[u\'2014-12-21 16:55:16 UTC - Document created by system\'],'
+            'created,,"[{\'user_name\': u\'john\', \'local_role\': u\'johnsrole\'}]"',
+            result
             )
         return
@@ -109 +113 @@
         exporter.export([self.htmldocument], self.outfile)
         result = open(self.outfile, 'rb').read()
-        self.assertTrue(
-            'description,document_id,html_multilingual,title,'
-            'users_with_local_roles\r\n,DOC2,'
-            ',,'
-            '"[{\'user_name\': u\'john\', \'local_role\': u\'johnsrole\'}]"\r\n'
-            in result
+        self.assertMatches(
+            'class_name,description,document_id,history,html_dict,'
+            'html_multilingual,state,title,users_with_local_roles\r\n'
+            'HTMLDocument,,DOC2,'
+            '[u\'2014-12-21 16:50:28 UTC - Document created by system\'],'
+            '{},,created,,"[{\'user_name\': u\'john\', \'local_role\': u\'johnsrole\'}]"',
+            result
             )
         return
@@ -123 +128 @@
         exporter.export_all(self.app, self.outfile)
         result = open(self.outfile, 'rb').read()
-        self.assertTrue(
-            'description,document_id,html_multilingual,title,'
-            'users_with_local_roles\r\n,DOC2,'
-            ',,'
-            '"[{\'user_name\': u\'john\', \'local_role\': u\'johnsrole\'}]"\r\n'
-            in result
+        self.assertMatches(
+            'class_name,description,document_id,history,html_dict,'
+            'html_multilingual,state,title,users_with_local_roles\r\n'
+            'HTMLDocument,,DOC2,'
+            '[u\'2014-12-21 16:50:28 UTC - Document created by system\'],'
+            '{},,created,,"[{\'user_name\': u\'john\', \'local_role\': u\'johnsrole\'}]"',
+            result
             )
         return