Refactor the js & update the package

phodal · Aug 19, 2014 · bc0b004 · bc0b004
1 parent f610acf
commit bc0b004
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iot-coap",
-  "version": "0.0.21",
+  "version": "0.0.3",
   "description": "Mini IoT CoAP Version",
   "repository": {
     "type": "git",

diff --git a/server/query_helper.js b/server/query_helper.js
@@ -1,5 +1,5 @@
 var DBHelper = require('./db_helper.js');
-var QueryData = require('./QueryData.js');
+var returnResult = require('./retunResultAndCode.js');
 
 DBHelper.initDB();
 
@@ -10,13 +10,13 @@ function query_helper() {
 
 query_helper.syncJSON = function(req, res, block) {
     DBHelper.syncData(block, function (result) {
-        QueryData.saveJsonToDB(block, res);
+        returnResult.saveAndCode(block, res);
     });
 };
 
 query_helper.deleteData = function(req, res){
     DBHelper.deleteData(req.url, function (result) {
-        QueryData.returnDelete(result, res);
+        returnResult.deleteAndCode(result, res);
     });
 };
 
@@ -26,13 +26,13 @@ query_helper.postXML = function(req, res) {
 
 query_helper.returnJSON = function(req, res) {
     DBHelper.urlQueryData(req.url, function (result) {
-        QueryData.returnJSON(result, res);
+        returnResult.jsonAndCode(result, res);
     });
 };
 
 query_helper.returnXML = function(req, res) {
     DBHelper.urlQueryData(req.url, function (result) {
-        QueryData.returnXML(result, res);
+        returnResult.XMLAndCode(result, res);
     });
 };
 

diff --git a/server/QueryData.js → server/retunResultAndCode.js b/server/QueryData.js → server/retunResultAndCode.js
@@ -1,21 +1,21 @@
 var jstoxml = require('jstoxml');
 
-function QueryData() {
+function resultReturn() {
 
 }
-QueryData.saveJsonToDB = function(block, res){
+resultReturn.saveAndCode = function(block, res){
     res.code = '2.05';
     res.end({});
 };
 
-QueryData.returnDelete = function(block, res){
+resultReturn.deleteAndCode = function(block, res){
     res.code = '2.05';
     res.end(JSON.stringify({
         success: "delete"
     }));
 };
 
-QueryData.returnJSON = function(result, res) {
+resultReturn.jsonAndCode = function(result, res) {
     if (result.length == 2) {
         res.code = '4.04';
         res.end(JSON.stringify({
@@ -28,7 +28,7 @@ QueryData.returnJSON = function(result, res) {
 };
 
 
-QueryData.returnXML = function (result, res) {
+resultReturn.XMLAndCode = function (result, res) {
     if (result.length == 2) {
         res.code = '4.04';
         res.end(jstoxml.toXML({
@@ -40,4 +40,4 @@ QueryData.returnXML = function (result, res) {
     }
 };
 
-module.exports = QueryData;
+module.exports = resultReturn;
diff --git a/test/test.js b/test/test.js
@@ -1,4 +1,4 @@
-var QueryData = require('../server/QueryData.js');
+var resultReturn = require('../server/retunResultAndCode.js');
 
 describe('query data status code test', function() {
 
@@ -7,15 +7,15 @@ describe('query data status code test', function() {
 
     it('should return 4.04 when result empty', function(done) {
         var request = "[]";
-        QueryData.returnJSON(request, res);
+        resultReturn.jsonAndCode(request, res);
         var result = res.code;
         expect(result).to.eql("4.04");
         done();
     });
 
     it('should return 2.05 when result empty', function(done) {
         var request = "[{hello:'world'}]";
-        QueryData.returnJSON(request, res);
+        resultReturn.jsonAndCode(request, res);
         var result = res.code;
         expect(result).to.eql("2.05");
         done();