Skip to content

Commit

Permalink
Merge pull request #1 from FreeAllMedia/feature/codeQuality
Browse files Browse the repository at this point in the history
linting and code climate suggestion
  • Loading branch information
nicosommi committed Aug 10, 2015
2 parents f3d7a1b + 7a19ac0 commit 03c5256
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 258 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,6 @@ build/Release
# Dependency directory
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
node_modules

# lcov file
lcov.info
52 changes: 25 additions & 27 deletions es5/lib/forbin.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ var setupFilters = Symbol("setupFilters"),
processFilters = Symbol("processFilters"),
processBeforeFilters = Symbol("processBeforeFilters"),
processAfterFilters = Symbol("processAfterFilters"),
actions = Symbol("actions"),
addFilter = Symbol("addFilter");
addFilter = Symbol("addFilter"),
getFilters = Symbol("getFilters");

/**
* Request/Response controller with filters.
Expand Down Expand Up @@ -144,9 +144,10 @@ var Controller = (function () {
options[_key5 - 1] = arguments[_key5];
}

var filter = null;
switch (options.length) {
case 1:
var filter = options[0];
filter = options[0];
// Filter to run before all actions, no skip available
this.actionNames.forEach(function (actionName) {
owner.push({
Expand All @@ -157,25 +158,23 @@ var Controller = (function () {
break;
case 2:
if (Array.isArray(options[0])) {
(function () {
// A. Filter to run before all actions, with skip available
var actionArray = options[0],
filter = options[1];
actionArray.forEach(function (action) {
owner.push({
action: action,
filter: filter
});
}, _this2);
})();
// A. Filter to run before all actions, with skip available
var actionArray = options[0];
filter = options[1];
actionArray.forEach(function (action) {
owner.push({
action: action,
filter: filter
});
}, this);
} else {
// B. Filter to run before a specific action, no skip available
var action = options[0],
_filter = options[1];
var action = options[0];
filter = options[1];

owner.push({
action: action,
filter: _filter
filter: filter
});
}
break;
Expand Down Expand Up @@ -248,24 +247,23 @@ var Controller = (function () {
});
}
}, {
key: processBeforeFilters,
value: function (action, request, response, callback) {
key: getFilters,
value: function (action, filterObject) {
var _this4 = this;

var applicableFilters = this._filters.before.filter(function (filter) {
return filterObject.filter(function (filter) {
return filter.action === _this4[action];
});
this[processFilters](applicableFilters, request, response, callback);
}
}, {
key: processBeforeFilters,
value: function (action, request, response, callback) {
this[processFilters](this[getFilters](action, this._filters.before), request, response, callback);
}
}, {
key: processAfterFilters,
value: function (action, request, response, callback) {
var _this5 = this;

var applicableFilters = this._filters.after.filter(function (filter) {
return filter.action === _this5[action];
});
this[processFilters](applicableFilters, request, response, callback);
this[processFilters](this[getFilters](action, this._filters.after), request, response, callback);
}
}, {
key: actionNames,
Expand Down
29 changes: 15 additions & 14 deletions es6/lib/forbin.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ const setupFilters = Symbol("setupFilters"),
processFilters = Symbol("processFilters"),
processBeforeFilters = Symbol("processBeforeFilters"),
processAfterFilters = Symbol("processAfterFilters"),
actions = Symbol("actions"),
addFilter = Symbol("addFilter");
addFilter = Symbol("addFilter"),
getFilters = Symbol("getFilters");

/**
* Request/Response controller with filters.
Expand Down Expand Up @@ -93,9 +93,10 @@ export default class Controller {

/* Private Methods */
[addFilter](owner, ...options) {
let filter = null;
switch(options.length) {
case 1:
const filter = options[0];
filter = options[0];
// Filter to run before all actions, no skip available
this.actionNames.forEach((actionName) => {
owner.push({
Expand All @@ -107,8 +108,8 @@ export default class Controller {
case 2:
if (Array.isArray(options[0])) {
// A. Filter to run before all actions, with skip available
const actionArray = options[0],
filter = options[1];
const actionArray = options[0];
filter = options[1];
actionArray.forEach((action) => {
owner.push({
action: action,
Expand All @@ -117,8 +118,8 @@ export default class Controller {
}, this);
} else {
// B. Filter to run before a specific action, no skip available
const action = options[0],
filter = options[1];
const action = options[0];
filter = options[1];

owner.push({
action: action,
Expand Down Expand Up @@ -210,18 +211,18 @@ export default class Controller {
);
}

[processBeforeFilters](action, request, response, callback) {
const applicableFilters = this._filters.before.filter((filter) => {
[getFilters](action, filterObject) {
return filterObject.filter((filter) => {
return (filter.action === this[action]);
});
this[processFilters](applicableFilters, request, response, callback);
}

[processBeforeFilters](action, request, response, callback) {
this[processFilters](this[getFilters](action, this._filters.before), request, response, callback);
}

[processAfterFilters](action, request, response, callback) {
const applicableFilters = this._filters.after.filter((filter) => {
return (filter.action === this[action]);
});
this[processFilters](applicableFilters, request, response, callback);
this[processFilters](this[getFilters](action, this._filters.after), request, response, callback);
}

[actionNames]() {
Expand Down
216 changes: 0 additions & 216 deletions lcov.info

This file was deleted.

Loading

0 comments on commit 03c5256

Please sign in to comment.