Merge pull request #58 from Plloi/handle-nulls-bro

Made changes to properly handle nulls in iCanHaz
letsgetrandy · Sep 6, 2016 · 11ef77e · 11ef77e
2 parents cccbd6e + 991ea11
commit 11ef77e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/brototype.js b/brototype.js
@@ -73,7 +73,7 @@
                         callback(self.obj[key[i]], key[i]);
                     }
                 }
-                
+
                 return Bro.TOTALLY;
             } else {
                 optionsBro.iDontAlways('sorryBro').butWhenIdo();
@@ -92,12 +92,9 @@
             }
             var props = key.split('.'),
                 item = this.obj;
-            if (typeof item !== "undefined") {
-                for (var i = 0; i < props.length; i++) {
-                    item = item[props[i]];
-                    if (Bro(item).isThatEvenAThing() === Bro.NOWAY) {
-                        return item;
-                    }
+            for (var i = 0; i < props.length; i++) {
+                if (typeof item === "undefined" || item === null || Bro(item = item[props[i]]).isThatEvenAThing() === Bro.NOWAY) {
+                    return undefined;
                 }
             }
             return item;
@@ -129,11 +126,11 @@
             }
             return props;
         },
-        
+
         "hasRespect": function(prop) {
             return this.obj.hasOwnProperty(prop);
         },
-        
+
 
         "iDontAlways": function(methodString) {
             var method = this.iCanHaz(methodString);

diff --git a/tests.js b/tests.js
@@ -41,6 +41,18 @@ describe('Bro.doYouEven', function() {
         assert.equal(bro.doYouEven('foo.bar'), false);
     });
 
+    it('should fail gracefully if the object is null', function() {
+        var a = null,
+            bro = Bro(a);
+        assert.equal(bro.doYouEven('foo.bar'), false);
+    });
+
+    it('should fail gracefully if a traversed subproperty is null', function(){
+        var a = {test: null},
+            bro = Bro(a);
+        assert.equal(bro.doYouEven('test.0.test'), false);
+    });
+
     it('should pass a simple callback function', function() {
         var a = {foo: 'bar'},
             bro = Bro(a);