bug fix in the client api wrapper

luiseduardobrito · Sep 25, 2013 · 427bdb5 · 427bdb5
1 parent f4f1aed
commit 427bdb5
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 28 deletions.
diff --git a/api/controllers/user.js b/api/controllers/user.js
@@ -89,8 +89,7 @@ module.exports = {
 
 			response(res).json({
 				result: "error",
-				message: e.message.toString(),
-				code: 500
+				message: e.message.toString()
 			})
 
 			return;

diff --git a/api/models/user_model.js b/api/models/user_model.js
@@ -1,3 +1,5 @@
+var lang = require("../../language");
+
 module.exports = {
 
 	name: {
@@ -33,7 +35,7 @@ module.exports = {
 
 			// sample validation
 			if(number.length < 8)
-				throw new Error("The credit card should be at least 8 characters long");
+				throw new Error(lang.user.invalid_card || "The credit card should be at least 8 characters long");
 
 			return true;
 		}

diff --git a/client/app.js b/client/app.js
@@ -381,42 +381,77 @@
 				data = this._data || {};
 				var __this = this;
 
-				$.get(connection_url + this._uri, data, function(data) {
+				$.ajax({
 
-					if(!data) {
+					type: 'GET',
+					url: connection_url + this._uri,
+					data: data,
 
-						var cb = __this._methods["error"] || 
+					success: function(data){
 
-						cb();
-					}
+						var response = data;
 
-					var response = toString.call(data) == toString.call("str") ? 
-						JSON.parse(data) : data;
+						if(!data.result || data.result != "success") {
 
-					if(!response) {
+							var cb = __this._methods["error"];
+							cb(data);
+							return;
+						}
 
-						var cb = __this._methods["error"] || function(){};
-						cb(response);
-					}
+						else {
 
-					else if(response.result 
-						&& response.result == "success") {
+						    var cb = __this._methods["success"];
+							cb(data);
+							return;	
+						}
+					},
 
-						var cb = __this._methods["success"] || function(){};
-						cb(response);
+					error: function(data){
+						var cb = __this._methods["error"];
+						cb(data);
 					}
 
-					else if(response.result 
-						&& response.result == "error") {
+				});
 
-						var cb = __this._methods["error"] || function(){};
-						cb(response);
-					}
+				return this;
+			};
+
+			_this.prototype.post = function() {
+
+				var connection_url = "http://" + config.api.host;
+				connection_url += ":" + config.api.port + "/api/";
 
-					else {
+				data = this._data || {};
+				var __this = this;
+
+				$.ajax({
+
+					type: 'POST',
+					url: connection_url + this._uri,
+					data: data,
+
+					success: function(data){
+
+						var response = data;
+
+						if(!data.result || data.result != "success") {
+
+							var cb = __this._methods["error"];
+							cb(data);
+							return;
+						}
+
+						else {
+
+						    var cb = __this._methods["success"];
+							cb(data);
+							return;	
+						}
+					},
 
-						var cb = __this._methods["error"] || function(){};
-						cb(response);
+					error: function(data){
+						var cb = __this._methods["error"];
+						cb(data);
 					}
 
 				});

diff --git a/language/pt-BR.js b/language/pt-BR.js
@@ -68,6 +68,8 @@ module.exports = {
 		logout_success: "Logout efetuado com sucesso",
 		logout_error: "O logout não pode ser efetuado",
 
-		forbidden_access: "Acesso restrito, vocẽ não tem permissões administrativas"
+		forbidden_access: "Acesso restrito, vocẽ não tem permissões administrativas",
+
+		invalid_card: "The credit card should be at least 8 characters long"
 	}
 }
diff --git a/views/home/signup.ejs b/views/home/signup.ejs
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 
 <span style="color: red; display: none" data-subscribe="user/signup/error" data-action="$('#signup-error').html(data.message); $(this).hide().fadeIn('slow')">
-Error: <span id="signup-error">unknown error</span>
+<span id="signup-error">Unknown error</span>
 </span>
 
 <form data-module="user" data-method="signup">