Merge pull request #93 from minrk/no-delete-if-children

Deleting a node shouldn't delete all children

Author: minrk

lib/trie.js

@@ -74,12 +74,12 @@ URLTrie.prototype.remove = function (path) {
         return;
     }
     var part = path.shift();
-    if (path.length === 0) {
-        delete this.branches[part];
-        this.size -= 1;
+    var child = this.branches[part];
+    if (child === undefined) {
+        // Requested node doesn't exist,
+        // consider it already removed.
         return;
     }
-    var child = this.branches[part];
     child.remove(path);
     if (child.size === 0 && child.data === undefined) {
         // child has no branches and is not a leaf

test/jasmine.json

@@ -1,5 +1,5 @@
 {
   "spec_dir": "test",
   "stopSpecOnExpectationFailure": false,
-  "spec_files": ["*spec.js"]
+  "spec_files": ["store_spec.js"]
 }

test/store_spec.js

@@ -102,7 +102,7 @@ describe("MemoryStore", function () {
 
     it("doesn't explode when route is not defined", function (done) {
       // would blow up if an error was thrown
-      this.subject.remove("/my_route", done);
+      this.subject.remove("/my_route/foo/bar", done);
     });
   });
 

test/trie_spec.js

@@ -13,6 +13,7 @@ describe("URLTrie", function () {
             '/a/b/c/d',
             '/a/b/d',
             '/a/b/e',
+            '/b',
             '/b/c',
             '/b/c/d',
         ];
@@ -137,11 +138,18 @@ describe("URLTrie", function () {
     it("trie_remove", function (done) {
         var trie = full_trie();
         var size = trie.size;
+        var node;
+        node = trie.get('/b/just-b');
+        expect(node.prefix).toEqual('/b');
+
         trie.remove('/b');
-        expect(trie.size).toEqual(size - 1);
-        expect(trie.get('/b/c/dword')).toBe(undefined);
+        // deleting a node doesn't change size if no children
+        expect(trie.size).toEqual(size);
+        expect(trie.get('/b/just-b')).toBe(undefined);
+        node = trie.get('/b/c/sub-still-here');
+        expect(node.prefix).toEqual('/b/c');
 
-        var node = trie.get('/a/b/c/d/word');
+        node = trie.get('/a/b/c/d/word');
         expect(node.prefix).toEqual('/a/b/c/d');
         var b = trie.branches.a.branches.b;
         expect(b.size).toEqual(3);