Attempt to fix issue mythmon#144. Add source_path=None to all renderer

render() definitions so it can be passed through to the actual RST
docutils renderer.

This code fails on the test site, and has some debug print
statements added.  It is intended as an illustration only,
definitely not production quality.

Author: matt-garman

test_site/content/tests/rest_error.rst

@@ -0,0 +1,17 @@
+title: reStructuredText Test Page with Deliberate Error
+category: tests
+tags: [rest, sample]
+---
+
+reStructuredText Page with Deliberate Error
+===========================================
+
+For issue #144: reStructuredText rendering errors don't show
+filename, just "string"
+
+The following will trigger a rst rendering error:
+    - Should be an extra newline between the
+    - first bullet point and the preceeding paragraph
+
+End of deliberate error document.
+

wok/page.py

@@ -117,8 +117,11 @@ def from_file(cls, path, options, engine, renderer=renderers.Plain):
         page.build_meta()
 
         page.engine.run_hook('page.render.pre', page)
-        page.meta['content'] = page.renderer.render(page.original)
-        page.meta['preview'] = page.renderer.render(page.original_preview)
+        print "DEBUG: page.path=\"" + str(page.path) + "\""
+        print "DEBUG: page.renderer=\"" + str(page.renderer) + "\""
+        print "DEBUG: page.renderer.render=\"" + str(page.renderer.render) + "\""
+        page.meta['content'] = page.renderer.render(page.original, source_path=page.path)
+        page.meta['preview'] = page.renderer.render(page.original_preview, source_path=page.path)
         page.engine.run_hook('page.render.post', page)
 
         return page
@@ -342,7 +345,7 @@ def build_meta(self):
 
         self.engine.run_hook('page.meta.post', self)
 
-    def render(self, templ_vars=None):
+    def render(self, templ_vars=None, source_path=None):
         """
         Renders the page with the template engine.
         """

wok/renderers.py

@@ -16,7 +16,7 @@ class Renderer(object):
     extensions = []
 
     @classmethod
-    def render(cls, plain):
+    def render(cls, plain, source_path=None):
         return plain
 all.append(Renderer)
 
@@ -25,7 +25,7 @@ class Plain(Renderer):
     extensions = ['txt']
 
     @classmethod
-    def render(cls, plain):
+    def render(cls, plain, source_path=None):
         return plain.replace('\n', '<br>')
 all.append(Plain)
 
@@ -42,7 +42,7 @@ class Markdown(Renderer):
             plugins.extend(['codehilite(css_class=codehilite)', 'fenced_code'])
 
         @classmethod
-        def render(cls, plain):
+        def render(cls, plain, source_path=None):
             return markdown(plain, cls.plugins)
 
     all.append(Markdown)
@@ -64,7 +64,7 @@ class Markdown2(Renderer):
                 extras.append('fenced-code-blocks')
 
             @classmethod
-            def render(cls, plain):
+            def render(cls, plain, source_path=None):
                 return markdown2.markdown(plain, extras=cls.extras)
 
         all.append(Markdown2)
@@ -87,9 +87,9 @@ class ReStructuredText(Renderer):
         extensions = ['rst']
 
         @classmethod
-        def render(cls, plain):
+        def render(cls, plain, source_path=None):
             w = rst_html_writer()
-            return docutils.core.publish_parts(plain, writer=w)['body']
+            return docutils.core.publish_parts(plain, source_path=source_path, writer=w)['body']
 
     all.append(ReStructuredText)
 except ImportError:
@@ -104,7 +104,7 @@ class Textile(Renderer):
         extensions = ['textile']
 
         @classmethod
-        def render(cls, plain):
+        def render(cls, plain, source_path=None):
             return textile.textile(plain)
 
     all.append(Textile)