Changeset 137:850378e37f15

Timestamp:

06/12/09 03:08:47 (14 months ago)

Author:

Nicolas ?vrard <nicoe@…>

Branch:

default

Message:

Added a description of the report to the ReportRepository?

Location:

relatorio

Files:

• reporting.py (modified) (3 diffs)
• tests/test_api.py (modified) (2 diffs)

relatorio/reporting.py

@@ -90 +90 @@
     It just returns a copy of the data it receives"""
 
+    def __init__(self, *args, **kwargs):
+        pass
+
     def __call__(self, **kwargs):
         data = kwargs.copy()
@@ -139 +142 @@
 
     def add_report(self, klass, mimetype, template_path, data_factory=None,
-                   report_name='default'):
+                   report_name='default', description=''):
         """adds a report to the repository.
 
@@ -152 +155 @@
             data_factory = self.default_factory
         reports = self.classes.setdefault(klass, ReportDict())
-        report = Report(_absolute(template_path), mimetype, data_factory(),
-                        self.loader)
-        reports.ids[report_name] = report, mimetype
+        report = Report(_absolute(template_path), mimetype,
+                        data_factory(klass, mimetype), self.loader)
+        reports.ids[report_name] = report, mimetype, description
         reports.mimetypes.setdefault(mimetype, []) \
                          .append((report, report_name))

relatorio/tests/test_api.py

@@ -40 +40 @@
         reporting = ReportRepository()
         reporting.add_report(StubObject, 'text/plain',
-                             os.path.join('templates', 'test.tmpl'))
+                             os.path.join('templates', 'test.tmpl'),
+                             description='Test report')
 
         assert_true(StubObject in reporting.classes)
@@ -46 +47 @@
         assert_true('text/plain' in reporting.classes[StubObject].mimetypes)
 
-        report, mime = reporting.classes[StubObject].ids['default']
+        report, mime, desc = reporting.classes[StubObject].ids['default']
         eq_(mime, 'text/plain')
+        eq_(desc, 'Test report')
         eq_(report.mimetype, 'text/plain')
         assert_true(report.fpath.endswith(os.path.join('templates',