From 323a353cfd5bae2254be3e2c302d39888f3ecdbe Mon Sep 17 00:00:00 2001
From: Cedric Kalista <ckalista@gumtree.com>
Date: Sun, 10 Jan 2016 16:05:48 +0000
Subject: [PATCH 1/4] Add support for tolerant_reader

---
 lib/read.js                          | 49 +++++++++++++++++++++++++---
 test/parse.js                        | 22 +++++++++++++
 test/variables-tolerant-substitution | 31 ++++++++++++++++++
 3 files changed, 97 insertions(+), 5 deletions(-)
 create mode 100644 test/variables-tolerant-substitution

diff --git a/lib/read.js b/lib/read.js
index b9e37df..1d1112d 100644
--- a/lib/read.js
+++ b/lib/read.js
@@ -49,8 +49,12 @@ var expand = function  (o, str, options, cb){
       }else if (c === "}"){
         holder = section !== null ? searchValue (o, section, true) : o;
         if (!holder){
-          return cb (new Error ("The section \"" + section + "\" does not " +
+          if(options.tolerant_substitution) {
+            holder = o;
+          } else{
+            return cb (new Error ("The section \"" + section + "\" does not " +
               "exist"));
+          }
         }
         
         v = options.namespaces ? searchValue (holder, key) : holder[key];
@@ -61,8 +65,12 @@ var expand = function  (o, str, options, cb){
               : options._vars[key]
           
           if (v === undefined){
-            return cb (new Error ("The property \"" + key + "\" does not " +
+            if(options.tolerant_substitution) {
+              return cb (null, str);
+            } else {
+              return cb(new Error("The property \"" + key + "\" does not " +
                 "exist"));
+            }
           }
         }
         
@@ -122,13 +130,44 @@ var namespaceKey = function (o, key, value){
   o[n[n.length - 1]] = value;
 };
 
+var splitByDotWithVariables = function(section) {
+  var splittedNamespaces = [];
+  var previousChar;
+  var currentChar;
+  var startingDotpointer = -1;
+  var openedVariables = 0;
+  var closedVariables = 0;
+  section = "." + section + ".";
+  for (var i = 0; i < section.length; i++) {
+    currentChar = section[i];
+    if (previousChar === "$" && currentChar === "{") {
+      openedVariables++;
+    } else if (currentChar === "}") {
+      closedVariables++;
+      if (openedVariables == closedVariables) {
+        openedVariables = 0;
+        closedVariables = 0;
+        splittedNamespaces.push(section.substring(startingDotpointer +1, i + 1));
+      }
+    } else if (currentChar === "." && openedVariables === 0) {
+      if (startingDotpointer >= 0 && previousChar !== "}") {
+        splittedNamespaces.push(section.substring(startingDotpointer + 1, i));
+      }
+      startingDotpointer = i;
+    }
+    previousChar = currentChar;
+  }
+  return splittedNamespaces;
+}
 var namespaceSection = function (o, section){
-  var n = section.split (".");
+
+
+  var n = splitByDotWithVariables(section);
   var str;
-  
+
   for (var i=0; i<n.length; i++){
     str = n[i];
-    if (o[str] === undefined){
+    if (o[str] === undefined) {
       o[str] = {};
     }else if (typeof o[str] !== "object"){
       throw new Error ("Invalid namespace chain in the section name '" +
diff --git a/test/parse.js b/test/parse.js
index 830c49c..2c5d38f 100644
--- a/test/parse.js
+++ b/test/parse.js
@@ -350,6 +350,28 @@ var tests = {
       done ();
     });
   },
+  "variables supporting tolerant substitution": function(done) {
+    var options = {variables: true, path: true, sections: true, namespaces: true, tolerant_substitution: true};
+
+    properties.parse("variables-tolerant-substitution", options, function(error, p) {
+      assert.ifError(error);
+
+      assert.deepEqual(p, {
+        "a": 1,
+        "b": 1,
+        "foo": "${bar}",
+        "section": {"c": 3, "d": 3, "e": "${section_foo|bar}"},
+        "s1": {"e2": "ee"},
+        "s${bar}": {"e2": "ee"},
+        "namespace": {"a": {"b": "c"}},
+        "c": {"a": {"b": {"x": 1}, "e": 1}},
+        "${namespace|a.b.bar}": {"a": {"b": {"x": 1}}},
+        "${namespace|a.${h}.bar}": {"afgd": {"bsada": {"${bar}": {"foo": {"bar": "foo"}}}}}
+      });
+
+      done();
+    });
+  },
   "namespaces": function (done){
     var options = { path: true, variables: true, namespaces: true };
     
diff --git a/test/variables-tolerant-substitution b/test/variables-tolerant-substitution
new file mode 100644
index 0000000..5d5c2f0
--- /dev/null
+++ b/test/variables-tolerant-substitution
@@ -0,0 +1,31 @@
+#simple substitution
+a = 1
+b = ${a}
+foo=${bar}
+
+#section substitution
+[section]
+c = 3
+d = ${section|c}
+e = ${section_foo|bar}
+
+[s${a}]
+e2 = ee
+
+[s${bar}]
+e2 = ee
+
+#namespace substitution
+[namespace]
+a.b c
+
+[${namespace|a.b}.a]
+b.x 1
+
+e ${c.a|b.x}
+
+[${namespace|a.b.bar}.a]
+b.x 1
+
+[${namespace|a.${h}.bar}.afgd.bsada.${bar}.foo]
+bar=foo
\ No newline at end of file

From fd32aa34015277e7d9c648ac8c11f67b38d6f0b6 Mon Sep 17 00:00:00 2001
From: Cedric Kalista <ckalista@gumtree.com>
Date: Mon, 11 Jan 2016 11:38:51 +0000
Subject: [PATCH 2/4] Add condition to use simple split when possible

---
 lib/read.js   | 42 ++++++++++++++++++++++++------------------
 test/parse.js |  4 ++--
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/lib/read.js b/lib/read.js
index 1d1112d..00c08a1 100644
--- a/lib/read.js
+++ b/lib/read.js
@@ -131,13 +131,14 @@ var namespaceKey = function (o, key, value){
 };
 
 var splitByDotWithVariables = function(section) {
-  var splittedNamespaces = [];
+  var splitNamespaces = [];
   var previousChar;
   var currentChar;
-  var startingDotpointer = -1;
+  var startingDotPointer = -1;
   var openedVariables = 0;
   var closedVariables = 0;
   section = "." + section + ".";
+
   for (var i = 0; i < section.length; i++) {
     currentChar = section[i];
     if (previousChar === "$" && currentChar === "{") {
@@ -147,35 +148,40 @@ var splitByDotWithVariables = function(section) {
       if (openedVariables == closedVariables) {
         openedVariables = 0;
         closedVariables = 0;
-        splittedNamespaces.push(section.substring(startingDotpointer +1, i + 1));
+        splitNamespaces.push(section.substring(startingDotPointer +1, i + 1));
       }
     } else if (currentChar === "." && openedVariables === 0) {
-      if (startingDotpointer >= 0 && previousChar !== "}") {
-        splittedNamespaces.push(section.substring(startingDotpointer + 1, i));
+      if (startingDotPointer >= 0 && previousChar !== "}") {
+        splitNamespaces.push(section.substring(startingDotPointer + 1, i));
       }
-      startingDotpointer = i;
+      startingDotPointer = i;
     }
     previousChar = currentChar;
   }
-  return splittedNamespaces;
+  return splitNamespaces;
 }
-var namespaceSection = function (o, section){
 
+var namespaceSection = function(o, section, tolerant_substitution){
 
-  var n = splitByDotWithVariables(section);
-  var str;
+  var n;
+  if (tolerant_substitution){
+    n = splitByDotWithVariables(section);
+  } else{
+    n = section.split(".");
+  }
 
-  for (var i=0; i<n.length; i++){
+  var str;
+  for (var i = 0; i < n.length; i++){
     str = n[i];
-    if (o[str] === undefined) {
+    if (o[str] === undefined){
       o[str] = {};
-    }else if (typeof o[str] !== "object"){
-      throw new Error ("Invalid namespace chain in the section name '" +
-          section + "' ('" + str + "' has already a value)");
+    } else if (typeof o[str] !== "object"){
+      throw new Error("Invalid namespace chain in the section name '" +
+        section + "' ('" + str + "' has already a value)");
     }
     o = o[str];
   }
-  
+
   return o;
 };
 
@@ -367,7 +373,7 @@ var build = function (data, options, dirname, cb){
         if (add){
           if (options.namespaces){
             try{
-              currentSection = namespaceSection (n, section);
+              currentSection = namespaceSection (n, section, options.tolerant_substitution);
             }catch (error){
               abort (error);
             }
@@ -383,7 +389,7 @@ var build = function (data, options, dirname, cb){
         currentSectionStr = section;
         if (options.namespaces){
           try{
-            currentSection = namespaceSection (n, section);
+            currentSection = namespaceSection (n, section, options.tolerant_substitution);
           }catch (error){
             abort (error);
           }
diff --git a/test/parse.js b/test/parse.js
index 2c5d38f..be76247 100644
--- a/test/parse.js
+++ b/test/parse.js
@@ -350,10 +350,10 @@ var tests = {
       done ();
     });
   },
-  "variables supporting tolerant substitution": function(done) {
+  "variables supporting tolerant substitution": function(done){
     var options = {variables: true, path: true, sections: true, namespaces: true, tolerant_substitution: true};
 
-    properties.parse("variables-tolerant-substitution", options, function(error, p) {
+    properties.parse("variables-tolerant-substitution", options, function(error, p){
       assert.ifError(error);
 
       assert.deepEqual(p, {

From 348a34aa20f31cc3e70570e64768d1a3df3e0fe3 Mon Sep 17 00:00:00 2001
From: Cedric Kalista <ckalista@gumtree.com>
Date: Mon, 11 Jan 2016 11:47:39 +0000
Subject: [PATCH 3/4] Add documentation

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 924b731..4545d89 100644
--- a/README.md
+++ b/README.md
@@ -389,6 +389,8 @@ Options:
   Parses dot separated keys as JavaScript objects. Look at the [namespaces](#namespaces) section for further details.
 - __variables__ - _Boolean_  
   Allows you to read the value of a key while the file is being parsed. Look at the [variables](#variables) section for further details.
+- __tolerant_substitution__ - _Boolean_  
+  This option can be used with the `variables` option. if true, it allows properties to be partially parsed instead of returning an error when a variable is not set.
 - __vars__ - _Boolean_  
   External variables can be passed to the file if the variables option is enabled. Look at the [variables](#variables) section for further details.
 - __include__ - _Boolean_  

From 04e03d3c9bcbe78f91b32eb2a6cce444ad62bf9d Mon Sep 17 00:00:00 2001
From: Cedric Kalista <ckalista@gumtree.com>
Date: Mon, 11 Jan 2016 11:49:46 +0000
Subject: [PATCH 4/4] Fix indentation

---
 lib/read.js | 43 ++++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/lib/read.js b/lib/read.js
index 00c08a1..889df56 100644
--- a/lib/read.js
+++ b/lib/read.js
@@ -49,10 +49,10 @@ var expand = function  (o, str, options, cb){
       }else if (c === "}"){
         holder = section !== null ? searchValue (o, section, true) : o;
         if (!holder){
-          if(options.tolerant_substitution) {
+          if (options.tolerant_substitution){
             holder = o;
-          } else{
-            return cb (new Error ("The section \"" + section + "\" does not " +
+          }else{
+            return cb (new Error("The section \"" + section + "\" does not " +
               "exist"));
           }
         }
@@ -65,10 +65,10 @@ var expand = function  (o, str, options, cb){
               : options._vars[key]
           
           if (v === undefined){
-            if(options.tolerant_substitution) {
+            if (options.tolerant_substitution){
               return cb (null, str);
-            } else {
-              return cb(new Error("The property \"" + key + "\" does not " +
+            }else{
+              return cb (new Error("The property \"" + key + "\" does not " +
                 "exist"));
             }
           }
@@ -130,7 +130,7 @@ var namespaceKey = function (o, key, value){
   o[n[n.length - 1]] = value;
 };
 
-var splitByDotWithVariables = function(section) {
+var splitByDotWithVariables = function (section){
   var splitNamespaces = [];
   var previousChar;
   var currentChar;
@@ -139,19 +139,19 @@ var splitByDotWithVariables = function(section) {
   var closedVariables = 0;
   section = "." + section + ".";
 
-  for (var i = 0; i < section.length; i++) {
+  for (var i=0; i<section.length; i++){
     currentChar = section[i];
-    if (previousChar === "$" && currentChar === "{") {
+    if (previousChar === "$" && currentChar === "{"){
       openedVariables++;
-    } else if (currentChar === "}") {
+    }else if (currentChar === "}"){
       closedVariables++;
-      if (openedVariables == closedVariables) {
+      if (openedVariables == closedVariables){
         openedVariables = 0;
         closedVariables = 0;
-        splitNamespaces.push(section.substring(startingDotPointer +1, i + 1));
+        splitNamespaces.push(section.substring(startingDotPointer + 1, i + 1));
       }
-    } else if (currentChar === "." && openedVariables === 0) {
-      if (startingDotPointer >= 0 && previousChar !== "}") {
+    }else if (currentChar === "." && openedVariables === 0){
+      if (startingDotPointer >= 0 && previousChar !== "}"){
         splitNamespaces.push(section.substring(startingDotPointer + 1, i));
       }
       startingDotPointer = i;
@@ -159,25 +159,26 @@ var splitByDotWithVariables = function(section) {
     previousChar = currentChar;
   }
   return splitNamespaces;
-}
+};
 
-var namespaceSection = function(o, section, tolerant_substitution){
+var namespaceSection = function (o, section, tolerant_substitution){
 
   var n;
   if (tolerant_substitution){
     n = splitByDotWithVariables(section);
-  } else{
+  }else{
     n = section.split(".");
   }
 
   var str;
-  for (var i = 0; i < n.length; i++){
+
+  for (var i=0; i<n.length; i++){
     str = n[i];
     if (o[str] === undefined){
       o[str] = {};
-    } else if (typeof o[str] !== "object"){
-      throw new Error("Invalid namespace chain in the section name '" +
-        section + "' ('" + str + "' has already a value)");
+    }else if (typeof o[str] !== "object"){
+      throw new Error ("Invalid namespace chain in the section name '" +
+          section + "' ('" + str + "' has already a value)");
     }
     o = o[str];
   }