From 0e30dc50c4e7711b7e827e5570e303923fa0c9a6 Mon Sep 17 00:00:00 2001
From: Mark Cavage <mcavage@gmail.com>
Date: Tue, 24 Jan 2012 08:56:30 -0800
Subject: [PATCH] GH-53 unable to parse !filters

---
 Makefile                  |  3 ++-
 lib/filters/not_filter.js | 20 ++++++++++++++------
 tst/filters/not.test.js   |  7 +------
 tst/filters/parse.test.js | 15 +++++++++++++++
 4 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index bba4676..b3ed682 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ RESTDOWN = ./node_modules/.restdown/bin/restdown \
 	-m ${DOCPKGDIR} \
 	-D mediaroot=media
 
-.PHONY:  dep lint test doc clean all
+.PHONY:  dep lint test doc clean all install
 
 all:: test doc
 
@@ -38,6 +38,7 @@ node_modules/.ldapjs.npm.installed:
 	@touch ./node_modules/.ldapjs.npm.installed
 
 dep:	./node_modules/.ldapjs.npm.installed
+install: dep
 
 gjslint:
 	gjslint --nojsdoc -r lib -r tst
diff --git a/lib/filters/not_filter.js b/lib/filters/not_filter.js
index e973412..a473a9a 100644
--- a/lib/filters/not_filter.js
+++ b/lib/filters/not_filter.js
@@ -12,16 +12,18 @@ var Protocol = require('../protocol');
 ///--- API
 
 function NotFilter(options) {
-  if (typeof(options) !== 'object')
-    throw new TypeError('options (object) required');
-  if (!options.filter || !(options.filter instanceof Filter))
-    throw new TypeError('options.filter (Filter) required');
+  if (typeof(options) === 'object') {
+    if (!options.filter || !(options.filter instanceof Filter))
+      throw new TypeError('options.filter (Filter) required');
 
+  } else {
+    options = {};
+  }
+
+  this.filter = options.filter || {};
   options.type = Protocol.FILTER_NOT;
   Filter.call(this, options);
 
-  this.filter = options.filter;
-
   var self = this;
   this.__defineGetter__('json', function() {
     return {
@@ -34,6 +36,12 @@ util.inherits(NotFilter, Filter);
 module.exports = NotFilter;
 
 
+NotFilter.prototype.addFilter = function(f) {
+  if (!(f instanceof Filter))
+    throw new TypeError('filter (Filter) required');
+  this.filter = f;
+};
+
 NotFilter.prototype.toString = function() {
   return '(!' + this.filter.toString() + ')';
 };
diff --git a/tst/filters/not.test.js b/tst/filters/not.test.js
index 48c17aa..50b729d 100644
--- a/tst/filters/not.test.js
+++ b/tst/filters/not.test.js
@@ -26,12 +26,7 @@ test('load library', function(t) {
 
 
 test('Construct no args', function(t) {
-  try {
-    new NotFilter();
-    t.fail('should have thrown');
-  } catch (e) {
-    t.ok(e instanceof TypeError);
-  }
+  t.ok(new NotFilter());
   t.end();
 });
 
diff --git a/tst/filters/parse.test.js b/tst/filters/parse.test.js
index 251376c..56c2fce 100644
--- a/tst/filters/parse.test.js
+++ b/tst/filters/parse.test.js
@@ -79,3 +79,18 @@ test('* substr filter (prefix)', function(t) {
   t.equal(f.initial, 'bar');
   t.end();
 });
+
+
+test('GH-53 NotFilter', function(t) {
+  var str = '(&(objectClass=person)(!(objectClass=shadowAccount)))';
+  var f = parse(str);
+  t.ok(f);
+  t.equal(f.type, 'and');
+  t.equal(f.filters.length, 2);
+  t.equal(f.filters[0].type, 'equal');
+  t.equal(f.filters[1].type, 'not');
+  t.equal(f.filters[1].filter.type, 'equal');
+  t.equal(f.filters[1].filter.attribute, 'objectClass');
+  t.equal(f.filters[1].filter.value, 'shadowAccount');
+  t.end();
+});