Extract initErrorPages() out of LDP constructor

dmitrizagidulin · dmitrizagidulin · commit eada0d802728 · 2018-10-04T20:17:16.000-04:00
diff --git a/lib/ldp.js b/lib/ldp.js
@@ -55,38 +55,18 @@ class LDP {
   constructor (options = {}) {
     Object.assign(this, options)
 
-    // Setting root
-    if (!this.root) {
-      this.root = process.cwd()
-    }
-    if (!this.root.endsWith('/')) {
-      this.root += '/'
-    }
-
-    // Suffixes
-    if (!this.suffixAcl) {
-      this.suffixAcl = '.acl'
-    }
-    if (!this.suffixMeta) {
-      this.suffixMeta = '.meta'
-    }
+    this.suffixAcl = options.suffixAcl || '.acl'
+    this.suffixMeta = options.suffixMeta || '.meta'
     this.turtleExtensions = [ '.ttl', this.suffixAcl, this.suffixMeta ]
 
-    // Error pages folder
-    this.errorPages = null
-    if (!this.noErrorPages) {
-      this.errorPages = options.errorPages
-      if (!this.errorPages) {
-        // TODO: For now disable error pages if errorPages parameter is not explicitly passed
-        this.noErrorPages = true
-      } else if (!this.errorPages.endsWith('/')) {
-        this.errorPages += '/'
-      }
-    }
+    this.root = options.root || process.cwd()
+    if (!this.root.endsWith('/')) { this.root += '/' }
 
-    if (this.corsProxy && this.corsProxy[ 0 ] !== '/') {
+    if (this.corsProxy && !this.corsProxy.startsWith('/')) {
       this.corsProxy = '/' + this.corsProxy
     }
+
+    this.initErrorPages(options)
   }
 
   printDebugInfo () {
@@ -104,6 +84,19 @@ class LDP {
     debug.settings('Default data browser app file path: ' + this.dataBrowserPath)
   }
 
+  initErrorPages (options) {
+    this.errorPages = null
+    if (!this.noErrorPages) {
+      this.errorPages = options.errorPages
+      if (!this.errorPages) {
+        // TODO: For now disable error pages if errorPages parameter is not explicitly passed
+        this.noErrorPages = true
+      } else if (!this.errorPages.endsWith('/')) {
+        this.errorPages += '/'
+      }
+    }
+  }
+
   stat (file, callback) {
     fs.stat(file, function (err, stats) {
       if (err) {
