X-Git-Url: http://nitlanguage.org diff --git a/lib/html.nit b/lib/html.nit index c1f0c86..4fc8530 100644 --- a/lib/html.nit +++ b/lib/html.nit @@ -27,6 +27,7 @@ module html # HTMLPage use fluent interface so you can chain calls as: # add("div").attr("id", "mydiv").text("My Div") class HTMLPage + super Streamable # Define head content fun head do end @@ -37,8 +38,7 @@ class HTMLPage private var current: HTMLTag = root private var stack = new List[HTMLTag] - # Render the page as a html string - fun render: String do + redef fun write_to(stream) do root.children.clear open("head") head @@ -46,7 +46,8 @@ class HTMLPage open("body") body close("body") - return "{root.html}" + stream.write "" + root.write_to(stream) end # Add a html tag to the current element @@ -81,19 +82,23 @@ class HTMLPage end current = stack.pop end - - # Save html page in the specified file - fun save(file: String) do - var out = new OFStream.open(file) - out.write(self.render) - out.close - end end class HTMLTag + super Streamable + # HTML tagname: 'div' for
var tag: String - init(tag: String) do self.tag = tag + init(tag: String) do + self.tag = tag + self.is_void = (once ["area", "base", "br", "col", "command", "embed", "hr", "img", "input", "keygen", "link", "meta", "param", "source", "track", "wbr"]).has(tag) + end + + # Is the HTML element a void element? + # + # assert (new HTMLTag("img")).is_void == true + # assert (new HTMLTag("p")).is_void == false + var is_void: Bool init with_attrs(tag: String, attrs: Map[String, String]) do self.tag = tag @@ -104,37 +109,48 @@ class HTMLTag var attrs: Map[String, String] = new HashMap[String, String] # Get the attributed value of 'prop' or null if 'prop' is undifened + # var img = new HTMLTag("img") + # img.attr("src", "./image.png").attr("alt", "image") + # assert img.get_attr("src") == "./image.png" fun get_attr(key: String): nullable String do if not attrs.has_key(key) then return null return attrs[key] end # Set a 'value' for 'key' - # var img = new HTMLTag("img") - # img.attr("src", "./image.png").attr("alt", "image") + # var img = new HTMLTag("img") + # img.attr("src", "./image.png").attr("alt", "image") + # assert img.write_to_string == """image""" fun attr(key: String, value: String): HTMLTag do attrs[key] = value return self end # Add a CSS class to the HTML tag - # var img = new HTMLTag("img") - # img.add_class("logo").add_class("fullpage") + # var img = new HTMLTag("img") + # img.add_class("logo").add_class("fullpage") + # assert img.write_to_string == """""" fun add_class(klass: String): HTMLTag do classes.add(klass) return self end - private var classes: Set[String] = new HashSet[String] + + # CSS classes + var classes: Set[String] = new HashSet[String] # Add multiple CSS classes + # var img = new HTMLTag("img") + # img.add_classes(["logo", "fullpage"]) + # assert img.write_to_string == """""" fun add_classes(classes: Collection[String]): HTMLTag do self.classes.add_all(classes) return self end # Set a CSS 'value' for 'prop' - # var img = new HTMLTag("img") - # img.css("border", "2px solid black").css("position", "absolute") + # var img = new HTMLTag("img") + # img.css("border", "2px solid black").css("position", "absolute") + # assert img.write_to_string == """""" fun css(prop: String, value: String): HTMLTag do css_props[prop] = value return self @@ -142,15 +158,61 @@ class HTMLTag private var css_props: Map[String, String] = new HashMap[String, String] # Get CSS value for 'prop' + # var img = new HTMLTag("img") + # img.css("border", "2px solid black").css("position", "absolute") + # assert img.get_css("border") == "2px solid black" + # assert img.get_css("color") == null fun get_css(prop: String): nullable String do if not css_props.has_key(prop) then return null return css_props[prop] end + # Replace `self` by `parent`. + # + # var elem = new HTMLTag("li") + # elem.add_outer(new HTMLTag("ul")) + # assert elem.write_to_string == "" + fun add_outer(parent: HTMLTag) do + # copy self in new object + var child = new HTMLTag(self.tag) + child.attrs = self.attrs + child.classes = self.classes + child.css_props = self.css_props + child.children = self.children + # add copy in parent children elements + parent.children.add(child) + # replace self by parent + self.tag = parent.tag + self.attrs = parent.attrs + self.classes = parent.classes + self.css_props = parent.css_props + self.is_void = parent.is_void + self.children = parent.children + end + # Add a HTML 'child' to self - # var ul = new HTMLTag("ul") - # ul.add(new HTMLTag("li")) - fun add(child: HTMLTag) do children.add(child) + # var ul = new HTMLTag("ul") + # ul.add(new HTMLTag("li")) + # assert ul.write_to_string == "" + # returns `self` for fluent programming + fun add(child: HTMLTag): HTMLTag + do + children.add(child) + return self + end + + # Create a new HTMLTag child and return it + # + # var ul = new HTMLTag("ul") + # ul.open("li").append("1").append("2") + # ul.open("li").append("3").append("4") + # assert ul.write_to_string == "" + fun open(tag: String): HTMLTag + do + var res = new HTMLTag(tag) + add(res) + return res + end # List of children HTML elements var children: Set[HTMLTag] = new HashSet[HTMLTag] @@ -158,7 +220,7 @@ class HTMLTag # Clear all child and set the text of element # var p = new HTMLTag("p") # p.text("Hello World!") - # assert p.html == "

Hello World!

" + # assert p.write_to_string == "

Hello World!

" # Text is escaped see: `standard::String::html_escape` fun text(txt: String): HTMLTag do @@ -172,7 +234,7 @@ class HTMLTag # p.append("Hello") # p.add(new HTMLTag("br")) # p.append("World!") - # assert p.html == "

Hello
World!

" + # assert p.write_to_string == "

Hello
World!

" # Text is escaped see: standard::String::html_escape fun append(txt: String): HTMLTag do add(new HTMLRaw(txt.html_escape)) @@ -180,32 +242,24 @@ class HTMLTag end # Append raw HTML to element + # # var p = new HTMLTag("p") # p.append("Hello") - # p.add_raw_html("") - # p.html #- "

Hello

" - # Note: the HTML in insered as it, no verification is done + # p.add_raw_html("foo") + # assert p.write_to_string == "

Hellofoo

" + # + # Note: the HTML in insered as it, no verification is done. fun add_raw_html(txt: String): HTMLTag do add(new HTMLRaw(txt)) return self end - # Render the element as HTML string - fun html: String do - var res = new Array[String] - render_in(res) - return res.to_s - end - - # Save html page in the specified file - fun save(file: String) do - var out = new OFStream.open(file) + redef fun write_to(stream) do var res = new Array[String] render_in(res) for r in res do - out.write(r) + stream.write(r) end - out.close end # In order to avoid recursive concatenation, @@ -215,7 +269,7 @@ class HTMLTag res.add "<" res.add tag render_attrs_in(res) - if tag != "script" and children.is_empty then + if is_void and children.is_empty then res.add "/>" else res.add ">" @@ -243,7 +297,7 @@ class HTMLTag if attrs.has_key("style") or not css_props.is_empty then res.add " style=\"" - for k, v in attrs do + for k, v in css_props do res.add k.html_escape res.add ": " res.add v.html_escape @@ -274,6 +328,5 @@ private class HTMLRaw private var content: String init(content: String) do self.content = content - redef fun html do return content redef fun render_in(res) do res.add content end