strict by default

yahoo · Sep 9, 2014 · 4073e59 · 4073e59
1 parent 893a30b
commit 4073e59
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 8 deletions.
diff --git a/index.js b/index.js
@@ -79,7 +79,7 @@ function replacer(base) {
  * @contructor
  * @param bundle {array} array of bundle parts
  * @param options {object}
- * @param options.strictDimensions {bool} whether unknown dimensions in the settings should be ignored
+ * @param options.lenientDimensions {bool} whether unknown dimensions in the settings should be applied to "master"
  */
 function Ycb(bundle, options) {
     this.options = options || {};
@@ -456,13 +456,14 @@ Ycb.prototype = {
                     }
                 }
                 if (!lookup[name]) {
-                    if (options.strictDimensions) {
+                    if (!context.hasOwnProperty(name) || options.lenientDimensions) {
+                        lookup[name] = DEFAULT;
+                    }
+                    else {
                         console.log('invalid value for dimension "' + name +
                             '" in settings ' + JSON.stringify(settings));
                         return undefined;
                     }
-                    // be lenient and act as if the dimension wasn't specified
-                    lookup[name] = DEFAULT;
                 }
             }
         }

diff --git a/tests/unit.js b/tests/unit.js
@@ -536,23 +536,37 @@ cases = {
         }, config);
     },
 
-    'unknown dimensions and options.strictDimensions': function() {
+    'test options.lenientDimensions': function() {
         var bundle,
             ycb,
             config;
 
-        bundle = readFixtureFile('dimensions.json')
+        bundle = readFixtureFile('dimensions.json');
         bundle.push({
             settings: ['master'],
             appPort: 80
         });
         bundle.push({
-            settings: ['environment:stage'],
+            settings: ['environment:lkjsdflksdhlskdfs'],
             appPort: 81
         });
-        ycb = new libycb.Ycb(bundle, {strictDimensions: true});
+        ycb = new libycb.Ycb(bundle);
         config = ycb.read({});
         A.areSame(80, config.appPort);
+
+        bundle = readFixtureFile('dimensions.json');
+        bundle.push({
+            settings: ['master'],
+            appPort: 80
+        });
+        bundle.push({
+            settings: ['environment:lkjsdflksdhlskdfs'],
+            appPort: 81
+        });
+        ycb = new libycb.Ycb(bundle, {lenientDimensions: true});
+        config = ycb.read({});
+        A.areSame(81, config.appPort);
+
     }
 
 };