Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions core/parseMethodRouteKey.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,25 @@ export default function parseMethodRouteKey(key) {

/* Behave differently based on the number of segments */
switch (parts.length) {
case 1:
case 1: {
/* Default to get */
object.method = 'get';
/* Assume the only part is the URL */
object.route = parts[0];
break;
}

case 2:
case 2: {
/* First part is the method: get, post, delete */
object.method = parts[0].toLowerCase();
/* Second part is the URL */
object.route = parts[1];
break;
}

default:
default: {
throw new SaplingError(`Problem parsing '${key}': too many segments`);
}
}

/* Remove any trailing slashes */
Expand Down
2 changes: 1 addition & 1 deletion lib/Templating.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export default class Templating {
this.app = App;

/* Infer base path if not supplied */
this.viewsPath = viewsPath ? viewsPath : path.join(this.app.dir, this.app.config.viewsDir);
this.viewsPath = viewsPath || path.join(this.app.dir, this.app.config.viewsDir);
}


Expand Down
21 changes: 14 additions & 7 deletions lib/Utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,24 +97,28 @@ export default class Utils {
*/
trueBoolean(value) {
switch (typeof value) {
case 'boolean':
case 'boolean': {
return value;
}

case 'string':
case 'string': {
if (value.toLowerCase() === 'true' || value.toLowerCase() === 'yes' || value.toLowerCase() === 'on') {
return true;
}

return false;
}

case 'number':
case 'bigint':
case 'bigint': {
return Boolean(value);
}

case 'undefined':
case 'undefined': {
return undefined;
}

case 'object':
case 'object': {
if (value === null) {
return null;
}
Expand All @@ -124,12 +128,15 @@ export default class Utils {
}

return true;
}

case 'function':
case 'function': {
return this.trueBoolean(value());
}

default:
default: {
return false;
}
}
}

Expand Down
7 changes: 5 additions & 2 deletions lib/Validation.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,14 @@ export default class Validation {
case false:
case 'false':
case 0:
case '0':
case '0': {
value = true;
break;
default:
}

default: {
value = 'not boolean';
}
}

type = 'boolean';
Expand Down
Loading