On step 4 of HTML parser

students/DanCornutt/session07/html_render.py

@@ -11,16 +11,19 @@ class Element:
 
     def __init__(self, content=None):
         if content:
-            self.content = [content]
-        else: self.content = []
+            self.contents = [content]
+        else: self.contents = []
 
     def append(self, new_content):
-        self.content.append(new_content)
+        self.contents.append(new_content)
 
     def render(self, out_file):
-        out_file.write("<{}>".format(self.tag))
-        for line in self.content:
-            out_file.write(line)
+        for content in self.contents:
+            out_file.write("<{}>".format(self.tag))
+            try:
+                content.render(out_file)
+            except AttributeError:
+                out_file.write(content)
             out_file.write("\n")
         out_file.write("</{}>".format(self.tag))
 
@@ -29,3 +32,21 @@ class Html(Element):
 
 class Body(Element):
     tag = "body"
+
+class P(Element):
+    tag = "p"
+
+class Head(Element):
+    tag = "head"
+
+class OneLineTag(Element):
+    def render(self, out_file):
+        out_file.write("<{}>".format(self.tag))
+        out_file.write(self.contents[0])
+        out_file.write("</{}>".format(self.tag))
+
+    def append(self, content):
+        raise NotImplementedError
+
+class Title(OneLineTag):
+    tag = "title"

students/DanCornutt/session07/run_html_render.py

@@ -45,24 +45,24 @@ def render_page(page, filename, indent=None):
 
 render_page(page, "test_html_output1.html")
 
-# The rest of the steps have been commented out.
-#  Uncomment them as you move along with the assignment.
+The rest of the steps have been commented out.
+ Uncomment them as you move along with the assignment.
 
-# ## Step 2
-# ##########
+## Step 2
+##########
 
-# page = hr.Html()
+page = hr.Html()
 
-# body = hr.Body()
+body = hr.Body()
 
-# body.append(hr.P("Here is a paragraph of text -- there could be more of them, "
-#                  "but this is enough  to show that we can do some text"))
+body.append(hr.P("Here is a paragraph of text -- there could be more of them, "
+                 "but this is enough  to show that we can do some text"))
 
-# body.append(hr.P("And here is another piece of text -- you should be able to add any number"))
+body.append(hr.P("And here is another piece of text -- you should be able to add any number"))
 
-# page.append(body)
+page.append(body)
 
-# render_page(page, "test_html_output2.html")
+render_page(page, "test_html_output2.html")
 
 # # Step 3
 # ##########

students/DanCornutt/session07/test_html_render.py

@@ -138,49 +138,78 @@ def test_body():
     assert file_contents.endswith("</body>")
 
 
-# def test_p():
-#     e = P("this is some text")
-#     e.append("and this is some more text")
-
-#     file_contents = render_result(e).strip()
+def test_p():
+    e = P("this is some text")
+    e.append("and this is some more text")
 
-#     assert("this is some text") in file_contents
-#     assert("and this is some more text") in file_contents
+    file_contents = render_result(e).strip()
 
-#     assert file_contents.startswith("<p>")
-#     assert file_contents.endswith("</p>")
+    assert("this is some text") in file_contents
+    assert("and this is some more text") in file_contents
 
+    assert file_contents.startswith("<p>")
+    assert file_contents.endswith("</p>")
 
-# def test_sub_element():
-#     """
-#     tests that you can add another element and still render properly
-#     """
-#     page = Html()
-#     page.append("some plain text.")
-#     page.append(P("A simple paragraph of text"))
-#     page.append("Some more plain text.")
 
-#     file_contents = render_result(page)
-#     print(file_contents) # so we can see it if the test fails
+def test_sub_element():
+    """
+    tests that you can add another element and still render properly
+    """
+    page = Html()
+    page.append("some plain text.")
+    page.append(P("A simple paragraph of text"))
+    page.append("Some more plain text.")
 
-#     # note: The previous tests should make sure that the tags are getting
-#     #       properly rendered, so we don't need to test that here.
-#     assert "some plain text" in file_contents
-#     assert "A simple paragraph of text" in file_contents
-#     assert "Some more plain text." in file_contents
-#     assert "some plain text" in file_contents
-#     # but make sure the embedded element's tags get rendered!
-#     assert "<p>" in file_contents
-#     assert "</p>" in file_contents
+    file_contents = render_result(page)
+    print(file_contents) # so we can see it if the test fails
 
+    # note: The previous tests should make sure that the tags are getting
+    #       properly rendered, so we don't need to test that here.
+    assert "some plain text" in file_contents
+    assert "A simple paragraph of text" in file_contents
+    assert "Some more plain text." in file_contents
+    assert "some plain text" in file_contents
+    # but make sure the embedded element's tags get rendered!
+    assert "<p>" in file_contents
+    assert "</p>" in file_contents
 
 
 
 ########
 # Step 3
 ########
 
-# Add your tests here!
+def test_head():
+    e = Head("this is some new text")
+    e.append("and this is some more new text")
+
+    file_contents = render_result(e).strip()
+
+    assert("this is some new text") in file_contents
+    assert("and this is some more new text") in file_contents
+
+    assert file_contents.startswith("<head>")
+    assert file_contents.endswith("</head>")
+
+
+def test_title():
+    e = Title("This is a Title")
+
+    file_contents = render_result(e).strip()
+
+    assert("This is a Title") in file_contents
+    print(file_contents)
+    assert file_contents.startswith("<title>")
+    assert file_contents.endswith("</title>")
+    assert "\n" not in file_contents
+
+def test_one_line_tag_append():
+    """
+    You should not be able to append content to a OneLineTag
+    """
+    e = OneLineTag("the initial content")
+    with pytest.raises(NotImplementedError):
+        e.append("some more content")
 
 # #####################
 # # indentation testing