More tags, example with listing and correction in the required VRapto…

…r version

pom.xml

@@ -38,7 +38,7 @@
 		<dependency>
 			<groupId>br.com.caelum</groupId>
 			<artifactId>vraptor</artifactId>
-			<version>3.2</version>
+			<version>3.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>

src/main/java/br/com/caelum/vraptor/html/PageTagFactory.java

@@ -7,6 +7,8 @@
 import br.com.caelum.vraptor.html.tags.Body;
 import br.com.caelum.vraptor.html.tags.Head;
 import br.com.caelum.vraptor.html.tags.Html;
+import br.com.caelum.vraptor.html.tags.Li;
+import br.com.caelum.vraptor.html.tags.Ol;
 import br.com.caelum.vraptor.html.tags.P;
 import br.com.caelum.vraptor.html.tags.Span;
 import br.com.caelum.vraptor.html.tags.Tag;
@@ -128,4 +130,34 @@ public static Span span(String content) {
 	public static Span span(Attributes attributes, String content) {
 		return new Span(attributes, new Text(content));
 	}
+	public static Li li(Tag... children) {
+		return new Li(new Attributes(), children);
+	}
+
+	public static Li li(Attributes attributes, Tag... children) {
+		return new Li(attributes, children);
+	}
+
+	public static Li li(String content) {
+		return new Li(new Attributes(), new Text(content));
+	}
+
+	public static Li li(Attributes attributes, String content) {
+		return new Li(attributes, new Text(content));
+	}
+	public static Ol ol(Tag... children) {
+		return new Ol(new Attributes(), children);
+	}
+
+	public static Ol ol(Attributes attributes, Tag... children) {
+		return new Ol(attributes, children);
+	}
+
+	public static Ol ol(String content) {
+		return new Ol(new Attributes(), new Text(content));
+	}
+
+	public static Ol ol(Attributes attributes, String content) {
+		return new Ol(attributes, new Text(content));
+	}
 }

src/main/java/br/com/caelum/vraptor/html/example/ExampleController.java

@@ -16,12 +16,16 @@
  */
 package br.com.caelum.vraptor.html.example;
 
+import java.util.Arrays;
+import java.util.List;
+
 import br.com.caelum.vraptor.Path;
 import br.com.caelum.vraptor.Resource;
 import br.com.caelum.vraptor.Result;
 import br.com.caelum.vraptor.html.Page;
 import br.com.caelum.vraptor.html.PageProcessor;
 import br.com.caelum.vraptor.html.example.page.IndexPage;
+import br.com.caelum.vraptor.html.example.page.ListPage;
 import br.com.caelum.vraptor.view.Results;
 
 @Resource
@@ -42,6 +46,12 @@ public Page index() {
 		return null;
 	}
 
+	@Path("/listing")
+	public void listing() {
+		List<String> cars = Arrays.asList("GM", "Ford", "VW");
+		result.use(Results.http()).body(pageProcessor.process(new ListPage(cars)));
+	}
+
 	@Path("/complex/route/to/page2")
 	public void page2() {
 		result.use(Results.http()).body("Voila!");

src/main/java/br/com/caelum/vraptor/html/example/page/IndexPage.java

@@ -21,6 +21,7 @@ public class IndexPage implements Page {
 
 	public Html render() {
 		Link page2 = link(); to(ExampleController.class).page2();
+		Link table = link(); to(ExampleController.class).listing();
 		Link google = link("http://google.com");
 
 		return html(
@@ -33,6 +34,10 @@ public Html render() {
 						a(attrs(href(page2)), "complex link"),
 						span(" to another page")
 					),
+					p(
+						text("To "),
+						a(attrs(href(table)), "a page with a table")
+					),
 					p(
 						text("And for "),
 						a(attrs(href(google)), "Google")

src/main/java/br/com/caelum/vraptor/html/example/page/ListPage.java

@@ -0,0 +1,47 @@
+package br.com.caelum.vraptor.html.example.page;
+import static br.com.caelum.vraptor.html.PageTagFactory.body;
+import static br.com.caelum.vraptor.html.PageTagFactory.html;
+import static br.com.caelum.vraptor.html.PageTagFactory.li;
+import static br.com.caelum.vraptor.html.PageTagFactory.ol;
+
+import java.util.List;
+
+import br.com.caelum.vraptor.html.Page;
+import br.com.caelum.vraptor.html.tags.Html;
+import br.com.caelum.vraptor.html.tags.Tags;
+
+public class ListPage implements Page {
+
+	private final List<String> cars;
+
+	public ListPage(List<String> cars) {
+		this.cars = cars;
+	}
+
+	@Override
+	public Html render() {
+		return html(
+				body(
+						ol(
+						  cars()
+						)
+				)
+			);
+	}
+
+//	private Tag toTag(String car) {
+//		...;
+//	}
+
+	private Tags cars() {
+		//Tags.foreach(cars).use(TablePage.class).toTag(null);
+
+
+		Tags tags = new Tags();
+		for (String car : cars) {
+			tags.append(li(car));
+		}
+		return tags;
+	}
+
+}

src/main/java/br/com/caelum/vraptor/html/tags/Li.java

@@ -0,0 +1,25 @@
+package br.com.caelum.vraptor.html.tags;
+
+import br.com.caelum.vraptor.html.attributes.Attributes;
+
+public class Li implements Tag {
+	private final Attributes attributes;
+	private final Tag[] children;
+
+	public Li(Attributes attributes, Tag... children) {
+		this.attributes = attributes;
+		this.children = children;
+
+	}
+
+	@Override
+	public Tag[] getChildren() {
+		return children;
+	}
+
+	@Override
+	public Attributes getAttributes() {
+		return attributes;
+	}
+
+}

src/main/java/br/com/caelum/vraptor/html/tags/Ol.java

@@ -0,0 +1,21 @@
+package br.com.caelum.vraptor.html.tags;
+
+import br.com.caelum.vraptor.html.attributes.Attributes;
+
+public class Ol implements Tag {
+	private final Tag[] children;
+	private final Attributes attributes;
+
+	public Ol(Attributes attributes, Tag... children) {
+		this.attributes = attributes;
+		this.children = children;
+	}
+
+	public Attributes getAttributes() {
+		return this.attributes;
+	}
+
+	public Tag[] getChildren() {
+		return this.children;
+	}
+}

src/main/java/br/com/caelum/vraptor/html/tags/Tags.java

@@ -0,0 +1,26 @@
+package br.com.caelum.vraptor.html.tags;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import br.com.caelum.vraptor.html.attributes.Attributes;
+
+public class Tags implements Tag {
+
+	private final List<Tag> children = new LinkedList<Tag>();
+
+	@Override
+	public Tag[] getChildren() {
+		return children.toArray(new Tag[0]);
+	}
+
+	@Override
+	public Attributes getAttributes() {
+		return new Attributes();
+	}
+
+	public void append(Tag child) {
+		children.add(child);
+	}
+
+}