Path tree can now store paths that end with slash(/) and dont end wit…

…h slash(/)
TheIronDev · Mar 4, 2019 · f56bfb8 · f56bfb8
1 parent e804f58
commit f56bfb8
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 10 deletions.
diff --git a/src/WebsiteState.js b/src/WebsiteState.js
@@ -20,18 +20,14 @@ class WebsiteState {
     return this.pathTree.__pathsGenerator("", this.pathTree.root);
   }
 
-  addPath(path) {
-    this.pathTree.addPath(path);
-  }
+  addPath(path) { this.pathTree.addPath(path); }
 }
 
 /**
  * Tree structure used to store path routes
  */
 class PathTree {
-  constructor() {
-    this.root = new PathNode('');
-  }
+  constructor() { this.root = new PathNode(''); }
 
   /**
    * TODO handle ending slashed. Not all paths end in slash
@@ -40,6 +36,7 @@ class PathTree {
    * @param {string} path should be a path starting with '/'
    */
   addPath(path) {
+    const endsWithSlash = path[path.length - 1] === '/';
     const paths = path.split('/').filter(elem => elem.trim() !== '');
     let currentPathNode = this.root;
     paths.forEach(function(currentPath) {
@@ -49,6 +46,9 @@ class PathTree {
         const newPathNode = new PathNode(currentPath);
         currentPathNode.children.push(newPathNode);
         currentPathNode = newPathNode;
+        if (currentPath == paths[paths.length - 1]) {
+          newPathNode.endsWithSlash = endsWithSlash;
+        }
       } else {
         currentPathNode = childPathNode;
       }
@@ -59,7 +59,9 @@ class PathTree {
    * Generator that yields a path recursively when it has not been visited
    */
   * __pathsGenerator(path, node) {
-    const currentPath = path + node.name + "/";
+    const endingSlash =
+        (node.children.length > 0 || node.endsWithSlash) ? '/' : '';
+    const currentPath = path + node.name + endingSlash;
     if (!node.visited) {
       yield currentPath;
       node.visited = true;
@@ -74,6 +76,7 @@ class PathNode {
   constructor(name) {
     this.name = name;
     this.visited = false;
+    this.endsWithSlash = true;
     this.children = [];
   }
 }

diff --git a/test/WebsiteState.test.js b/test/WebsiteState.test.js
@@ -3,6 +3,29 @@ const {WebsiteState} = require("../src/WebsiteState");
 
 describe("Website State", function() {
   describe("Generator", function() {
+
+    it("should iterate over path with no slash", function() {
+      const websiteState = new WebsiteState();
+      websiteState.pathTree.addPath("/a");
+
+      const paths = [];
+      for (const path of websiteState.getUnvisitedPaths()) {
+        paths.push(path);
+      }
+      expect(paths).to.eql(["/", "/a"]);
+    });
+
+    it("should iterate over path with slash", function() {
+      const websiteState = new WebsiteState();
+      websiteState.pathTree.addPath("/a/");
+
+      const paths = [];
+      for (const path of websiteState.getUnvisitedPaths()) {
+        paths.push(path);
+      }
+      expect(paths).to.eql(["/", "/a/"]);
+    });
+
     it("should iterate only over new paths added", function() {
       const websiteState = new WebsiteState();
       websiteState.pathTree.addPath("/a/b/c");
@@ -18,7 +41,7 @@ describe("Website State", function() {
       for (const path of websiteState.getUnvisitedPaths()) {
         paths.push(path);
       }
-      expect(paths).to.eql(["/a/b1/c1/", "/a/b1/c2/"]);
+      expect(paths).to.eql(["/a/b1/c1", "/a/b1/c2"]);
     });
 
     it("should iterate over path added", function() {
@@ -29,7 +52,7 @@ describe("Website State", function() {
       for (const path of websiteState.getUnvisitedPaths()) {
         paths.push(path);
       }
-      expect(paths).to.eql(["/", "/a/"]);
+      expect(paths).to.eql(["/", "/a"]);
     });
 
     it("should iterate over parent paths added", function() {
@@ -40,7 +63,7 @@ describe("Website State", function() {
       for (const path of websiteState.getUnvisitedPaths()) {
         paths.push(path);
       }
-      expect(paths).to.eql(["/", "/a/", "/a/b/"]);
+      expect(paths).to.eql(["/", "/a/", "/a/b"]);
     });
   });