Merge pull request #58 from Rowno/falsey-value

Allow falsey values to be cached
hapijs · Mar 19, 2014 · 1b7a1a8 · 1b7a1a8
2 parents 3214f68 + 0f6b165
commit 1b7a1a8
Show file tree

Hide file tree

Showing 4 changed files with 106 additions and 4 deletions.
diff --git a/lib/client.js b/lib/client.js
@@ -87,7 +87,8 @@ internals.Client.prototype.get = function (key, callback) {
         }
 
         if (!result ||
-            !result.item) {
+            result.item === undefined ||
+            result.item === null) {
 
             // Not found
             return callback(null, null);

diff --git a/lib/policy.js b/lib/policy.js
@@ -109,7 +109,8 @@ internals.Policy.prototype.getOrGenerate = function (id, generateFunc, callback)
             // Not found
 
             if (!cached ||
-                !cached.item) {
+                cached.item === undefined ||
+                cached.item === null) {
 
                 report = { msec: timer.elapsed() };
                 return validate();
@@ -302,4 +303,4 @@ internals.Policy.ttl = function (rule, created) {
     }
 
     return 0;                                                                       // No rule
-};
+};
diff --git a/test/client.js b/test/client.js
@@ -197,6 +197,61 @@ describe('Client', function () {
             });
         });
 
+        it('returns nothing when item is not found', function (done) {
+
+            var engine = {
+                start: function (callback) {
+
+                    callback();
+                },
+                isReady: function () {
+
+                    return true;
+                },
+                get: function (key, callback) {
+
+                    callback(null, null);
+                }
+            };
+
+            var client = new Catbox.Client(engine);
+            client.get({ id: 'id', segment: 'segment' }, function (err, cached) {
+
+                expect(err).to.equal(null);
+                expect(cached).to.equal(null);
+                done();
+            });
+        });
+
+        it('returns falsey items', function (done) {
+
+            var engine = {
+                start: function (callback) {
+
+                    callback();
+                },
+                isReady: function () {
+
+                    return true;
+                },
+                get: function (key, callback) {
+
+                    callback(null, {
+                        item: false,
+                        stored: false
+                    });
+                }
+            };
+
+            var client = new Catbox.Client(engine);
+            client.get({ id: 'id', segment: 'segment' }, function (err, cached) {
+
+                expect(err).to.equal(null);
+                expect(cached.item).to.equal(false);
+                done();
+            });
+        });
+
         it('expires item', function (done) {
 
             var engine = {
@@ -282,4 +337,4 @@ describe('Client', function () {
             });
         });
     });
-});
+});
diff --git a/test/policy.js b/test/policy.js
@@ -221,6 +221,51 @@ describe('Policy', function () {
         });
     });
 
+    describe('#getOrGenerate', function () {
+
+        it('returns falsey items', function (done) {
+
+            var engine = {
+                start: function (callback) {
+
+                    callback();
+                },
+                isReady: function () {
+
+                    return true;
+                },
+                get: function (key, callback) {
+
+                    callback(null, {
+                        stored: false,
+                        item: false
+                    });
+                },
+                validateSegmentName: function () {
+
+                    return null;
+                }
+            };
+            var policyConfig = {
+                expiresIn: 50000
+            };
+
+            function generateFunc(next) {
+                next(null, false);
+            }
+
+            var client = new Catbox.Client(engine);
+            var policy = new Catbox.Policy(policyConfig, client, 'test');
+
+            policy.getOrGenerate('test1', generateFunc, function (err, item) {
+
+                expect(err).to.equal(null);
+                expect(item).to.equal(false);
+                done();
+            });
+        });
+    });
+
     describe('#drop', function () {
 
         it('calls the extension clients drop function', function (done) {