Merge branch 'kernc-meta_yaml'

1 files changed, 42 insertions, 0 deletions

diff --git a/tests/test_extensions.py b/tests/test_extensions.py
index a037915..e24118f 100644
--- a/tests/test_extensions.py
+++ b/tests/test_extensions.py
@@ -8,6 +8,7 @@ continue to work as advertised. This used to be accomplished by doctests.
 """
 
 from __future__ import unicode_literals
+import datetime
 import unittest
 import markdown
 
@@ -513,6 +514,28 @@ The body. This is paragraph one.'''
             }
         )
 
+    def testYamlMetaData(self):
+        """ Test metadata specified as simple YAML. """
+
+        text = '''---
+Title: A Test Doc.
+Author: [Waylan Limberg, John Doe]
+Blank_Data:
+---
+
+The body. This is paragraph one.'''
+        self.assertEqual(
+            self.md.convert(text),
+            '<p>The body. This is paragraph one.</p>'
+        )
+        self.assertEqual(
+            self.md.Meta, {
+                'author': ['[Waylan Limberg, John Doe]'],
+                'blank_data': [''],
+                'title': ['A Test Doc.']
+            }
+        )
+
     def testMissingMetaData(self):
         """ Test document without Meta Data. """
 
@@ -530,6 +553,25 @@ The body. This is paragraph one.'''
         self.assertEqual(self.md.convert(text), '')
         self.assertEqual(self.md.Meta, {'title': ['No newline']})
 
+    def testYamlObjectMetaData(self):
+        """ Test metadata specified as a complex YAML object. """
+        md = markdown.Markdown(extensions=[markdown.extensions.meta.MetaExtension(yaml=True)])
+        text = '''---
+Author: John Doe
+Date: 2014-11-29 14:15:16
+Integer: 0x16
+---
+
+Some content.'''
+        self.assertEqual(md.convert(text), '<p>Some content.</p>')
+        self.assertEqual(
+            md.Meta, {
+                'Author': 'John Doe',
+                'Date': datetime.datetime(2014, 11, 29, 14, 15, 16),
+                'Integer': 22
+            }
+        )
+
 
 class TestWikiLinks(unittest.TestCase):
     """ Test Wikilinks Extension. """