From 6ca836cc98940395f7f3105dda6bd560815ad1f5 Mon Sep 17 00:00:00 2001
From: "Johannes J. Schmidt" <schmidt@netzmerk.com>
Date: Thu, 5 Jun 2014 11:29:18 +0200
Subject: [PATCH] update couch-daemon: allow regexp in white- and blacklist

---
 README.md    | 10 ++++++----
 package.json |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index fed69bf..a75b226 100644
--- a/README.md
+++ b/README.md
@@ -54,10 +54,12 @@ concurrency = 1
 ; for the usual image resizes, increase it if you deal with really large images and complex
 ; imagemagick processing.
 timeout = 60000
-; Only documents in the databases above are processed (seperate with comma)
-; whitelist = mydb,otherdb
-; Ignore the following databases (again comma seperated list)
-blacklist = _users,_replicator
+; Only documents in the databases below are processed (separate with comma).
+; Regular expressions are allowed:
+;whitelist = mydb,otherdb,/^special-.*/
+; Ignore the following databases (again comma separated list)
+; Regular expressions are again allowed:
+blacklist = /^_/
 ```
 
 ## Imagemagick Configuration
diff --git a/package.json b/package.json
index 09cc858..cbd230f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "couchmagick",
-  "version": "2.1.2",
+  "version": "2.2.0",
   "description": "Couchmagick runs ImageMagicks `convert` on CouchDB documents.",
   "main": "index.js",
   "preferGlobal": true,
@@ -27,7 +27,7 @@
   },
   "homepage": "https://github.com/jo/couchmagick",
   "dependencies": {
-    "couch-daemon": "^1.2.10",
+    "couch-daemon": "^1.4.0",
     "strformat": "0.0.3",
     "docuri": "^1.1.0",
     "async": "^0.9.0",