Skip to content

Commit

Permalink
Merge pull request #1 from iumio/fix/mercure-js
Browse files Browse the repository at this point in the history 
- Rewrite code of mercure
  • Loading branch information
@danyRafina
danyRafina authored Jul 24, 2018
2 parents 46d8654 + c308cd1 commit 4f0d56c
Show file tree
Hide file tree
Showing 2 changed files with 133 additions and 75 deletions.
27 changes: 27 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Changelog
All notable changes to this project will be documented in this file.

<p align="center"><a href="https://framework.iumio.com" target="_blank">
<img src="https://framework.iumio.com/images/iumio-framework-horizontal.png" width="350">
</a></p>

[Framework Assets, an iumio Framework component]
========================================================

@ Let's create more simply

## [STABLE RELEASE]


## [1.0.1] STS - 2018-07-23
- Edited :
- Mercure
- Rewrite mercure to accept multi apps JS search


## [1.0.0] STS - XXXX-XX-XX

[STABLE RELEASE]: https://github.com/iumio-team/iumio-framework/
[1.0.0]: https://github.com/iumio-team/framework-assets/releases/tag/v1.0.0
[1.0.1]: https://github.com/iumio-team/framework-assets/releases/tag/v1.0.1
[iumio Framework, an iumio component]: https://www.iumio.com
181 changes: 106 additions & 75 deletions mercure/libs/js/Mercure.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ var Mercure = function () {
* Get the json Routing File contain
* @returns {number} 1 if a success - 0 if failure
*/
this.getJson = function()
{
this.getJson = function () {
if (typeof mercuredata !== "undefined")
this.json = mercuredata;
else
Expand All @@ -34,8 +33,7 @@ var Mercure = function () {
* Check validity of required elements for Route Alpha
* @returns {number} 1 if a success - 0 if failure
*/
this.checkValidityAlpha = function()
{
this.checkValidityAlpha = function () {
if (this.getJson() === 0)
return (0);
if (typeof document.getElementById("mercure_app_referer") === "undefined")
Expand Down Expand Up @@ -68,23 +66,29 @@ var Mercure = function () {
* @param name Route name
* @returns {string} Return the route value or null [Null Routing Exception] for no route
*/
this.getRouteAlpha = function(name) {
this.getRouteAlpha = function (name) {
if (this.checkValidityAlpha() === 0)
(this.makeException("CRITICAL", "Route Alpha Error : Cannot get mercure components",
"Route Alpha Error : Cannot get mercure components"));
var app = document.getElementById("mercure_app_referer").getAttribute("referer-app");
var file = this.json;
if (typeof file[0] === "undefined" && typeof file[0][app] === "undefined")
(this.makeException("CRITICAL", "Route Alpha Error : Mercure file is empty or App is undefined",
"Route Alpha Error : Mercure file is empty or App is undefined"));
var routes = file[0][app];
for (var route in routes) {
var mercure = routes[route];
if (mercure.name === name && mercure.params === "")
return (((this.fullUrl)? this.baseUrl() : "") + this.partUrl() + mercure.path);
if (typeof file[0] === "undefined")
(this.makeException("CRITICAL", "Route Alpha Error : Mercure file is empty",
"Route Alpha Error : Mercure file is empty"));

for (var apps in file) {
var it = file[apps];
for (var iterator in it) {
var routes = it[iterator];
for (var route in routes) {
var mercure = routes[route];
if (mercure.name === name && mercure.params === "")
return (((this.fullUrl) ? this.baseUrl() : "") + this.partUrl() + mercure.path);
}
}
}
(this.makeException("CRITICAL", "Route Alpha Error : Cannot get route by name",
"Route Alpha Error : Cannot get route by name"));
this.makeException("CRITICAL", "Route Alpha Error : Cannot get route by name",
"Route Alpha Error : Cannot get route by name");

};

/**
Expand All @@ -94,37 +98,47 @@ var Mercure = function () {
* @param appname App name
* @returns {string} Return the route value or null [Null Routing Exception] for no route
*/
this.getRouteBeta = function(name, parameters, appname)
{
this.getRouteBeta = function (name, parameters, appname) {
if (this.getJson() === 0)
(this.makeException("CRITICAL", "Route Beta Error : Json mercure elements is not defined",
"Route Beta Error : Json mercure elements is not defined"));
var file = this.json;
if (typeof file[0] === "undefined" && typeof file[0][appname] === "undefined")
(this.makeException("CRITICAL", "Route Beta Error : Mercure file is empty or App is undefined",
"Route Beta Error : Mercure file is empty or App is undefined"));
var routes = file[0][appname];
for (var route in routes) {
var mercure = routes[route];
if (mercure.name === name && mercure.params !== "")
{
var onemercure = mercure.path;
var ind = onemercure.split("/");
for (var key in parameters) {
if (parameters.hasOwnProperty(key)) {
var val = parameters[key];
for (var i = 0; i < ind.length; i++)
{
if ("{"+key+"}" === ind[i])
ind[i] = val;
}

var routes = null;

for (var apps in file) {
var it = file[apps];
for (var iterator in it) {
if (iterator === appname) {
routes = it[iterator];
break;
}
}
}
if (null !== routes) {
for (var route in routes) {
var mercure = routes[route];
if (mercure.name === name && mercure.params !== "") {
var onemercure = mercure.path;
var ind = onemercure.split("/");
for (var key in parameters) {
if (parameters.hasOwnProperty(key)) {
var val = parameters[key];
for (var i = 0; i < ind.length; i++) {
if ("{" + key + "}" === ind[i])
ind[i] = val;
}
}
}
onemercure = ind.join("/");
return (((this.fullUrl) ? this.baseUrl() : "") + onemercure);
}
onemercure = ind.join("/");
return (((this.fullUrl)? this.baseUrl() : "") + onemercure);
}
}

(this.makeException("CRITICAL", "Route Beta Error : Cannot get route by name",
"Route Beta Error : Cannot get route by name"));
};
Expand All @@ -135,8 +149,7 @@ var Mercure = function () {
* @param parameters Parameters for route
* @returns {string} Return the route value or null [Null Routing Exception] for no route
*/
this.getRouteGamma = function(name, parameters)
{
this.getRouteGamma = function (name, parameters) {
if (this.checkValidityAlpha() === 0)
(this.makeException("CRITICAL", "Route Gamma Error : Cannot get mercure components",
"Route Gamma Error : Cannot get mercure components"));
Expand All @@ -145,26 +158,29 @@ var Mercure = function () {
if (typeof file[0] === "undefined" && typeof file[0][app] === "undefined")
(this.makeException("CRITICAL", "Route Gamma Error : Mercure file is empty or App is undefined",
"Route Gamma Error : Mercure file is empty or App is undefined"));
var routes = file[0][app];
for (var route in routes) {
var mercure = routes[route];
if (mercure.name === name && mercure.params !== "")
{
var onemercure = mercure.path;
var ind = onemercure.split("/");
for (var key in parameters) {
if (parameters.hasOwnProperty(key)) {
var val = parameters[key];
for (var i = 0; i < ind.length; i++)
{
if ("{"+key+"}" === ind[i])
ind[i] = val;
}

for (var apps in file) {
var it = file[apps];
for (var iterator in it) {
var routes = it[iterator];
for (var route in routes) {
var mercure = routes[route];
if (mercure.name === name && mercure.params !== "") {
var onemercure = mercure.path;
var ind = onemercure.split("/");
for (var key in parameters) {
if (parameters.hasOwnProperty(key)) {
var val = parameters[key];
for (var i = 0; i < ind.length; i++) {
if ("{" + key + "}" === ind[i])
ind[i] = val;
}
}
}
onemercure = ind.join("/");
return (((this.fullUrl) ? this.baseUrl() : "") + onemercure);
}
}
onemercure = ind.join("/");
return (((this.fullUrl)? this.baseUrl() : "") + onemercure);
}
}
(this.makeException("CRITICAL", "Route Gamma Error : Cannot get route by name",
Expand All @@ -177,20 +193,33 @@ var Mercure = function () {
* @param appname App name
* @returns {string} Return the route value or null [Null Routing Exception] for no route
*/
this.getRouteDelta = function(name, appname)
{
this.getRouteDelta = function (name, appname) {
if (this.getJson() === 0)
(this.makeException("CRITICAL", "Route Delta Error : Json mercure elements is not defined",
"Route Delta Error : Json mercure elements is not defined"));
var file = this.json;
if (typeof file[0] === "undefined" && typeof file[0][appname] === "undefined")
(this.makeException("CRITICAL", "Route Delta Error : Mercure file is empty or App is undefined",
"Route Delta Error : Mercure file is empty or App is undefined"));
var routes = file[0][appname];
for (var route in routes) {
var mercure = routes[route];
if (mercure.name === name && mercure.params === "")
return (((this.fullUrl)? this.baseUrl() : "") + mercure.path);


var routes = null;

for (var apps in file) {
var it = file[apps];
for (var iterator in it) {
if (iterator === appname) {
routes = it[iterator];
break;
}
}
}
if (null !== routes) {
for (var route in routes) {
var mercure = routes[route];
if (mercure.name === name && mercure.params === "")
return (((this.fullUrl) ? this.baseUrl() : "") + mercure.path);
}
}
(this.makeException("CRITICAL", "Route Delta Error : Cannot get route by name",
"Route Delta Error : Cannot get route by name"));
Expand All @@ -203,14 +232,13 @@ var Mercure = function () {
* @param appname App name for route (optionnal)
* @returns {string} Return the route value or null [Null Routing Exception] for no route
*/
this.getRoute = function (name, parameters, appname)
{
this.getRoute = function (name, parameters, appname) {
if (typeof name === "undefined")
(this.makeException("CRITICAL", "Get Route Error : route name is undefined",
"Get Route Error : route name is undefined"));
else if (!parameters && !appname)
return (this.getRouteAlpha(name));
else if (parameters && typeof !appname)
else if (parameters && typeof appname !== 'string')
return (this.getRouteGamma(name, parameters));
else if (parameters && typeof appname)
return (this.getRouteBeta(name, parameters, appname));
Expand All @@ -225,27 +253,30 @@ var Mercure = function () {
* Change the value of full url
* @param status Status value (true or false)
*/
this.setFullUrl = function(status)
{
this.setFullUrl = function (status) {
if (typeof status === "boolean")
this.fullUrl = status;
this.fullUrl = status;
else
throw {
name: "Mercure Error",
level: "CRITICAL",
message: "Error detected. Full Url parameters must be a boolean.",
name: "Mercure Error",
level: "CRITICAL",
message: "Error detected. Full Url parameters must be a boolean.",
htmlMessage: "Error detected. Full Url parameters must be a boolean.",
toString: function(){return this.name + ": " + this.message;}
toString: function () {
return this.name + ": " + this.message;
}
};
};

this.makeException = function (level, message, htmlMessage) {
throw {
name: "Mercure Error",
level: level,
message: message,
name: "Mercure Error",
level: level,
message: message,
htmlMessage: htmlMessage,
toString: function(){return this.name + ": " + this.message;}
toString: function () {
return this.name + ": " + this.message;
}
};
}
};

0 comments on commit 4f0d56c

Please sign in to comment.