Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
antoinehage committed Jan 7, 2019
2 parents 0da1572 + 3594b9f commit 3b55e8a
Show file tree
Hide file tree
Showing 6 changed files with 119 additions and 2 deletions.
3 changes: 2 additions & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
*/
module.exports = {
"registry" : require("./lib/registry.js"),
"utils" : require("./lib/utils.js")
"utils" : require("./lib/utils.js"),
"version" : require("./lib/version.js")
};
42 changes: 42 additions & 0 deletions lib/version.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
"use strict";

let version = {
'getLatest': (vPre, vNew) => {
if (!vPre)
return vNew;

if (version.validate(vPre) && version.validate(vNew)) {
let vNewNb = parseFloat(vNew);
let vPreNb = parseFloat(vPre);

if (vNewNb > vPreNb)
return vNew;
}
return vPre;
},

'isLatest': (vSrc, vCom) => {
if (version.validate(vSrc) && version.validate(vCom)) {
let vSrcNb = parseFloat(vSrc);
let vComNb = parseFloat(vCom);

if (vSrcNb > vComNb)
return true;
}
return false;
},

'validate': (ver) => {
if (ver) {
if (typeof ver !== 'string')
ver = "" + ver;
let matches = ver.match(/[0-9]+(.[0-9]+)?/);
if (matches && matches.length > 0) {
return true;
}
}
return false
}
};

module.exports = version;
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "soajs.core.libs",
"description": "SOAJS core libraries package",
"version": "1.0.2",
"version": "1.0.3",
"author": {
"name": "soajs team",
"email": "team@soajs.org"
Expand Down
1 change: 1 addition & 0 deletions test/unit/_servers.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ describe("importing sample data", function () {
after(function (done) {
console.log('test data imported.');
require("./lib.utils.test.js");
require("./lib.version.test.js");
done();
});
});
12 changes: 12 additions & 0 deletions test/unit/lib.utils.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,16 @@ describe("testing utils", function(){
done();
});
});

describe("testing validProperty", function(){
var obj1= {
"antoine" : "hage"
};

it("testing validProperty", function(done){
var obj2 = utils.validProperty(obj1,"antoine");
assert.ok(obj2);
done();
});
});
});
61 changes: 61 additions & 0 deletions test/unit/lib.version.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
"use strict";
let assert = require('assert');
let helper = require("../helper.js");

var utils = helper.requireModule('./lib/version');

describe("testing version", function () {


let version1 = "1.0";
let version2 = "1.2";
let wrongVersion = "b.a.3";

it("testing getLatest", function (done) {
let ver = utils.getLatest(version1, version2);
assert.ok(ver);
assert.equal(ver, version2);
done();
});
it("testing getLatest with null version", function (done) {
let ver = utils.getLatest(null, version2);
assert.ok(ver);
assert.equal(ver, version2);
done();
});
it("testing getLatest with wrong version", function (done) {
let ver = utils.getLatest(wrongVersion, version2);
assert.ok(ver);
assert.equal(ver, wrongVersion);
done();
});


it("testing isLatest - false", function (done) {
let ver = utils.isLatest(version1, version2);
assert.ok(!ver);
done();
});
it("testing isLatest - true", function (done) {
let ver = utils.isLatest(version2, version1);
assert.ok(ver);
done();
});
it("testing isLatest with null", function (done) {
let ver = utils.isLatest(null, version2);
assert.ok(!ver);
done();
});


it("testing validate not string", function (done) {
let ver = utils.validate(1);
assert.ok(ver);
done();
});
it("testing validate null", function (done) {
let ver = utils.validate(null);
assert.ok(!ver);
done();
});
});

0 comments on commit 3b55e8a

Please sign in to comment.