filterBy accepts array or regex. Closes #11

lib/index.js

@@ -2,6 +2,7 @@ import objectAssign from 'object-assign';
 import {EventEmitter} from 'events';
 import isRegexp from 'is-regexp';
 import report from './report';
+import hashRegex from 'hash-regex';
 
 export default class Birdwatch {
 	/**
@@ -60,8 +61,12 @@ export default class Birdwatch {
 				throw new Error('Screenname required');
 			}
 
-			if (options.filterTags && !isRegexp(options.filterTags)) {
-				throw new Error(`Invalid regex: ${options.filterTags} for ${feed.screenname}`);
+			if (options.filterTags) {
+				if (Array.isArray(options.filterTags)) {
+					options.filterTags = hashRegex(options.filterTags);
+				} else if (!isRegexp(options.filterTags)) {
+					throw new Error(`Invalid regex: ${options.filterTags} for ${feed.screenname}`);
+				}
 			}
 
 			this.feeds.push({screenname: feed.screenname, options});

package.json

@@ -47,6 +47,7 @@
   "dependencies": {
     "babel-runtime": "^5.8.29",
     "chalk": "~1.1.0",
+    "hash-regex": "^1.0.0",
     "is-regexp": "~1.0.0",
     "mkdirp": "^0.5.1",
     "oauth": "^0.9.14",

readme.md

@@ -115,9 +115,14 @@ Feed options.
 
 ##### filterTags
 
-Type: `Regex`<br>
+Type: `Regex|Array`<br>
 
-The regular expression containing the tags you want to filter with. If you do not supply a feed with a filter, then Birdwatch simply returns all tweets from that feed.
+The regular expression containing the tags you want to filter with, or an array of strings. For example, both of these values will result in the same filter:
+
+```js
+.feed('user1', {filterTags: /#01|#02/gi })
+.feed('user2', {filterTags: ['01','02'] })
+```
 
 **Tip:** If you need help writing your regular expressions, try [regexpal.com](http://regexpal.com/)
 

test/test.js

@@ -93,3 +93,8 @@ test('should not expose private keys in birdwatch-config.js', t => {
 		configuration.accessTokenSecret   === 'YOUR_ACCESS_TOKEN_SECRET'
 	);
 });
+
+test('filterTags should accept an array of strings', async t => {
+	const bw = await new Birdwatch({useTestData:true}).feed('test', {filterTags:['01','02']}).start();
+	t.is(bw.getCachedTweets().length, 2);
+});