Skip to content

Commit 8f2bcfa

Browse files
committed
accept single string for snippet blacklist
1 parent 99b8dc0 commit 8f2bcfa

1 file changed

Lines changed: 14 additions & 3 deletions

File tree

lib/snippet.js

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ var config = require("./config");
55

66
var lrSnippet = require("resp-modifier");
77
var path = require("path");
8+
var List = require("immutable").List;
89
var _ = require("lodash");
910
var fs = require("fs");
1011

@@ -37,7 +38,7 @@ var utils = {
3738
* @returns {{match: RegExp, fn: Function}}
3839
*/
3940
getRegex: function (snippet, options) {
40-
41+
4142
var fn = options.getIn(["rule", "fn"]);
4243

4344
return {
@@ -62,8 +63,8 @@ var utils = {
6263

6364
return {
6465
rules: rules,
65-
blacklist: options.get("blacklist").toJS(),
66-
whitelist: options.get("whitelist").toJS()
66+
blacklist: utils.arrify(options.get("blacklist")),
67+
whitelist: utils.arrify(options.get("whitelist"))
6768
};
6869
},
6970
/**
@@ -98,6 +99,16 @@ var utils = {
9899
*/
99100
getSocketScript: function () {
100101
return fs.readFileSync(path.join(__dirname, config.socketIoScript), "utf-8");
102+
},
103+
/**
104+
* @param {Immutable.List|Array|String} incoming
105+
* @returns {Array}
106+
*/
107+
arrify: function (incoming) {
108+
if (List.isList(incoming)) {
109+
return incoming.toArray();
110+
}
111+
return [].concat(incoming).filter(Boolean);
101112
}
102113
};
103114
module.exports.utils = utils;

0 commit comments

Comments
 (0)