Added tests for DTD and reference generator. Also removed some dead c…

…ode.

src/z3c/rml/dtd.py

@@ -77,7 +77,3 @@ def generate(useWrapper=False):
 
 def main():
     print generate()
-
-
-if __name__ == '__main__':
-    print main()

src/z3c/rml/reference.py

@@ -231,7 +231,7 @@ def extractExamples(directory):
     return examples
 
 
-def main():
+def main(outPath=None):
     examples = extractExamples(EXAMPLES_DIRECTORY)
 
     template = pagetemplate.RMLPageTemplateFile('reference.pt')
@@ -241,8 +241,4 @@ def main():
     directives = sorted(directives.values(), key=lambda d: d['name'])
 
     pdf = template(types=getAttributeTypes(), directives=directives)
-    open('rml-reference.pdf', 'wb').write(pdf)
-
-
-if __name__ == '__main__':
-    main()
+    open(outPath or 'rml-reference.pdf', 'wb').write(pdf)

src/z3c/rml/rml.dtd

@@ -2205,4 +2205,3 @@
 <!ELEMENT plugInGraphic (#PCDATA)>
 <!ATTLIST plugInGraphic module CDATA #REQUIRED>
 <!ATTLIST plugInGraphic function CDATA #REQUIRED>
-

src/z3c/rml/special.py

@@ -41,33 +41,6 @@ def process(self):
         manager.names[id] = value
 
 
-class IGetName(interfaces.IRMLDirectiveSignature):
-    """Get the text for the id."""
-
-    id = attr.String(
-        title=u'Id',
-        description=u'The id as which the value is known.',
-        required=True)
-
-class GetName(directive.RMLDirective):
-    signature = IGetName
-
-    def process(self):
-        id = dict(self.getAttributeValues()).pop('id')
-        manager = attr.getManager(self)
-        try:
-            text = manager.names[id] + (self.element.tail or u'')
-        except:
-            import pdb; pdb.set_trace()
-        # Now replace the element with the text
-        parent = self.element.getparent()
-        if parent.text is None:
-            parent.text = text
-        else:
-            parent.text += text
-        parent.remove(self.element)
-
-
 class IAlias(interfaces.IRMLDirectiveSignature):
     """Defines an alias for a given style."""
 

src/z3c/rml/tests/test_dtd.py

@@ -0,0 +1,31 @@
+##############################################################################
+#
+# Copyright (c) 2012 Zope Foundation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTLAR PURPOSE.
+#
+##############################################################################
+"""Test generating DTD
+"""
+import os
+import unittest
+from z3c.rml import dtd
+
+class DTDTestCase(unittest.TestCase):
+
+    level = 2
+
+    def runTest(self):
+        path = os.path.join(os.path.dirname(dtd.__file__), 'rml.dtd')
+        with open(path, 'w') as file:
+            file.write(dtd.generate())
+
+
+def test_suite():
+   return unittest.TestSuite([DTDTestCase()])

src/z3c/rml/tests/test_reference.py

@@ -0,0 +1,31 @@
+##############################################################################
+#
+# Copyright (c) 2012 Zope Foundation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTLAR PURPOSE.
+#
+##############################################################################
+"""Test generating reference.
+"""
+import os
+import unittest
+from z3c.rml import reference
+
+class ReferenceTestCase(unittest.TestCase):
+
+    level = 3
+
+    def runTest(self):
+        reference.main(
+            os.path.join(os.path.dirname(reference.__file__),
+                         'rml-reference.pdf'))
+
+
+def test_suite():
+   return unittest.TestSuite([ReferenceTestCase()])