changed example, added @JSON

warmuuh · Apr 5, 2013 · c7a49d4 · c7a49d4
1 parent 2bf0d4a
commit c7a49d4
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 20 deletions.
diff --git a/express-example/MyService.js b/express-example/MyService.js
@@ -9,16 +9,13 @@ MyService.prototype = {
 		return 'index';
     },
 
-    test: function (name, id)/*@POST("/test/:id") @Param*/ {
+    submit: function (name, age)/*@POST @Param*/ {
-		return {view:'test', model:{name: name, id: id}};
+     var msg = (age < 18)? "You are too young" : "You are welcome!";
-    },
+	 return {view:'greet', model:{name: name, msg: msg}};
-
+
-    rest: function( /*@Body*/msg, 
-					/*@Param*/id, 
-					/*@Autowired*/test) 
-    /*@POST("/rest/:id") @Body*/ {
-		return {msg: msg, id: id, wired: test};
     }
+
+
 };
 
 

diff --git a/express-example/views/greet.jade b/express-example/views/greet.jade
@@ -0,0 +1,7 @@
+html
+	head
+	body
+		h1|Hello, #{name}!
+		p=msg
+
+
diff --git a/express-example/views/index.jade b/express-example/views/index.jade
@@ -3,7 +3,11 @@ html
 	body
 		h1|Hello, what is your name?
 		div
-			form(name="input", action='/test/1',method='post')
+			form(name="input", action='/submit',method='post')
 				label(for='name') Name
 				input(id='name', name="name",type='text',value='',placeholder='Type your name')
+
+				label(for='age') Age
+				input(id='age', name="age",type='text',value='',placeholder='Type your age')
+
 				input(type='submit',value='Send!')  
diff --git a/express-example/views/test.jade b/express-example/views/test.jade
diff --git a/yaap/wire/express/plugins/VerbProcessors.js b/yaap/wire/express/plugins/VerbProcessors.js
@@ -82,8 +82,10 @@ function(when, _) {
 
 
 	function processResponse(result, res, fnDescription, context){
-			//raw json?
+			//raw?
 			if (getAnnotation(fnDescription, "@Body") !== undefined){ 
+				res.send(result);
+			} else if (getAnnotation(fnDescription, "@JSON") !== undefined){ 
 				res.json(result);
 			} else { //forwarding to view
 				if (typeof result === 'string')