Merge pull request #63 from benallard/hyde

---

This add basic support for restructuredText.

hyde/ext/templates/jinja.py

@@ -110,6 +110,18 @@ def markdown(env, value):
 
     return marked.convert(output)
 
+@environmentfilter
+def restructuredtext(env, value):
+    """
+    RestructuredText filter
+    """
+    try:
+        from docutils.core import publish_parts
+    except ImportError:
+        print u"Requires docutils library to use restructuredtext tag."
+        raise
+    parts = publish_parts(source=value, writer_name="html")
+    return parts['html_body']
 
 @environmentfilter
 def syntax(env, value, lexer=None, filename=None):
@@ -200,6 +212,31 @@ class Markdown(Extension):
         output = caller().strip()
         return markdown(self.environment, output)
 
+class restructuredText(Extension):
+    """
+    A wrapper around the restructuredtext filter for syntactic sugar
+    """
+    tags = set(['restructuredtext'])
+
+    def parse(self, parser):
+        """
+        Simply extract our content
+        """
+        lineno = parser.stream.next().lineno
+        body = parser.parse_statements(['name:endrestructuredtext'], drop_needle=True)
+
+        return nodes.CallBlock(self.call_method('_render_rst'), [],  [], body
+                              ).set_lineno(lineno)
+
+    def _render_rst(self, caller=None):
+        """
+        call our restructuredtext filter
+        """
+        if not caller:
+            return ''
+        output = caller().strip()
+        return restructuredtext(self.environment, output)
+
 class YamlVar(Extension):
     """
     An extension that converts the content between the tags
@@ -524,6 +561,7 @@ class Jinja2Template(Template):
                 IncludeText,
                 Spaceless,
                 Markdown,
+                restructuredText,
                 Syntax,
                 Reference,
                 Refer,
@@ -572,6 +610,7 @@ class Jinja2Template(Template):
         self.env.globals['engine'] = engine
         self.env.globals['deps'] = {}
         self.env.filters['markdown'] = markdown
+        self.env.filters['restructuredtext'] = restructuredtext
         self.env.filters['syntax'] = syntax
         self.env.filters['date_format'] = date_format
         self.env.filters['xmldatetime'] = xmldatetime

hyde/server.py

@@ -8,6 +8,7 @@ import select
 import threading
 import urlparse
 import urllib
+import traceback
 from datetime import datetime
 from SimpleHTTPServer import SimpleHTTPRequestHandler
 from BaseHTTPServer import HTTPServer
@@ -196,6 +197,7 @@ class HydeWebServer(HTTPServer):
         except Exception, exception:
             logger.error('Error occured when regenerating the site [%s]'
                             % exception.message)
+            logger.error(traceback.format_exc())
 
     def generate_node(self, node):
         """
@@ -213,6 +215,7 @@ class HydeWebServer(HTTPServer):
             logger.error(
                 'Error [%s] occured when generating the node [%s]'
                         % (repr(exception), node))
+            logger.error(traceback.format_exc())
 
     def generate_resource(self, resource):
         """
@@ -231,3 +234,4 @@ class HydeWebServer(HTTPServer):
             logger.error(
                 'Error [%s] occured when serving the resource [%s]'
                         % (repr(exception), resource))
+            logger.error(traceback.format_exc())

hyde/tests/test_jinja2template.py

@@ -136,6 +136,20 @@ def test_markdown():
     html = t.render(source, {}).strip()
     assert html == u'<h3>Heading 3</h3>'
 
+def test_restructuredtext():
+    source = """
+{% restructuredtext %}
+Hello
+=====
+{% endrestructuredtext %}
+    """
+    t = Jinja2Template(JINJA2.path)
+    t.configure(None)
+    html = t.render(source, {}).strip()
+    assert html == u"""<div class="document" id="hello">
+<h1 class="title">Hello</h1>
+</div>""", html
+
 def test_markdown_with_extensions():
     source = """
     {%markdown%}