Merge branch 'router'

dbpy_test/files/renderfile.dbpy

@@ -0,0 +1 @@
+dbpy.io.file.render('existing/sample_text.txt')

dbpy_test/files/renderjson.dbpy

@@ -0,0 +1 @@
+dbpy.io.json.render('existing/sample_json.json')

dbpy_test/http/errorresponse.dbpy

@@ -0,0 +1,4 @@
+
+
+
+dbpy.http.error(500,"ERROR")

dbpy_test/test_runner.js

@@ -62,6 +62,12 @@ $('document').ready(function() {
 				return data == "This is a file to test for the ability to read files.\nSecond line.\n";
 			});
 		});
+		asyncTest("Render File",function() {
+			expect(1);
+			ajaxAssert('files/renderfile.dbpy',"Did not read file correctly",function(data,msg,response) {
+				return data == "This is a file to test for the ability to read files.\nSecond line.";
+			});
+		});
 
 
 		asyncTest("Load json",function() {
@@ -71,6 +77,13 @@ $('document').ready(function() {
 			});
 		});
 
+		asyncTest("Render json",function() {
+			expect(1);
+			ajaxAssert('files/renderjson.dbpy',"Did not render json correctly",function(data,msg,response) {
+				return data.id == 5;
+			});
+		});
+
 		asyncTest("Write file",function() {
 			expect(1);
 			ajaxAssert('files/writefile.dbpy',"Did not correctly write file",function(data,msg,response) {
@@ -147,6 +160,21 @@ $('document').ready(function() {
 			});
 		});
 
+		asyncTest("Error",function() {
+			expect(1);
+			$.ajax('http/errorresponse.dbpy',{
+				success: function(data) {
+					ok(false,"this was supposed to be an error!");
+				},
+				error: 	function(ob,mes,err) {
+					ok(true,"Sweet, an error");
+					start();
+				}
+
+			});
+
+		});
+
 		asyncTest("Get Params",function() {
 			expect(1);
 			ajaxAssert('http/getparams.dbpy?foo=bar&list=1&list=2',"Get Params not working",function(data,msg,response) {